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, generate has been updated via 7175cdaf66ca013f4ec1fd25e175adbeabd6501a (commit) via 5ddc1f67228f0ce6195d0b52f67516f02511006d (commit) via 37cb764fee13f5de90edebad64c54d22870590ea (commit) from 7e70914d42f31e963a39ed92efe54f31cfce0782 (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/7175cdaf66ca013f4ec1fd25e175adbeabd65... commit 7175cdaf66ca013f4ec1fd25e175adbeabd6501a Merge: 5ddc1f6 37cb764 Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Jul 17 22:17:46 2011 +0200 Merge branch 'master' into generate Conflicts: include/gfx/GP_Circle.h libs/gfx/GP_Circle.c tests/SDL/shapetest.c diff --cc include/gfx/GP_Circle.h index c82c346,e743abd..482cd51 --- a/include/gfx/GP_Circle.h +++ b/include/gfx/GP_Circle.h @@@ -28,22 -28,22 +28,22 @@@ #include "core/GP_Context.h" -void GP_Circle(GP_Context *context, int xcenter, int ycenter, - unsigned int r, GP_Pixel pixel); +void GP_Circle(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, GP_Pixel pixel); -void GP_TCircle(GP_Context *context, int xcenter, int ycenter, - unsigned int r, GP_Pixel pixel); +void GP_TCircle(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, GP_Pixel pixel); -void GP_FillCircle(GP_Context *context, int xcenter, int ycenter, - unsigned int r, GP_Pixel pixel); +void GP_FillCircle(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, GP_Pixel pixel); -void GP_TFillCircle(GP_Context *context, int xcenter, int ycenter, - unsigned int r, GP_Pixel pixel); +void GP_TFillCircle(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size r, GP_Pixel pixel); -void GP_FillRing(GP_Context *context, int xcenter, int ycenter, - unsigned int r1, unsigned int r2, GP_Pixel pixel); +void GP_FillRing(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, - GP_Size outer_r, GP_Size inner_r, GP_Pixel pixel); ++ GP_Size r1, GP_Size r2, GP_Pixel pixel); -void GP_TFillRing(GP_Context *context, int xcenter, int ycenter, - unsigned int r1, unsigned int r2, GP_Pixel pixel); +void GP_TFillRing(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, - GP_Size outer_r, GP_Size inner_r, GP_Pixel pixel); ++ GP_Size r1, GP_Size r2, GP_Pixel pixel); #endif /* GP_CIRCLE_H */ diff --cc libs/gfx/GP_Circle.c index 07b3955,b63fc98..9af9f43 --- a/libs/gfx/GP_Circle.c +++ b/libs/gfx/GP_Circle.c @@@ -78,19 -88,25 +78,19 @@@ void GP_TFillCircle(GP_Context *context #include "algo/FillRing.algo.h" /* Generate drawing functions for various bit depths. */ -DEF_FILLRING_FN(GP_FillRing1bpp, GP_Context *, GP_Pixel, GP_HLine1bpp) -DEF_FILLRING_FN(GP_FillRing2bpp, GP_Context *, GP_Pixel, GP_HLine2bpp) -DEF_FILLRING_FN(GP_FillRing4bpp, GP_Context *, GP_Pixel, GP_HLine4bpp) -DEF_FILLRING_FN(GP_FillRing8bpp, GP_Context *, GP_Pixel, GP_HLine8bpp) -DEF_FILLRING_FN(GP_FillRing16bpp, GP_Context *, GP_Pixel, GP_HLine16bpp) -DEF_FILLRING_FN(GP_FillRing24bpp, GP_Context *, GP_Pixel, GP_HLine24bpp) -DEF_FILLRING_FN(GP_FillRing32bpp, GP_Context *, GP_Pixel, GP_HLine32bpp) - -void GP_FillRing(GP_Context *context, int xcenter, int ycenter, - unsigned int r1, unsigned int r2, GP_Pixel pixel) +GP_DEF_FILL_FN_PER_BPP(GP_FillRing, DEF_FILLRING_FN) + +void GP_FillRing(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, - GP_Size outer_r, GP_Size inner_r, GP_Pixel pixel) ++ GP_Size r1, GP_Size r2, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); - GP_FN_PER_BPP(GP_FillRing, context->bpp, context, - xcenter, ycenter, r1, r2, pixel); + GP_FN_PER_BPP_CONTEXT(GP_FillRing, context, context, - xcenter, ycenter, outer_r, inner_r, pixel); ++ xcenter, ycenter, r1, r2, pixel); } -void GP_TFillRing(GP_Context *context, int xcenter, int ycenter, - unsigned int r1, unsigned int r2, GP_Pixel pixel) +void GP_TFillRing(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, - GP_Size outer_r, GP_Size inner_r, GP_Pixel pixel) ++ GP_Size r1, GP_Size r2, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); http://repo.or.cz/w/gfxprim.git/commit/5ddc1f67228f0ce6195d0b52f67516f025110... commit 5ddc1f67228f0ce6195d0b52f67516f02511006d Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Jul 17 22:02:15 2011 +0200 Fix nasty Make system bug. diff --git a/build/Makefile b/build/Makefile index 5c24ac7..709dd08 100644 --- a/build/Makefile +++ b/build/Makefile @@ -10,7 +10,7 @@ else @rm -f libGP.a libGP.so libGP.so.0 endif -libGP.a: $(LIB_OBJECTS) +libGP.a: @. ./liblock.sh; spinlock . ifdef VERBOSE $(AR) rcs libGP.a $(LIB_OBJECTS) @@ -20,7 +20,7 @@ else endif @. ./liblock.sh; spinunlock . -libGP.so: $(LIB_OBJECTS) +libGP.so: @. ./liblock.sh; spinlock . ifdef VERBOSE $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so ----------------------------------------------------------------------- Summary of changes: build/Makefile | 4 ++-- include/gfx/GP_Circle.h | 4 ++-- libs/gfx/GP_Circle.c | 8 ++++---- libs/gfx/algo/FillRing.algo.h | 16 ++++++++-------- tests/SDL/shapetest.c | 9 ++------- 5 files changed, 18 insertions(+), 23 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")