This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project gfxprim.git.
The branch, master has been updated
discards 54d4ce312d1bff5105486a429ab4dc326408908b (commit)
via 7b640614144c242d672abe372961ef1d2e64c1fd (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (54d4ce312d1bff5105486a429ab4dc326408908b)
N -- N -- N (7b640614144c242d672abe372961ef1d2e64c1fd)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/gfxprim.git/commit/7b640614144c242d672abe372961ef1d2e64…
commit 7b640614144c242d672abe372961ef1d2e64c1fd
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Fri Oct 18 23:48:07 2013 +0200
build: Add --mandir to configure and install.mk
Now spiv is installed by make target rather than by the ugly install.sh
script, also prepare for man page installation.
Signed-off-by: Cyril Hrubis <metan(a)ucw.cz>
diff --git a/Makefile b/Makefile
index 33cc33c..2747b51 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ TOP_MAKE=1
ifneq ($(MAKECMDGOALS),install)
SUBDIRS=include libs tests pylib demos build
else
-SUBDIRS=pylib
+SUBDIRS=pylib demos
endif
libs: include
diff --git a/configure b/configure
index 5af836e..2e8164b 100755
--- a/configure
+++ b/configure
@@ -312,7 +312,8 @@ if __name__ == '__main__':
'prefix' : ['', 'Installation prefix'],
'bindir' : ['/usr/bin', 'Where to install binaries'],
'libdir' : ['', 'Where to install libraries'],
- 'includedir' : ['/usr/include', 'Where to install headers']}
+ 'includedir' : ['/usr/include', 'Where to install headers'],
+ 'mandir' : ['/usr/share/man', 'Where to install man pages']}
#
# Library detection/enable disable
diff --git a/demos/spiv/Makefile b/demos/spiv/Makefile
index 80cfa29..4fc57aa 100644
--- a/demos/spiv/Makefile
+++ b/demos/spiv/Makefile
@@ -11,8 +11,12 @@ LDLIBS+=$(LDLIBS_LOADERS) $(LDLIBS_BACKENDS)
APPS=spiv
+INSTALL_BIN=spiv
+#INSTALL_MAN=spiv.1
+
spiv: cpu_timer.o image_cache.o image_list.o image_actions.o spiv_help.o image_loader.o cfg.o spiv_config.o
include $(TOPDIR)/app.mk
+include $(TOPDIR)/install.mk
include $(TOPDIR)/post.mk
diff --git a/install.mk b/install.mk
new file mode 100644
index 0000000..689acda
--- /dev/null
+++ b/install.mk
@@ -0,0 +1,34 @@
+ifdef DESTDIR
+BIN_DIR=$(DESTDIR)$(bindir)
+else
+BIN_DIR=$(bindir)
+endif
+
+ifdef DESTDIR
+MAN_DIR=$(DESTDIR)$(mandir)/man1
+else
+MAN_DIR=$(mandir)/man1
+endif
+
+install:
+ifdef INSTALL_BIN
+ifdef VERBOSE
+ install -d "$(BIN_DIR)"
+ for i in $(INSTALL_BIN); do install "$$i" "$(BIN_DIR)"; done
+else
+ @install -d "$(BIN_DIR)"
+ @echo "MKDIR $(BIN_DIR)"
+ @for i in $(INSTALL_BIN); do echo "CP $$i $(MAN_DIR)"; install "$$i" "$(BIN_DIR)"; done
+endif
+endif
+
+ifdef INSTALL_MAN
+ifdef VERBOSE
+ install -d "$(MAN_DIR)"
+ for i in $(INSTALL_MAN); do install "$$i" "$(MAN_DIR)"; done
+else
+ @install -d "$(MAN_DIR)"
+ @echo "MKDIR $(MAN_DIR)"
+ @for i in $(INSTALL_MAN); do echo "CP $$i $(MAN_DIR)"; install "$$i" "$(MAN_DIR)"; done
+endif
+endif
diff --git a/install.sh b/install.sh
index 0b3020a..14c9835 100755
--- a/install.sh
+++ b/install.sh
@@ -40,4 +40,3 @@ done
echo "INSTALL binaries"
install -m 775 -d "$BIN_LOC"
install -m 755 gfxprim-config "$BIN_LOC"
-install -m 755 demos/spiv/spiv "$BIN_LOC"
-----------------------------------------------------------------------
Summary of changes:
install.mk | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
create mode 100644 install.mk
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com
if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive
no reply.
--
gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project gfxprim.git.
The branch, master has been updated
via af3ab64dd671ec59cc44f58490401b96f48c66bc (commit)
via 6104f5d98b1793065962388fc1a17ae801358e32 (commit)
via b699a8f5b247291820a1a8e494d42cd033ae120f (commit)
from 21f49beeb9dfc819dd0b7f2b84118b83d02aa612 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/gfxprim.git/commit/af3ab64dd671ec59cc44f58490401b96f48c…
commit af3ab64dd671ec59cc44f58490401b96f48c66bc
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Tue Oct 15 23:02:02 2013 +0200
build: Add check make target.
Which just runs check_symbols.sh script which looks if there are any
symbols exported by mistake.
Signed-off-by: Cyril Hrubis <metan(a)ucw.cz>
diff --git a/build/check_symbols.sh b/build/check_symbols.sh
index 245b324..641df38 100755
--- a/build/check_symbols.sh
+++ b/build/check_symbols.sh
@@ -76,4 +76,6 @@ if [ -n "$FOUND" ]; then
echo "Set them static or update lists of exported functions in syms/Foo_symbols.txt"
echo
echo "$WARN"
+else
+ echo "No unexpected symbols found :)"
fi
diff --git a/post.mk b/post.mk
index 0b9fc90..dbc6d13 100644
--- a/post.mk
+++ b/post.mk
@@ -29,12 +29,18 @@ help:
@echo ""
@echo "rebuild: does clean and all"
@echo ""
+ @echo "check: do pre-commit check"
+ @echo " (currently checks for exported symbols)"
+ @echo ""
@echo "The default silent output could be turned off by defining"
@echo "'VERBOSE' shell variable as 'VERBOSE=1 make'"
@echo ""
doc:
- cd doc && make
+ @cd $(TOPDIR)/doc && make
+
+check:
+ @cd $(TOPDIR)/build && ./check_symbols.sh
#
# Determine mode (eg do not generate anything if not in compile mode
http://repo.or.cz/w/gfxprim.git/commit/6104f5d98b1793065962388fc1a17ae80135…
commit 6104f5d98b1793065962388fc1a17ae801358e32
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Tue Oct 15 22:56:47 2013 +0200
build: Update list of exported symbols.
Signed-off-by: Cyril Hrubis <metan(a)ucw.cz>
diff --git a/build/syms/Text_symbols.txt b/build/syms/Text_symbols.txt
index 1b371e6..3b04747 100644
--- a/build/syms/Text_symbols.txt
+++ b/build/syms/Text_symbols.txt
@@ -15,6 +15,7 @@ GP_TextDescent
GP_TextClearStr
GP_Text
GP_Print
+GP_VPrint
GP_DefaultStyle
http://repo.or.cz/w/gfxprim.git/commit/b699a8f5b247291820a1a8e494d42cd033ae…
commit b699a8f5b247291820a1a8e494d42cd033ae120f
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Tue Oct 15 22:56:11 2013 +0200
doc: Update general information.
Signed-off-by: Cyril Hrubis <metan(a)ucw.cz>
diff --git a/doc/general.txt b/doc/general.txt
index 2c5bc9f..a2a9167 100644
--- a/doc/general.txt
+++ b/doc/general.txt
@@ -28,7 +28,7 @@ operations in Filters.
link:blits.html[Blits] are functions used to copy part of one bitmap into
another bitmap. The blits be also used for primitive bitmap pixel type
-conversions (i.e. RGB888 vs BGR888).
+conversions (i.e. RGB888 vs BGR888).
link:progress_callback.html[Progress Callback] is an interface that allows you
to monitor progress of an operation it is mainly used in loaders and filters.
@@ -134,9 +134,9 @@ image filters.
[width="100%",options="header"]
|=============================================================================
| Filter Name | Supported Pixel Type | Mutithreaded
-| Convolution | RGB888 | Yes
-| Separable Convolution | RGB888 | Yes
-| Gaussian Blur | RGB888 | Yes
+| Convolution | All | Yes
+| Separable Convolution | All | Yes
+| Gaussian Blur | All | Yes
| Sobel Edge Detection | RGB888 | Yes
| Prewitt Edge Detection | RGB888 | Yes
|=============================================================================
@@ -160,8 +160,8 @@ NOTE: Linear filters are implemented using generic convolution filters, once
[width="100%",options="header"]
|=============================================================================
| Filter Name | Supported Pixel Type | Multithreaded
- | Floyd Steinberg | RGB888 -> Any | No
-| Hilbert Peano | RGB888 -> Any | No
+| Floyd Steinberg | All -> Any | No
+| Hilbert Peano | All -> Any | No
|=============================================================================
.Currently Implemented Resamplings
-----------------------------------------------------------------------
Summary of changes:
build/check_symbols.sh | 2 ++
build/syms/Text_symbols.txt | 1 +
doc/general.txt | 12 ++++++------
post.mk | 8 +++++++-
4 files changed, 16 insertions(+), 7 deletions(-)
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com
if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive
no reply.
--
gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project gfxprim.git.
The branch, master has been updated
via 22988118088f5fb0de21f8ea6ada75be2b42f446 (commit)
via 02949ce0fdd4f830bdf22fee95464373933aa7ec (commit)
from 5a637f76e46988a072403ed95db859f61e12193c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/gfxprim.git/commit/22988118088f5fb0de21f8ea6ada75be2b42…
commit 22988118088f5fb0de21f8ea6ada75be2b42f446
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Oct 7 15:41:38 2013 +0200
configure: Fix _FORTIFY_SOURCE redefinition.
Some systems enables _FORTIFY_SOURCE by default which leads to tons of
redefiniton warnings. Fix this by checking if _FORTIFY_SOURCE is defined
in configure script (also disable _FORTIFY_SOURCE if no optimalizations
are done).
Signed-off-by: Cyril Hrubis <metan(a)ucw.cz>
diff --git a/configure b/configure
index c7b7409..5af836e 100755
--- a/configure
+++ b/configure
@@ -23,8 +23,8 @@ def header_exists(cfg, filename):
def c_try_compile(cfg, code, msg):
sys.stderr.write(msg)
- ret = os.system("echo '%s' | %s -x c -o /dev/null - > /dev/null 2>&1" %
- (code, cfg["CC"][0]))
+ ret = os.system("echo '%s' | %s %s -x c -o /dev/null - > /dev/null 2>&1" %
+ (code, cfg['CC'][0], cfg['CFLAGS'][0]))
if ret:
sys.stderr.write("Non")
@@ -38,6 +38,16 @@ def c_compiler_exists(cfg):
"Checking for working compiler (%s) ... " %
cfg["CC"][0])
+def define_fortify_source(cfg):
+ return c_try_compile(cfg, "int main(void) {n" +
+ "#if !defined _FORTIFY_SOURCE &&" +
+ "defined __OPTIMIZE__ && __OPTIMIZE__n" +
+ " return 0;n" +
+ "#elsen" +
+ " #error FORTIFY_SOURCE not usablen" +
+ "#endifn" +
+ "}", "Whether to define _FORTIFY_SOURCE ... ");
+
def python_version(cfg):
sys.stderr.write("Checking for python-config Python version ... ")
@@ -209,6 +219,9 @@ def basic_checks(cfg):
check_for_swig(cfg)
check_for_python_config(cfg)
+ if define_fortify_source(cfg):
+ cfg['CFLAGS'][0] = cfg['CFLAGS'][0] + " -D_FORTIFY_SOURCE=2"
+
cfg['PYTHON_VER'][0] = python_version(cfg)
if cfg['libdir'][0] == '':
@@ -290,7 +303,7 @@ if __name__ == '__main__':
# Dictionary for default configuration parameters
#
cfg = {'CC' : ['gcc', 'Path/name of the C compiler'],
- 'CFLAGS' : ['-pthread -W -Wall -Wextra -fPIC -O2 -ggdb -D_FORTIFY_SOURCE=2', 'C compiler flags'],
+ 'CFLAGS' : ['-pthread -W -Wall -Wextra -fPIC -O2 -ggdb', 'C compiler flags'],
'PYTHON_BIN' : ['python', 'Path/name of python interpreter'],
'SWIG' : ['swig', 'Simplified Wrapper and Interface Generator'],
'PYTHON_CONFIG' : ['python-config', 'Python config helper'],
http://repo.or.cz/w/gfxprim.git/commit/02949ce0fdd4f830bdf22fee95464373933a…
commit 02949ce0fdd4f830bdf22fee95464373933aa7ec
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Oct 7 15:22:21 2013 +0200
gen: Rename pixeltype.C_enum to pixeltype.C_type
Signed-off-by: Cyril Hrubis <metan(a)ucw.cz>
diff --git a/pylib/gp_codegen/pixeltype.py b/pylib/gp_codegen/pixeltype.py
index 2e89931..bcad7fc 100644
--- a/pylib/gp_codegen/pixeltype.py
+++ b/pylib/gp_codegen/pixeltype.py
@@ -51,8 +51,7 @@ class PixelType(object):
self.chans = dict() # { chan_name: (offset, size) }
self.pixelsize = pixelsize
# C enum as defined in GP_Pixel.gen.h
- self.C_enum = "GP_PIXEL_" + self.name
-
+ self.C_type = "GP_PIXEL_" + self.name
# Verify channel bits for overlaps
# also builds a bit-map of the PixelType
diff --git a/tests/core/Convert.gen.c.t b/tests/core/Convert.gen.c.t
index 8e9cf2a..945903a 100644
--- a/tests/core/Convert.gen.c.t
+++ b/tests/core/Convert.gen.c.t
@@ -39,7 +39,7 @@ static GP_Pixel get_black(GP_PixelType pixel_type)
{
switch (pixel_type) {
%% for pt in pixeltypes
- case {{ pt.C_enum }}:
+ case {{ pt.C_type }}:
%% if pt.is_cmyk()
%% set K = pt.chans['K']
/* Black in CMYK is full K rest zero */
@@ -65,7 +65,7 @@ static GP_Pixel get_white(GP_PixelType pixel_type)
{
switch (pixel_type) {
%% for pt in pixeltypes
- case {{ pt.C_enum }}:
+ case {{ pt.C_type }}:
%% if pt.is_cmyk()
/* White in CMYK is zero */
return 0x0;
@@ -110,7 +110,7 @@ static GP_Pixel get_red(GP_PixelType pixel_type)
{
switch (pixel_type) {
%% for pt in pixeltypes
- case {{ pt.C_enum }}:
+ case {{ pt.C_type }}:
%% if pt.is_cmyk()
%% set M = pt.chans['M']
%% set Y = pt.chans['Y']
-----------------------------------------------------------------------
Summary of changes:
configure | 19 ++++++++++++++++---
pylib/gp_codegen/pixeltype.py | 3 +--
tests/core/Convert.gen.c.t | 6 +++---
3 files changed, 20 insertions(+), 8 deletions(-)
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com
if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive
no reply.
--
gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")
