[Gfxprim] [repo.or.cz] gfxprim.git branch generate updated: d3954003b5befd6bffb6f94106bae1c25185ab93

gavento gavento at ucw.cz
Tue Aug 16 00:08:18 CEST 2011


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  d3954003b5befd6bffb6f94106bae1c25185ab93 (commit)
       via  e6e4bd2d38903632e1b0e255e6c9afcd62b5622a (commit)
       via  00b47c68244ad4286267fd11514baebf286f686d (commit)
       via  f701e7653f842a98bdd0b32dac7318af8e49bf32 (commit)
       via  6307b2d10257649177470bce95638a3284684bdd (commit)
      from  59ca35df4a090bfb9ba4e17504263512e3225eef (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/d3954003b5befd6bffb6f94106bae1c25185ab93

commit d3954003b5befd6bffb6f94106bae1c25185ab93
Author: Tomas Gavenciak <gavento at ucw.cz>
Date:   Tue Aug 16 00:07:21 2011 +0200

    Fixed pointer types in Put/GetPixel. Fix pixel offset.

diff --git a/include/core/GP_GetPutPixel.gen.h.t b/include/core/GP_GetPutPixel.gen.h.t
index 1ee473c..26a73d7 100644
--- a/include/core/GP_GetPutPixel.gen.h.t
+++ b/include/core/GP_GetPutPixel.gen.h.t
@@ -16,7 +16,7 @@ struct GP_Context;
  * macro to get address of pixel in a {{ ps.suffix }} context
  */
 #define GP_PIXEL_ADDR_{{ ps.suffix }}(context, x, y) -	((context)->pixels + (context)->bytes_per_row * (y) + {{ ps.size // 8 }} * (x))
+	((GP_Pixel*)(((void*)((context)->pixels)) + (context)->bytes_per_row * (y) + ({{ ps.size }} * (x)) / 8))
 
 /*
  * macro to get bit-offset of pixel in {{ ps.suffix }} context
@@ -29,7 +29,7 @@ struct GP_Context;
 %% if ps.size < 8
 	(((x) % {{ 8 // ps.size }}) * {{ ps.size }})
 %% else
-	(((x) * {{ ps.size }}) / 8)
+	(({{ ps.size }} * (x)) % 8)
 %% endif
 %% else
 %% if ps.size < 8

http://repo.or.cz/w/gfxprim.git/commit/e6e4bd2d38903632e1b0e255e6c9afcd62b5622a

commit e6e4bd2d38903632e1b0e255e6c9afcd62b5622a
Author: Tomas Gavenciak <gavento at ucw.cz>
Date:   Mon Aug 15 21:05:12 2011 +0200

    Minor replacement by GP_PIXEL_BITS

diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h
index 45bcf19..fb38acb 100644
--- a/include/core/GP_Pixel.h
+++ b/include/core/GP_Pixel.h
@@ -106,9 +106,9 @@ typedef struct {
 	GP_BIT_ENDIAN bit_endian; /* Order of pixels in a byte */
 	uint8_t numchannels;      /* Number of channels */
 	/* String describing the bit-representaton (as in "RRRRRGGGGGGBBBBB")*/
-	const char bitmap[sizeof(GP_Pixel) * 8 + 1];  
+	const char bitmap[GP_PIXEL_BITS + 1];
 	/* Individual channels */
-	const GP_PixelTypeChannel channels[GP_PIXELTYPE_MAX_CHANNELS]; 
+	const GP_PixelTypeChannel channels[GP_PIXELTYPE_MAX_CHANNELS];
 } GP_PixelTypeDescription;
 
 /*

http://repo.or.cz/w/gfxprim.git/commit/00b47c68244ad4286267fd11514baebf286f686d

commit 00b47c68244ad4286267fd11514baebf286f686d
Author: Tomas Gavenciak <gavento at ucw.cz>
Date:   Mon Aug 15 20:14:24 2011 +0200

    test running: remove verbose mode
    
    (all errors still printed)

diff --git a/tests.mk b/tests.mk
index d18d86a..39f0835 100644
--- a/tests.mk
+++ b/tests.mk
@@ -49,7 +49,7 @@ endif # TESTSUITE
 tests: $(TESTS)
 
 runtests: tests
-	for test in $(TESTS); do LD_LIBRARY_PATH=../../build ./"$$test" -v ; done
+	for test in $(TESTS); do LD_LIBRARY_PATH=../../build ./"$$test"; done
 
 # WARN: avoid double includion?
 include $(TOPDIR)/gen.mk

http://repo.or.cz/w/gfxprim.git/commit/f701e7653f842a98bdd0b32dac7318af8e49bf32

commit f701e7653f842a98bdd0b32dac7318af8e49bf32
Author: Tomas Gavenciak <gavento at ucw.cz>
Date:   Mon Aug 15 20:13:20 2011 +0200

    Fix test: remove suspicious aliasing

diff --git a/tests/core/GP_Common.test.c b/tests/core/GP_Common.test.c
index 0fe2b1f..9695d93 100644
--- a/tests/core/GP_Common.test.c
+++ b/tests/core/GP_Common.test.c
@@ -29,7 +29,7 @@
  * Demo ("testing" ;-) tests for GP_Common.h
  */
 
