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 1c8bab0eb13544cbc84b504007326432f9145515 (commit)
from 12140ab1df18e77ad7a07908bc1f944579eccc78 (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/1c8bab0eb13544cbc84b504007326432f914…
commit 1c8bab0eb13544cbc84b504007326432f9145515
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Nov 14 23:54:24 2011 +0100
grinder: Fix script.
diff --git a/demos/grinder/runtest.sh b/demos/grinder/runtest.sh
index 73c9f61..163c76c 100755
--- a/demos/grinder/runtest.sh
+++ b/demos/grinder/runtest.sh
@@ -7,4 +7,4 @@ PROG="$1"
shift
echo "LD_LIBRARY_PATH=../../build/ ./$PROG $@"
-LD_LIBRARY_PATH=../../build/ ./$PROG $@
+LD_LIBRARY_PATH=../../build/ ./$PROG "$@"
-----------------------------------------------------------------------
Summary of changes:
demos/grinder/runtest.sh | 2 +-
1 files changed, 1 insertions(+), 1 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 12140ab1df18e77ad7a07908bc1f944579eccc78 (commit)
from db6777f82eb9c87d31fd68beed98624f4441024e (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/12140ab1df18e77ad7a07908bc1f944579ec…
commit 12140ab1df18e77ad7a07908bc1f944579eccc78
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Nov 14 23:34:53 2011 +0100
build: Fix one more Makefile.
diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile
index 3f631db..afba820 100644
--- a/tests/drivers/Makefile
+++ b/tests/drivers/Makefile
@@ -1,17 +1,10 @@
-LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg -lm
-INCLUDE=-I../../include
-# Some warnings are triggered only with -O2
-# thuss added here
-CFLAGS=$(INCLUDE) -ggdb -W -Wall -O2
-SOURCES=$(wildcard *.c)
-TESTS=$(SOURCES:.c=)
+TOPDIR=../..
-all: $(TESTS)
+CSOURCES=$(shell echo *.c)
-%: %.c
- $(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARY) $^ -o $@
+LDLIBS+=-lGP -lGP_SDL -lSDL -L$(TOPDIR)/build/
-clean:
- rm -f *.o
- rm -f $(TESTS)
+APPS=$(CSOURCES:.c=)
+include $(TOPDIR)/include.mk
+include $(TOPDIR)/app.mk
-----------------------------------------------------------------------
Summary of changes:
tests/drivers/Makefile | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 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 db6777f82eb9c87d31fd68beed98624f4441024e (commit)
from 444015ece1a074f982dbe7d8f110f295acddc90a (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/db6777f82eb9c87d31fd68beed98624f4441…
commit db6777f82eb9c87d31fd68beed98624f4441024e
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Nov 14 23:11:05 2011 +0100
build: having config removed in 'make clean' is wrong
Added 'make distclean' for that.
diff --git a/Makefile b/Makefile
index d2d16f5..4f303c0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,21 @@ build:
clean:
ifdef VERBOSE
- rm config.h config.gen.mk
$(MAKE) -C build clean
else
- @rm config.h config.gen.mk
@echo "/build"
@$(MAKE) --no-print-directory -C build clean
endif
+distclean:
+ifdef VERBOSE
+ rm config.h config.gen.mk
+ $(MAKE) clean
+else
+ @$(MAKE) clean
+ @rm config.h config.gen.mk
+endif
+
HEADER_LOC=/usr/include/
LIB_LOC=/usr/lib/
-----------------------------------------------------------------------
Summary of changes:
Makefile | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 444015ece1a074f982dbe7d8f110f295acddc90a (commit)
from c4ae73720b3f73c4c93cc9d697c07b4353c54ce1 (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/444015ece1a074f982dbe7d8f110f295acdd…
commit 444015ece1a074f982dbe7d8f110f295acddc90a
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Nov 14 21:04:59 2011 +0100
build: Fix some linker flags, needs to be fixed properly in future.
diff --git a/app.mk b/app.mk
index 9b31c14..0b301df 100644
--- a/app.mk
+++ b/app.mk
@@ -2,7 +2,7 @@ ifndef APPS
$(error APPS not defined, fix your library Makefile)
endif
-LDFLAGS+=-lpng -ljpeg
+LDLIBS+=-lpng -ljpeg -lm -ldl
all: $(APPS)
diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile
index 28ea051..3f631db 100644
--- a/tests/drivers/Makefile
+++ b/tests/drivers/Makefile
@@ -1,4 +1,4 @@
-LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg
+LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg -lm
INCLUDE=-I../../include
# Some warnings are triggered only with -O2
# thuss added here
-----------------------------------------------------------------------
Summary of changes:
app.mk | 2 +-
tests/drivers/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 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 c4ae73720b3f73c4c93cc9d697c07b4353c54ce1 (commit)
from d9ac064e99ae31787e556d4f10bf3f4afd93acda (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/c4ae73720b3f73c4c93cc9d697c07b4353c5…
commit c4ae73720b3f73c4c93cc9d697c07b4353c54ce1
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Nov 14 20:53:56 2011 +0100
build: fix configure for portable shells
diff --git a/configure b/configure
index b252512..12c3a89 100755
--- a/configure
+++ b/configure
@@ -23,7 +23,7 @@ def header_exists(cfg, filename):
def c_try_compile(cfg, code, msg):
sys.stderr.write(msg)
- ret = os.system("echo '{0}' | {1} -x c -o /dev/null - &>/dev/null".format(code, cfg["CC"][0]))
+ ret = os.system("echo '{0}' | {1} -x c -o /dev/null - > /dev/null 2>&1".format(code, cfg["CC"][0]))
if ret:
sys.stderr.write("Non")
@@ -39,7 +39,7 @@ def c_compiler_exists(cfg):
def python_module_installed(cfg, module):
sys.stderr.write("Checking for python module {0} ... ".format(module))
- ret = os.system("echo 'import {0}' | {1}".format(module, cfg['PYTHON_BIN'][0]))
+ ret = os.system("echo 'import {0}' | {1} > /dev/null 2>&1".format(module, cfg['PYTHON_BIN'][0]))
if ret:
sys.stderr.write('Non')
-----------------------------------------------------------------------
Summary of changes:
configure | 4 ++--
1 files changed, 2 insertions(+), 2 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 2c010bf3f32376abf437e23b4edf4735adb1f957 (commit)
from 024061fd56190b6434c9b74a25a19374ca4c02c8 (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/2c010bf3f32376abf437e23b4edf4735adb1…
commit 2c010bf3f32376abf437e23b4edf4735adb1f957
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Mon Nov 14 00:28:38 2011 +0100
grinder: Add progress callback for image loading too.
diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c
index 0122417..858b2a6 100644
--- a/demos/grinder/grinder.c
+++ b/demos/grinder/grinder.c
@@ -35,7 +35,7 @@ static const char *progress_prefix = NULL;
static int show_progress(GP_ProgressCallback *self)
{
- fprintf(stderr, "rFilter %s %3.2f%%",
+ fprintf(stderr, "r%s %3.2f%%",
progress_prefix, self->percentage);
return 0;
@@ -502,8 +502,11 @@ static void apply_filters(GP_Context **src)
GP_RetCode ret;
for (i = 0; i < filter_cnt; i++) {
-
- progress_prefix = filters[i]->name;
+ char buf[255];
+
+ snprintf(buf, sizeof(buf), "Filter %s", filters[i]->name);
+
+ progress_prefix = buf;
if ((ret = filters[i]->apply(src, filter_params[i]))) {
fprintf(stderr, "Error: %sn", GP_RetCodeName(ret));
@@ -606,11 +609,16 @@ int main(int argc, char *argv[])
snprintf(buf, sizeof(buf), "out_%i.ppm", i - optind + 1);
fprintf(stderr, "Processing '%s' -> '%s'n", argv[i], buf);
- if ((ret = GP_LoadImage(argv[i], &bitmap, NULL))) {
+ progress_prefix = "Loading image";
+
+ if ((ret = GP_LoadImage(argv[i], &bitmap, progress_callback))) {
fprintf(stderr, "Failed to load bitmap: %sn",
GP_RetCodeName(ret));
return 1;
}
+
+ if (progress_callback != NULL)
+ fprintf(stderr, " donen");
apply_filters(&bitmap);
-----------------------------------------------------------------------
Summary of changes:
demos/grinder/grinder.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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.")