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 e40b6e745f6ca131059addb2b05297eccf9a474a (commit)
from 43abee9f954cd26c59f8da03f3bb40a8e717213f (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/e40b6e745f6ca131059addb2b05297eccf9a…
commit e40b6e745f6ca131059addb2b05297eccf9a474a
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Sun Jan 6 11:09:04 2013 +0100
build: Disable implicit rules in build/ dir.
This fixes build bug, when you have changed
files in several libs/*/ directories and
started make (to rebuild the library) from
within one of the directories.
diff --git a/build/Makefile b/build/Makefile
index d384f4c..d4a8b5d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,5 +1,7 @@
LIB_OBJECTS=$(shell ./get_objs.sh)
+.SUFFIXES:
+
include ../libver.mk
LIB_NAME=libGP
-----------------------------------------------------------------------
Summary of changes:
build/Makefile | 2 ++
1 files changed, 2 insertions(+), 0 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 482970c5ab94aa39981b016794510d9a445ea93b (commit)
from 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac (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/482970c5ab94aa39981b016794510d9a445e…
commit 482970c5ab94aa39981b016794510d9a445ea93b
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Thu Jan 3 01:44:18 2013 +0100
loaders: png: Load images with alpha channel too.
We have limited support for blits with alpha channel
and spiv can now show some of the pngs with it.
diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c
index c963794..1c11d54 100644
--- a/libs/loaders/GP_PNG.c
+++ b/libs/loaders/GP_PNG.c
@@ -166,15 +166,26 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback)
}
break;
case PNG_COLOR_TYPE_RGB:
-
+
png_set_bgr(png);
-
+
switch (depth) {
case 8:
pixel_type = GP_PIXEL_RGB888;
break;
}
break;
+ case PNG_COLOR_TYPE_RGB | PNG_COLOR_MASK_ALPHA:
+
+ png_set_bgr(png);
+ png_set_swap_alpha(png);
+
+ switch (depth) {
+ case 8:
+ pixel_type = GP_PIXEL_RGBA8888;
+ break;
+ }
+ break;
case PNG_COLOR_TYPE_PALETTE:
/* Grayscale with BPP < 8 is usually saved as palette */
if (png_get_channels(png, png_info) == 1) {
@@ -192,14 +203,16 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback)
png_set_bgr(png);
png_read_update_info(png, png_info);
-
+
png_get_IHDR(png, png_info, &w, &h, &depth,
&color_type, NULL, NULL, NULL);
- if (color_type & PNG_COLOR_MASK_ALPHA)
- pixel_type = GP_PIXEL_UNKNOWN;
- else
+ if (color_type & PNG_COLOR_MASK_ALPHA) {
+ pixel_type = GP_PIXEL_RGBA8888;
+ png_set_swap_alpha(png);
+ } else {
pixel_type = GP_PIXEL_RGB888;
+ }
break;
}
-----------------------------------------------------------------------
Summary of changes:
libs/loaders/GP_PNG.c | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac (commit)
from af10f6c3b8c240b32ed5cfb4895908b133cdb845 (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/915c8aa8fc5ebe66b6a9629f57f5d724700c…
commit 915c8aa8fc5ebe66b6a9629f57f5d724700c10ac
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Thu Jan 3 01:19:00 2013 +0100
build: Add forgotten libGP.* dependency.
The library dependency on object files
was accidentally dropped. Add it back.
diff --git a/build/Makefile b/build/Makefile
index 5b8a115..38ce4ca 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -21,7 +21,7 @@ else
@rm -rf $(STATIC_LIB) $(DYNAMIC_LIB) $(SYMLINKS)
endif
-$(STATIC_LIB):
+$(STATIC_LIB): $(LIB_OBJECTS)
ifdef VERBOSE
$(AR) rcs $@ $(LIB_OBJECTS)
else
@@ -29,7 +29,7 @@ else
@$(AR) rcs $@ $(LIB_OBJECTS)
endif
-$(DYNAMIC_LIB):
+$(DYNAMIC_LIB): $(LIB_OBJECTS)
ifdef VERBOSE
$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(SONAME) $(LIB_OBJECTS) -o $@
else
-----------------------------------------------------------------------
Summary of changes:
build/Makefile | 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 af10f6c3b8c240b32ed5cfb4895908b133cdb845 (commit)
via 905d21493a6a2ccbc57820084fbca6cd3286df8a (commit)
from 14eef5929f17ab225a542656b639e0569ec8af7b (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/af10f6c3b8c240b32ed5cfb4895908b133cd…
commit af10f6c3b8c240b32ed5cfb4895908b133cdb845
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Wed Jan 2 22:37:09 2013 +0100
build: Remove now unused build knob.
diff --git a/config.mk b/config.mk
index c65c19d..5a05ef1 100644
--- a/config.mk
+++ b/config.mk
@@ -13,10 +13,3 @@ PYTHON_INCLUDE=`python-config --include`
PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror
SWIGOPTS=-w322,314 -I/usr/include/
-
-#
-# If set to yes, rebuilds libGP* after typing make
-# in any of the libs/*/ directories that are linked
-# to libGP*.
-#
-REBUILD_LIBGP=yes
http://repo.or.cz/w/gfxprim.git/commit/905d21493a6a2ccbc57820084fbca6cd3286…
commit 905d21493a6a2ccbc57820084fbca6cd3286df8a
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Wed Jan 2 22:36:15 2013 +0100
build: install spiv demo by default.
diff --git a/install.sh b/install.sh
index b0d3873..f631083 100755
--- a/install.sh
+++ b/install.sh
@@ -40,3 +40,4 @@ done
# Binaries
echo "INSTALL binaries"
install -m 755 gfxprim-config "$BIN_LOC"
+install -m 755 demos/spiv/spiv "$BIN_LOC"
-----------------------------------------------------------------------
Summary of changes:
config.mk | 7 -------
install.sh | 1 +
2 files changed, 1 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 14eef5929f17ab225a542656b639e0569ec8af7b (commit)
from 0a1577d93e3b866dda65e0aac1831b015628d4ca (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/14eef5929f17ab225a542656b639e0569ec8…
commit 14eef5929f17ab225a542656b639e0569ec8af7b
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Wed Jan 2 22:27:11 2013 +0100
build: Fix typo in lib.mk.
diff --git a/lib.mk b/lib.mk
index 0c5917b..62bf1b5 100644
--- a/lib.mk
+++ b/lib.mk
@@ -28,27 +28,27 @@ ALL+=$(LIBS) $(SYMLINKS)
CLEAN+=$(LIBS) $(addprefix $(BUILD_DIR),$(SYMLINKS))
#
-# OBJECTS are set in post.mk so we need to set it here too to have
-# correct dependencies we don't care that they are overwritten laten
+# OBJECTS are set in post.mk so we need to duplicate the values in
+# OBJS here too to have correct dependencies
#
-OBJECTS=$(CSOURCES=.c=.o)
+OBJS=$(CSOURCES:.c=.o)
-$(BUILD_DIR)$(DYNAMIC_LIB): $(OBJECTS)
+$(BUILD_DIR)$(DYNAMIC_LIB): $(OBJS)
ifdef VERBOSE
rm -f $@
- $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(OBJECTS) -o $@
+ $(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $? -o $@
else
@rm -f $(@)
@echo "LD $@"
- @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $(OBJECTS) -o $@
+ @$(CC) -fPIC --shared -Wl,-soname -Wl,$(SONAME) $? -o $@
endif
-$(BUILD_DIR)$(STATIC_LIB): $(OBJECTS)
+$(BUILD_DIR)$(STATIC_LIB): $(OBJS)
ifdef VERBOSE
- $(AR) rcs $@ $(OBJECTS)
+ $(AR) rcs $@ $?
else
@echo "AR $@"
- @$(AR) rcs $@ $(OBJECTS)
+ @$(AR) rcs $@ $?
endif
$(SYMLINKS): $(BUILD_DIR)$(DYNAMIC_LIB)
-----------------------------------------------------------------------
Summary of changes:
lib.mk | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 0a1577d93e3b866dda65e0aac1831b015628d4ca (commit)
from 388daed53031b9c5e256025809e9d10c3849708c (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/0a1577d93e3b866dda65e0aac1831b015628…
commit 0a1577d93e3b866dda65e0aac1831b015628d4ca
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Wed Jan 2 22:16:30 2013 +0100
build: Fix the install script.
It's a little hacked together but
at least it works now.
diff --git a/install.sh b/install.sh
index c0273e0..b0d3873 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@
INSTALL_PREFIX="$1"
if test -z "$INSTALL_PREFIX"; then
- INSTALL_PREFIX="/usr/"
+ INSTALL_PREFIX="/usr"
fi
HEADER_LOC="$INSTALL_PREFIX/include/"
@@ -26,7 +26,16 @@ done
# Library
echo "INSTALL libraries"
install -m 775 -d "$LIB_LOC"
-install -m 664 build/*.so build/*.so.0 build/*.a "$LIB_LOC"
+
+for i in build/*.so build/*.so.* build/*.a; do
+ if [ -L "$i" ]; then
+ TARGET=`basename "$i"`
+ SOURCE=`readlink "$i"`
+ (cd "$LIB_LOC" && rm -f "$TARGET" && ln -s "$LIB_LOC$SOURCE" "$TARGET")
+ else
+ install "$i" "$LIB_LOC"
+ fi
+done
# Binaries
echo "INSTALL binaries"
-----------------------------------------------------------------------
Summary of changes:
install.sh | 13 +++++++++++--
1 files changed, 11 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 9732f5ac369f2bdf45492cfa4af74092654371aa (commit)
via fbf455bd345b12cb63ba51b4b0667412f115ae69 (commit)
from 6cc070b5aeb9f343e31567748ba8ad8a1731261c (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/9732f5ac369f2bdf45492cfa4af740926543…
commit 9732f5ac369f2bdf45492cfa4af74092654371aa
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Wed Jan 2 20:39:48 2013 +0100
build: Update lists of exported symbols.
diff --git a/build/syms/Core_symbols.txt b/build/syms/Core_symbols.txt
index 3de2293..72ee71f 100644
--- a/build/syms/Core_symbols.txt
+++ b/build/syms/Core_symbols.txt
@@ -12,11 +12,13 @@ GP_ContextFree
GP_ContextInit
GP_SubContext
GP_ContextCopy
+GP_ContextEqual
GP_PixelAddrOffset
GP_GammaRelease
GP_GammaCopy
GP_GammaAcquire
+GP_GammaPrint
GP_DebugPrint
GP_SetDebugLevel
@@ -43,14 +45,14 @@ GP_BlitXYXY_Raw
GP_WritePixels_1BPP_LE
GP_WritePixels_2BPP_LE
GP_WritePixels_4BPP_LE
-GP_WritePixels1bpp
-GP_WritePixels2bpp
-GP_WritePixels4bpp
-GP_WritePixels8bpp
-GP_WritePixels16bpp
-GP_WritePixels18bpp
-GP_WritePixels32bpp
-GP_WritePixels24bpp
+GP_WritePixels_1BPP_BE
+GP_WritePixels_2BPP_BE
+GP_WritePixels_4BPP_BE
+GP_WritePixels_8BPP
+GP_WritePixels_16BPP
+GP_WritePixels_18BPP_LE
+GP_WritePixels_24BPP
+GP_WritePixels_32BPP
GP_PutPixel
GP_GetPixel
diff --git a/build/syms/GFX_symbols.txt b/build/syms/GFX_symbols.txt
index d6ed889..c3566ae 100644
--- a/build/syms/GFX_symbols.txt
+++ b/build/syms/GFX_symbols.txt
@@ -1,9 +1,21 @@
+GP_Line
GP_Line_Raw
+GP_LineAA
+GP_LineAA_Raw
+GP_LineClip
+
GP_Line_Raw_4BPP_LE
GP_Line_Raw_2BPP_BE
-GP_HLine_Raw_32BPP
-GP_LineAA
GP_Line_Raw_32BPP
+GP_Line_Raw_8BPP
+GP_Line_Raw_2BPP_LE
+GP_Line_Raw_16BPP
+GP_Line_Raw_24BPP
+GP_Line_Raw_18BPP_LE
+GP_Line_Raw_1BPP_LE
+GP_Line_Raw_4BPP_BE
+GP_Line_Raw_1BPP_BE
+
GP_HLineXYW_Raw
GP_HLine_Raw_8BPP
GP_HLineAA
@@ -12,24 +24,15 @@ GP_HLine_Raw_1BPP_LE
GP_HLine_Raw_4BPP_BE
GP_HLine_Raw_2BPP_BE
GP_HLine_Raw_24BPP
-GP_Line_Raw_24BPP
-GP_Line_Raw_1BPP_BE
+GP_HLine_Raw_32BPP
GP_HLineXXY
GP_HLine_Raw_4BPP_LE
-GP_Line_Raw_18BPP_LE
-GP_Line_Raw_1BPP_LE
-GP_Line_Raw_4BPP_BE
GP_HLineXXY_Raw
GP_HLine_Raw_1BPP_BE
-GP_Line
-GP_Line_Raw_8BPP
-GP_Line_Raw_2BPP_LE
-GP_HLine_Raw_18BPP_LE
-GP_HLineAA_Raw
-GP_Line_Raw_16BPP
GP_HLine_Raw_2BPP_LE
GP_HLine_Raw_16BPP
-GP_LineAA_Raw
+GP_HLine_Raw_18BPP_LE
+GP_HLineAA_Raw
GP_VLineXYY_Raw
GP_VLineAA
http://repo.or.cz/w/gfxprim.git/commit/fbf455bd345b12cb63ba51b4b0667412f115…
commit fbf455bd345b12cb63ba51b4b0667412f115ae69
Author: Cyril Hrubis <metan(a)ucw.cz>
Date: Wed Jan 2 01:26:43 2013 +0100
doc: context: Fix subcontext desc, add link to dithering.
diff --git a/doc/context.txt b/doc/context.txt
index b973f91..df6ff47 100644
--- a/doc/context.txt
+++ b/doc/context.txt
@@ -217,17 +217,19 @@ Subcontext
~~~~~~~~~~
A subcontext is a context that refers to a rectangular area within another
-context. Subcontexts can be used as any other context (including creating
-another subcontexts). Generally the subcontexts behave exactly as any other
-contexts with one exception, if you create several overlapping subcontexts the
-results may be unexpected.
-
-Calling 'GP_ContextFree()' on a allocated subcontext is safe; the bitmap is not
-freed as it belongs to another context; it will be freed with the hosting
-context (i.e. the 'free_pixels' flag is not set when creating subcontext). On
-the other hand, the subcontext doesn't hold a reference to the original
-context, so once the parent context is freed the subcontext pixel pointer is
-not valid anymore.
+context. Subcontexts can be used as any other contexts (including subcontext
+creation).
+
+WARNING: If you create overlaping subcontexts the result is undefined.
+
+Calling 'GP_ContextFree()' on a allocated subcontext is safe; the bitmap is
+not freed as it belongs to another context; it will be freed when the parent
+context is freed (i.e. the 'free_pixels' flag is not set when creating
+subcontext).
+
+CAUTION: The subcontext doesn't hold a reference to the original context, so
+ once the parent context is freed the subcontext pixels pointer is not
+ valid anymore.
[source,c]
-------------------------------------------------------------------------------
@@ -242,7 +244,8 @@ GP_Context *GP_SubContextAlloc(const GP_Context *context,
GP_Coord x, GP_Coord y, GP_Size w, GP_Size h);
-------------------------------------------------------------------------------
-Creates subcontext of a context. The rectangular area must fit into the context.
+Creates subcontext of a context. The rectangular area must fit into the parent
+context.
The 'GP_SubContext()' function initializes the passed pointer as a subcontext
of a context and returns pointer to the initialized subcontext (i.e. the same
@@ -273,7 +276,7 @@ Converts a context to different pixel type.
This is naive implementation that only multiplies/divides the pixel values.
-To get a better result use dithering filters instead.
+To get a better result use link:filters.html#Dithering[dithering filters] instead.
Misc
~~~~
diff --git a/doc/filters.txt b/doc/filters.txt
index d15b3aa..dba963e 100644
--- a/doc/filters.txt
+++ b/doc/filters.txt
@@ -926,6 +926,7 @@ downscaling. To do this reasonably fast we could cheat a little: first resize
big images a little without the low-pass filter, then apply low-pass filter and
finally downscale it to desired size.
+[[Dithering]]
Dithering
~~~~~~~~~
-----------------------------------------------------------------------
Summary of changes:
build/syms/Core_symbols.txt | 18 ++++++++++--------
build/syms/GFX_symbols.txt | 31 +++++++++++++++++--------------
doc/context.txt | 29 ++++++++++++++++-------------
doc/filters.txt | 1 +
4 files changed, 44 insertions(+), 35 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.")