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 18183ede44829436ce42ce740974c63fe5f92ac6 (commit) from 76d600658de2a46ded4ba41e6f16802eef40a794 (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/18183ede44829436ce42ce740974c63fe5f92... commit 18183ede44829436ce42ce740974c63fe5f92ac6 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Sep 28 17:36:25 2011 +0200 Get rid of -std=gnu9 as it breaks clang. diff --git a/config.mk b/config.mk index 226cc5e..b37929d 100644 --- a/config.mk +++ b/config.mk @@ -1,4 +1,4 @@ -CFLAGS+=-W -Wall -Wextra -fPIC -O2 -std=gnu99 +CFLAGS+=-W -Wall -Wextra -fPIC -O2 CFLAGS+=-I$(TOPDIR)/include/ LDLIBS+=-ldl diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index a43c16f..11ed746 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -64,8 +64,10 @@ void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP GP_CHECK(x2 + w <= GP_ContextW(c2)); GP_CHECK(y2 + h <= GP_ContextH(c2)); - for (GP_Size i = 0; i < w; i++) - for (GP_Size j = 0; j < h; j++) { + GP_Size i, j; + + for (i = 0; i < w; i++) + for (j = 0; j < h; j++) { GP_Pixel p = GP_GetPixel(c1, x1 + i, y1 + j); if (c1->pixel_type != c2->pixel_type) p = GP_ConvertContextPixel(p, c1, c2); diff --git a/libs/core/GP_Blit.gen.c.t b/libs/core/GP_Blit.gen.c.t index cccf961..2491b0b 100644 --- a/libs/core/GP_Blit.gen.c.t +++ b/libs/core/GP_Blit.gen.c.t @@ -28,7 +28,9 @@ void GP_Blit_{{ ps.suffix }}(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_ %% if not ps.needs_bit_endian() /* General case - memcpy() each horizontal line */ - for (GP_Size i = 0; i < h; i++) + GP_Size i; + + for (i = 0; i < h; i++) memcpy(GP_PIXEL_ADDR_{{ ps.suffix }}(c2, x2, y2 + i), GP_PIXEL_ADDR_{{ ps.suffix }}(c1, x2, y2 + i), {{ ps.size/8 }} * w); @@ -48,7 +50,10 @@ void GP_Blit_{{ ps.suffix }}(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_ 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++) { + + GP_Size i; + + for (i = 0; i < h; i++) { if (al1 != 0) GP_SET_BITS(al1, 8-al1, *p2, GP_GET_BITS(al1, 8-al1, *p1)); memcpy(p2+(al1!=0), p1+(al1!=0), copy_size); diff --git a/libs/filters/GP_ScaleDown.c b/libs/filters/GP_ScaleDown.c index f4bcf70..35210cc 100644 --- a/libs/filters/GP_ScaleDown.c +++ b/libs/filters/GP_ScaleDown.c @@ -55,7 +55,7 @@ GP_Context *GP_ScaleDown(GP_Context *src) #define A 0.5 -float cubic(float x) +static float cubic(float x) { if (x < 0) x = -x; ----------------------------------------------------------------------- Summary of changes: config.mk | 2 +- libs/core/GP_Blit.c | 6 ++++-- libs/core/GP_Blit.gen.c.t | 9 +++++++-- libs/filters/GP_ScaleDown.c | 2 +- 4 files changed, 13 insertions(+), 6 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.")