-GP_SUITE(GP_Common) 
+GP_SUITE(GP_Common)
 
 GP_TEST(min_max)
 {
@@ -56,17 +56,19 @@ GP_TEST(set_bits)
 	uint16_t *y = (uint16_t*) &x;
 	GP_CLEAR_BITS(3, 4, x);
 	fail_unless(x == 0x89A84);
-	GP_SET_BITS_OR(10, x, 0x0000000); 
+	GP_SET_BITS_OR(10, x, 0x0000000);
 	fail_unless(x == 0x89A84);
-	GP_SET_BITS(24, 18, x, 0x42F1); 
+	GP_SET_BITS(24, 18, x, 0x42F1);
 	fail_unless(x == 0xF1089A84);
 	/* Check that only uint16_t is affected */
-	GP_SET_BITS(0, 24, *y, 0x100F000LL); 
+/* TODO: Fix aliasing problems with this test 
+	GP_SET_BITS(0, 24, *y, 0x100F000LL);
 #	if __BYTE_ORDER == __BIG_ENDIAN
 	fail_unless(x == 0xF108F000);
 #	else
 	fail_unless(x == 0x100F9A84);
-#	endif
+#	endif 
+*/
 }
 GP_ENDTEST
 

http://repo.or.cz/w/gfxprim.git/commit/6307b2d10257649177470bce95638a3284684bdd

commit 6307b2d10257649177470bce95638a3284684bdd
Author: Tomas Gavenciak <gavento at ucw.cz>
Date:   Mon Aug 15 20:12:48 2011 +0200

    Fix test: RGB888 byte order

diff --git a/tests/core/GP_Convert.test.c b/tests/core/GP_Convert.test.c
index 3f80a3a..19e8f9d 100644
--- a/tests/core/GP_Convert.test.c
+++ b/tests/core/GP_Convert.test.c
@@ -16,7 +16,7 @@ GP_TEST(BasicPixelConversions)
 	p1 = GP_RGBAToPixel(0, 0, 0, 0, GP_PIXEL_RGBA8888);
 	fail_unless(p1 == 0x0);
 	p1 = GP_RGBToPixel(0x12, 0x34, 0x56, GP_PIXEL_RGB888);
-	fail_unless(p1 == 0x563412);
+	fail_unless(p1 == 0x123456);
 	GP_CHECK_EqualColors(p1, GP_PIXEL_RGB888, p1, GP_PIXEL_RGB888);
 	
 	p1 = GP_RGB888ToPixel(GP_RGBToPixel(0x12, 0x34, 0x56, GP_PIXEL_RGB888), GP_PIXEL_V4);

-----------------------------------------------------------------------

Summary of changes:
 include/core/GP_GetPutPixel.gen.h.t |    4 ++--
 include/core/GP_Pixel.h             |    4 ++--
 tests.mk                            |    2 +-
 tests/core/GP_Common.test.c         |   12 +++++++-----
 tests/core/GP_Convert.test.c        |    2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)


repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos at gmail.com
if you want to unsubscribe, or site admin admin at repo.or.cz if you receive
no reply.
-- 
gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")



More information about the Gfxprim mailing list