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 72f38ee0793386a9c792698c6f4b3a4a79ee1352 (commit) via 0c844829becd157cf17399680c5ff58ae5d5f6a0 (commit) from 8880f10fb3be9e8518ae73b26e4c3723a148aba9 (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/72f38ee0793386a9c792698c6f4b3a4a79ee1... commit 72f38ee0793386a9c792698c6f4b3a4a79ee1352 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Tue Aug 16 17:45:29 2011 +0200 Remove most of the "owerflow" warnings, remove make flag diff --git a/include/core/GP_GetPutPixel.gen.h.t b/include/core/GP_GetPutPixel.gen.h.t index 26a73d7..c29ae57 100644 --- a/include/core/GP_GetPutPixel.gen.h.t +++ b/include/core/GP_GetPutPixel.gen.h.t @@ -45,8 +45,13 @@ struct GP_Context; */ static inline GP_Pixel GP_GetPixel_Raw_{{ ps.suffix }}(const GP_Context *c, int x, int y) { +{# Special case to prevent some of the "overflow" warnings -#} +%% if ps.size == config.pixel_size + return *(GP_PIXEL_ADDR_{{ ps.suffix}}(c, x, y)); +%% else return GP_GET_BITS(GP_PIXEL_ADDR_OFFSET_{{ ps.suffix }}(x), {{ ps.size }}, *(GP_PIXEL_ADDR_{{ ps.suffix}}(c, x, y))); +%% endif } /* @@ -54,8 +59,13 @@ static inline GP_Pixel GP_GetPixel_Raw_{{ ps.suffix }}(const GP_Context *c, int */ static inline void GP_PutPixel_Raw_{{ ps.suffix }}(GP_Context *c, int x, int y, GP_Pixel p) { +{# Special case to prevent some of the "overflow" warnings -#} +%% if ps.size == config.pixel_size + *(GP_PIXEL_ADDR_{{ ps.suffix}}(c, x, y)) = p; +%% else GP_SET_BITS(GP_PIXEL_ADDR_OFFSET_{{ ps.suffix }}(x), {{ ps.size }}, *(GP_PIXEL_ADDR_{{ ps.suffix}}(c, x, y)), p); +%% endif } %% endfor diff --git a/libs/core/Makefile b/libs/core/Makefile index 5bcadca..b8c7cf7 100644 --- a/libs/core/Makefile +++ b/libs/core/Makefile @@ -3,7 +3,6 @@ GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c GENHEADERS=GP_Convert_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=core -CFLAGS+=-Wno-overflow include $(TOPDIR)/gen.mk include $(TOPDIR)/include.mk http://repo.or.cz/w/gfxprim.git/commit/0c844829becd157cf17399680c5ff58ae5d5f... commit 0c844829becd157cf17399680c5ff58ae5d5f6a0 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Tue Aug 16 17:42:42 2011 +0200 Fix a type-cast warning diff --git a/libs/core/GP_Blit.gen.c.t b/libs/core/GP_Blit.gen.c.t index 39f839d..cccf961 100644 --- a/libs/core/GP_Blit.gen.c.t +++ b/libs/core/GP_Blit.gen.c.t @@ -44,10 +44,10 @@ void GP_Blit_{{ ps.suffix }}(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_ GP_ASSERT(({{ ps.size }} * w - al1 - end_al) % 8 == 0); int copy_size = ({{ ps.size }} * w - al1 - end_al) / 8; /* First and last byte incident to the line */ - uint8_t *p1 = GP_PIXEL_ADDR_{{ ps.suffix }}(c1, x1, y1); - uint8_t *p2 = GP_PIXEL_ADDR_{{ ps.suffix }}(c2, x2, y2); - uint8_t *end_p1 = GP_PIXEL_ADDR_{{ ps.suffix }}(c1, x1 + w - 1, y1); - uint8_t *end_p2 = GP_PIXEL_ADDR_{{ ps.suffix }}(c2, x2 + w - 1, y2); + uint8_t *p1 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(c1, x1, y1); + uint8_t *p2 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(c2, x2, y2); + uint8_t *end_p1 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(c1, x1 + w - 1, y1); + uint8_t *end_p2 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(c2, x2 + w - 1, y2); for (GP_Size i = 0; i < h; i++) { if (al1 != 0) GP_SET_BITS(al1, 8-al1, *p2, GP_GET_BITS(al1, 8-al1, *p1)); ----------------------------------------------------------------------- Summary of changes: include/core/GP_GetPutPixel.gen.h.t | 10 ++++++++++ libs/core/GP_Blit.gen.c.t | 8 ++++---- libs/core/Makefile | 1 - 3 files changed, 14 insertions(+), 5 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.")