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 7fc258147bf9b322a730cd1bc426bee0b668f8f5 (commit) from 3223defa8a39310a0b60f6ce933e0cca072068d8 (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/7fc258147bf9b322a730cd1bc426bee0b668f...

commit 7fc258147bf9b322a730cd1bc426bee0b668f8f5 Author: Cyril Hrubis metan@ucw.cz Date: Sat Aug 20 20:45:43 2011 +0200

Changed the GP_PIXEL_Vx to GP_PIXEL_Gx.

diff --git a/gfxprim_config.py b/gfxprim_config.py index 174f82d..97446ac 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -85,16 +85,16 @@ config = GfxPrimConfig( # Gray-only pixel types #

- PixelType(name='V1', pixelsize=PS_1BPP_LE, chanslist=[ + PixelType(name='G1', pixelsize=PS_1BPP_LE, chanslist=[ ('V', 0, 1)]),

- PixelType(name='V2', pixelsize=PS_2BPP_LE, chanslist=[ + PixelType(name='G2', pixelsize=PS_2BPP_LE, chanslist=[ ('V', 0, 2)]),

- PixelType(name='V4', pixelsize=PS_4BPP_LE, chanslist=[ + PixelType(name='G4', pixelsize=PS_4BPP_LE, chanslist=[ ('V', 0, 4)]),

- PixelType(name='V8', pixelsize=PS_8BPP, chanslist=[ + PixelType(name='G8', pixelsize=PS_8BPP, chanslist=[ ('V', 0, 8)]),

# diff --git a/include/core/GP_Convert.gen.h.t b/include/core/GP_Convert.gen.h.t index 05a5606..56759ee 100644 --- a/include/core/GP_Convert.gen.h.t +++ b/include/core/GP_Convert.gen.h.t @@ -80,7 +80,7 @@ GP_Pixel GP_PixelTo{{ pt.name }}(GP_Pixel pixel, GP_PixelType type);

/* Experimental macros testing generated scripts */ {{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['RGB565'], pixeltypes_dict['RGBA8888']) }} -{{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['RGBA8888'], pixeltypes_dict['V2']) }} +{{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['RGBA8888'], pixeltypes_dict['G2']) }} {{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['VA12'], pixeltypes_dict['RGBA8888']) }}

%% endblock body diff --git a/libs/loaders/GP_PBM.c b/libs/loaders/GP_PBM.c index a90ed8b..5b09153 100644 --- a/libs/loaders/GP_PBM.c +++ b/libs/loaders/GP_PBM.c @@ -62,7 +62,7 @@ GP_RetCode GP_LoadPBM(const char *src_path, GP_Context **res) if (fscanf(f, "%"PRIu32"%"PRIu32, &w, &h) < 2) goto err1;

- *res = GP_ContextAlloc(w, h, GP_PIXEL_V1); + *res = GP_ContextAlloc(w, h, GP_PIXEL_G1);

if (*res == NULL) { fclose(f); @@ -85,7 +85,7 @@ GP_RetCode GP_SavePBM(const char *res_path, GP_Context *src) { FILE *f;

- if (src->pixel_type != GP_PIXEL_V1) + if (src->pixel_type != GP_PIXEL_G1) return GP_ENOIMPL; f = fopen(res_path, "w"); diff --git a/libs/loaders/GP_PGM.c b/libs/loaders/GP_PGM.c index 6612e2a..1e0d10f 100644 --- a/libs/loaders/GP_PGM.c +++ b/libs/loaders/GP_PGM.c @@ -117,16 +117,16 @@ GP_RetCode GP_LoadPGM(const char *src_path, GP_Context **res) switch (gray) { case 1: - type = GP_PIXEL_V1; + type = GP_PIXEL_G1; break; case 3: - type = GP_PIXEL_V2; + type = GP_PIXEL_G2; break; case 15: - type = GP_PIXEL_V4; + type = GP_PIXEL_G4; break; case 255: - type = GP_PIXEL_V8; + type = GP_PIXEL_G8; break; default: goto err1; @@ -171,16 +171,16 @@ GP_RetCode GP_SavePGM(const char *res_path, GP_Context *src) uint32_t gray;

switch (src->pixel_type) { - case GP_PIXEL_V1: + case GP_PIXEL_G1: gray = 1; break; - case GP_PIXEL_V2: + case GP_PIXEL_G2: gray = 3; break; - case GP_PIXEL_V4: + case GP_PIXEL_G4: gray = 15; break; - case GP_PIXEL_V8: + case GP_PIXEL_G8: gray = 255; break; default:

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

Summary of changes: gfxprim_config.py | 8 ++++---- include/core/GP_Convert.gen.h.t | 2 +- libs/loaders/GP_PBM.c | 4 ++-- libs/loaders/GP_PGM.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 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.