- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 9c29fb0086bf7531c018827337848b9ba5681242
by metan 13 Nov '11

13 Nov '11

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, master has been updated via 9c29fb0086bf7531c018827337848b9ba5681242 (commit) via 03d643e6b7770cdf34ba62046985b595cc7827cf (commit) from f841e08588f0113c8a6800a55ab3735ea7691188 (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/9c29fb0086bf7531c018827337848b9ba568… commit 9c29fb0086bf7531c018827337848b9ba5681242 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 13 20:53:25 2011 +0100 filters: Experimental Floyd Steinberg. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index fd6ccce..2f8596a 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -359,6 +359,28 @@ static GP_RetCode blur(GP_Context **c, const char *params) return GP_ESUCCESS; } +/* dithering */ + +static struct param dither_params[] = { + {NULL, 0, NULL, NULL, NULL} +}; + +static GP_RetCode dither(GP_Context **c, const char *params) +{ + if (param_parse(params, dither_params, "dither", param_err)) + return GP_EINVAL; + + GP_Context *bw = GP_FilterFloydSteinberg(*c, NULL, progress_callback); + + //TODO: so far we convert the context back to RGB888 + //(so we can do further work with it) + GP_ContextConvert(bw, *c, (*c)->pixel_type); + + GP_ContextFree(bw); + + return GP_ESUCCESS; +} + /* filters */ struct filter { @@ -377,6 +399,7 @@ static struct filter filter_table[] = { {"contrast", "alter image contrast", contrast_params, contrast}, {"invert", "inverts image", invert_params, invert}, {"blur", "gaussian blur", blur_params, blur}, + {"dither", "dithers bitmap", dither_params, dither}, {NULL, NULL, NULL, NULL} }; diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Dither.h similarity index 72% copy from include/filters/GP_Filters.h copy to include/filters/GP_Dither.h index 8e2d84d..37fac43 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Dither.h @@ -16,32 +16,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ /* - GP_Context filters. + Dithering algorithms. */ -#ifndef GP_FILTERS_H -#define GP_FILTERS_H - -/* Image rotations (90 180 270 grads) and mirroring */ -#include "filters/GP_Rotate.h" - -/* Point filters, brightness, contrast ... */ -#include "filters/GP_Point.h" +#ifndef FILTERS_GP_DITHER_H +#define FILTERS_GP_DITHER_H -/* Linear convolution based filters (mostly blurs) */ -#include "filters/GP_Linear.h" +#include "GP_Filter.h" -/* Image scaling (resampling) */ -#include "filters/GP_Resize.h" +/* + * Experimental Floyd Steinberg that coverts any pixel type to G1 + */ +GP_Context *GP_FilterFloydSteinberg(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); -#endif /* GP_FILTERS_H */ +#endif /* FILTERS_GP_DITHER_H */ diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Filters.h index 8e2d84d..4a38cb6 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Filters.h @@ -44,4 +44,7 @@ /* Image scaling (resampling) */ #include "filters/GP_Resize.h" +/* Bitmap dithering */ +#include "filters/GP_Dither.h" + #endif /* GP_FILTERS_H */ diff --git a/libs/filters/GP_Dither.c b/libs/filters/GP_Dither.c new file mode 100644 index 0000000..ffe7354 --- /dev/null +++ b/libs/filters/GP_Dither.c @@ -0,0 +1,116 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include "core/GP_Core.h" +#include "core/GP_FnPerBpp.h" + +#include "GP_Dither.h" + +#include <string.h> + +static void print_err(float *d, int size) +{ + int i; + + printf("["); + + for (i = 0; i < size; i++) + printf("%2.2f, ", d[i]); + + printf("]n"); +} + +/* + * Experimental Floyd Steinberg XXX -> G1 + */ +int GP_FilterFloydSteinberg_Raw(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + float errors[2][src->w]; + + GP_DEBUG(1, "Floyd Steiberg %ux%u", src->w, src->h); + + GP_Coord x, y; + + memset(errors[0], 0, src->w * sizeof(float)); + memset(errors[1], 0, src->w * sizeof(float)); + + for (y = 0; y < src->h; y++) { + for (x = 0; x < src->w; x++) { + GP_Pixel pix = GP_GetPixel(src, x, y); + float val = GP_ConvertPixel(pix, src->pixel_type, GP_PIXEL_G8); + + val += errors[y%2][x]; + + float err; + + if (val > 127) { + err = val - 255; + GP_PutPixel_Raw_1BPP_LE(dst, x, y, 1); + } else { + err = val - 0; + GP_PutPixel_Raw_1BPP_LE(dst, x, y, 0); + } + + if (x + 1 < src->w) + errors[y%2][x+1] += 7 * err / 16; + + if (x > 1) + errors[!(y%2)][x-1] += 3 * err / 16; + + errors[!(y%2)][x] += 5 * err / 16; + + if (x + 1 < src->w) + errors[!(y%2)][x+1] += err / 16; + } + + memset(errors[y%2], 0, src->w * sizeof(float)); + // if (GP_ProgressCallbackReport(callback, 2 * y, src->h, src->w)) + // return 1; + } + +// GP_ProgressCallbackDone(callback); + return 0; +} + +GP_Context *GP_FilterFloydSteinberg(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + GP_Context *ret = dst; + + if (ret == NULL) { + ret = GP_ContextAlloc(src->w, src->h, GP_PIXEL_G1); + + if (ret == NULL) { + GP_DEBUG(1, "Malloc failed :("); + return NULL; + } + } + + if (GP_FilterFloydSteinberg_Raw(src, ret, callback)) { + if (dst == NULL) + free(ret); + return NULL; + } + + return ret; +} http://repo.or.cz/w/gfxprim.git/commit/03d643e6b7770cdf34ba62046985b595cc78… commit 03d643e6b7770cdf34ba62046985b595cc7827cf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 13 20:11:11 2011 +0100 core: Added asserts for context conversions. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index f1efa61..23ae77b 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -117,6 +117,11 @@ GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, if (ret == NULL) return NULL; + } else { + GP_ASSERT(dst->pixel_type == dst_pixel_type, + "Destination pixel type doesn't match"); + GP_ASSERT(src->w <= dst->w && src->h <= dst->h, + "Destination is not big enough"); } GP_Blit_Naive(src, 0, 0, src->w, src->h, ret, 0, 0); ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 23 ++++ .../GP_InputDriverSDL.h => filters/GP_Dither.h} | 15 ++- include/filters/GP_Filters.h | 3 + libs/core/GP_Context.c | 5 + libs/filters/GP_Dither.c | 116 ++++++++++++++++++++ 5 files changed, 155 insertions(+), 7 deletions(-) copy include/{input/GP_InputDriverSDL.h => filters/GP_Dither.h} (82%) create mode 100644 libs/filters/GP_Dither.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: f841e08588f0113c8a6800a55ab3735ea7691188
by metan 13 Nov '11

13 Nov '11

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, master has been updated via f841e08588f0113c8a6800a55ab3735ea7691188 (commit) from 97e18f4407aadb708f4ea171b0cbed30b829fa0b (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/f841e08588f0113c8a6800a55ab3735ea769… commit f841e08588f0113c8a6800a55ab3735ea7691188 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 13 20:07:33 2011 +0100 core: Changed GP_ContextConvert API, updated progs and docs. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index ead85bf..bf18f3f 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -111,7 +111,7 @@ static void *image_loader(void *ptr) /* Workaround */ if (img->pixel_type != GP_PIXEL_RGB888) { - GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); + GP_Context *tmp = GP_ContextConvert(img, NULL, GP_PIXEL_RGB888); GP_ContextFree(img); img = tmp; } diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 9833ea1..fd6ccce 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -326,6 +326,8 @@ static GP_RetCode invert(GP_Context **c, const char *params) return GP_ESUCCESS; } +/* blur */ + static struct param blur_params[] = { {"sigma", PARAM_FLOAT, "sigma parameter, radii of blur (sets both)", NULL, NULL}, {"sigma_x", PARAM_FLOAT, "sigma parameter for horizontal direction", NULL, NULL}, diff --git a/doc/context.txt b/doc/context.txt index 89cf55d..2e102f1 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -136,3 +136,20 @@ pointer. In both cases pointer to subcontext or NULL (in case of 'malloc(2)' failure) is returned. +Conversions +~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> + +GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, + GP_PixelType dst_pixel_type); +------------------------------------------------------------------------------- + +This provides basic context conversion functionality. If 'NULL' is passed as +dst, the context for result is allocated and returned. + +This fuction does no error distribution but only integer +division/multiplication for each pixel channel. + diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index d6b0f6a..cbe3742 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -120,7 +120,8 @@ GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, * This is naive implementation that doesn't do any ditherings or error * diffusions. */ -GP_Context *GP_ContextConvert(const GP_Context *context, GP_PixelType res_type); +GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, + GP_PixelType dst_pixel_type); /* * Free context. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index ab27966..f1efa61 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -94,7 +94,7 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) context->h = h; context->pixel_type = type; - #warning Hmm, bit endianity..., Why isn't this settled by different pixel types? + #warning Hmm, bit endianity... Why isn't this settled by different pixel types? context->bit_endian = 0; /* rotation and mirroring */ @@ -107,14 +107,19 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) return context; } -GP_Context *GP_ContextConvert(const GP_Context *context, GP_PixelType res_type) +GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, + GP_PixelType dst_pixel_type) { - GP_Context *ret = GP_ContextAlloc(context->w, context->h, res_type); + GP_Context *ret = dst; + + if (ret == NULL) { + ret = GP_ContextAlloc(src->w, src->h, dst_pixel_type); - if (ret == NULL) - return NULL; + if (ret == NULL) + return NULL; + } - GP_Blit_Naive(context, 0, 0, context->w, context->h, ret, 0, 0); + GP_Blit_Naive(src, 0, 0, src->w, src->h, ret, 0, 0); return ret; } diff --git a/tests/SDL/blittest.c b/tests/SDL/blittest.c index be39c83..1a4ed83 100644 --- a/tests/SDL/blittest.c +++ b/tests/SDL/blittest.c @@ -184,7 +184,7 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - bitmap_conv = GP_ContextConvert(bitmap_raw, context.pixel_type); + bitmap_conv = GP_ContextConvert(bitmap_raw, NULL, context.pixel_type); change_bitmap(); black = GP_ColorToContextPixel(GP_COL_BLACK, &context); ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 2 +- demos/grinder/grinder.c | 2 ++ doc/context.txt | 17 +++++++++++++++++ include/core/GP_Context.h | 3 ++- libs/core/GP_Context.c | 17 +++++++++++------ tests/SDL/blittest.c | 2 +- 6 files changed, 34 insertions(+), 9 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 97e18f4407aadb708f4ea171b0cbed30b829fa0b
by metan 13 Nov '11

13 Nov '11

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, master has been updated via 97e18f4407aadb708f4ea171b0cbed30b829fa0b (commit) via e0261e32ab9dbb92520dbd59eaab2a682ab63262 (commit) from 3ff64e524d3ea031c6573df03ad9081b7238d41a (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/97e18f4407aadb708f4ea171b0cbed30b829… commit 97e18f4407aadb708f4ea171b0cbed30b829fa0b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 13 19:50:26 2011 +0100 TODO: updated TODO a bit diff --git a/TODO b/TODO index 8c44da0..9606fe0 100644 --- a/TODO +++ b/TODO @@ -2,13 +2,10 @@ What's not implemented (and should be) -------------------------------------- * bitmaps and blitting - - create, destroy bitmap - * DONE - GP_ContextAlloc(), GP_ContextFree() - blit bitmaps (should respect rotation and pixel formats) - - bitmap rotation (in order to speed up rotated blits) - * DONE - see filters/ + * IN PROGRESS - loading bitmaps from image files (jpg, png, bmp, pnm ...) - * IN PROGRESS - some pnm formats are working see loaders/ + * IN NEARLY FINISHED * backends - finish framebuffer backend (SDL does not work on most of my framebuffers) @@ -16,6 +13,12 @@ What's not implemented (and should be) - some overall initialization routines - backed event handling +* Fix contrast - pass GP_Pixel so each channel could have different increment + +* Meditate about bit endians and why these aren't separate pixel types + (which would make our lives a bit easier) + + Advanced features ----------------- @@ -25,3 +28,5 @@ Advanced features * gfx primitives - drawing with alpha channel - anti aliasing + +* freetype support http://repo.or.cz/w/gfxprim.git/commit/e0261e32ab9dbb92520dbd59eaab2a682ab6… commit e0261e32ab9dbb92520dbd59eaab2a682ab63262 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 13 19:48:33 2011 +0100 core: Fix bit endian for context functions. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index 7ecdb37..ab27966 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -58,6 +58,7 @@ GP_Context *GP_ContextCopy(const GP_Context *src, int flag) new->h = src->h; new->pixel_type = src->pixel_type; + new->bit_endian = src->bit_endian; /* rotation and mirroring */ new->axes_swap = src->axes_swap; @@ -93,6 +94,8 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) context->h = h; context->pixel_type = type; + #warning Hmm, bit endianity..., Why isn't this settled by different pixel types? + context->bit_endian = 0; /* rotation and mirroring */ context->axes_swap = 0; @@ -152,6 +155,7 @@ GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, ret->h = h; ret->pixel_type = context->pixel_type; + ret->bit_endian = context->bit_endian; /* rotation and mirroring */ ret->axes_swap = context->axes_swap; ----------------------------------------------------------------------- Summary of changes: TODO | 15 ++++++++++----- libs/core/GP_Context.c | 4 ++++ 2 files changed, 14 insertions(+), 5 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 3ff64e524d3ea031c6573df03ad9081b7238d41a
by metan 11 Nov '11

11 Nov '11

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, master has been updated via 3ff64e524d3ea031c6573df03ad9081b7238d41a (commit) via 93801b75af9601cad8fddcaa83856f05cf59e05f (commit) via 61a0d6e6c5d1b9bba188466918ac52df9d98f260 (commit) via 22df756bf97829e969623f0c9bf21bacb3895987 (commit) via a3c22bffdd3edb82a0f612542e15cae53647e3b1 (commit) from 4e46a97e8f7fab77c38ac3f2c3f3620ea7ea3aeb (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/3ff64e524d3ea031c6573df03ad9081b7238… commit 3ff64e524d3ea031c6573df03ad9081b7238d41a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jul 23 20:11:28 2013 +0200 core: Workaround for older and possibly broken python. The 'suffix is not None' wasn't working here either. diff --git a/include/core/GP_FnPerBpp.gen.h.t b/include/core/GP_FnPerBpp.gen.h.t index b63cba4..02238a1 100644 --- a/include/core/GP_FnPerBpp.gen.h.t +++ b/include/core/GP_FnPerBpp.gen.h.t @@ -17,7 +17,7 @@ GP_DEF_FFN_FOR_BPP(fname, MACRO_NAME, {{ ps.suffix }}) {% endfor %} -{% macro bpp_suffix(suffix) %}{% if not suffix == None %}_{{ suffix }}{% endif %}{% endmacro %} +{% macro bpp_suffix(suffix) %}{% if suffix == "LE" or suffix == "BE" %}_{{ suffix }}{% endif %}{% endmacro %} /* * Branch on bpp and bit_endian. http://repo.or.cz/w/gfxprim.git/commit/93801b75af9601cad8fddcaa83856f05cf59… commit 93801b75af9601cad8fddcaa83856f05cf59e05f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jul 23 19:54:40 2013 +0200 core: Fix typo in subcontext initalization. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index 67aca4f..7ecdb37 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -137,7 +137,7 @@ GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, GP_Context *ret = subcontext; if (ret == NULL) { - GP_Context *ret = malloc(sizeof(GP_Context)); + ret = malloc(sizeof(GP_Context)); if (ret == NULL) return NULL; http://repo.or.cz/w/gfxprim.git/commit/61a0d6e6c5d1b9bba188466918ac52df9d98… commit 61a0d6e6c5d1b9bba188466918ac52df9d98f260 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jul 23 19:35:49 2013 +0200 filters: Fix the cubic interpolation on ppc32 * Make the gcc vector extension usage more type safe * Prepare the code for vector opt-in - at least for gcc 4.1.2 and ppc32 (no altivec) it produces faster code without the vectors diff --git a/libs/filters/GP_Resize.c b/libs/filters/GP_Resize.c index 1c7d593..baf7db5 100644 --- a/libs/filters/GP_Resize.c +++ b/libs/filters/GP_Resize.c @@ -77,7 +77,19 @@ typedef union v4f { float f[4]; } v4f; -#define MUL_V4SF(a, b) ((union v4f)((a).v * (b).v)) +#define GP_USE_GCC_VECTOR + +#ifdef GP_USE_GCC_VECTOR +#define MUL_V4SF(a, b) ({v4f ret; ret.v = (a).v * (b).v; ret;}) +#else +#define MUL_V4SF(a, b) ({v4f ret; + ret.f[0] = (a).f[0] * (b).f[0]; + ret.f[1] = (a).f[1] * (b).f[1]; + ret.f[2] = (a).f[2] * (b).f[2]; + ret.f[3] = (a).f[3] * (b).f[3]; + ret;}) +#endif /* GP_USE_GCC_VECTOR */ + #define SUM_V4SF(a) ((a).f[0] + (a).f[1] + (a).f[2] + (a).f[3]) int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, http://repo.or.cz/w/gfxprim.git/commit/22df756bf97829e969623f0c9bf21bacb389… commit 22df756bf97829e969623f0c9bf21bacb3895987 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jul 23 18:47:21 2013 +0200 grinder: Use strtod instead of strtof in param loader The strtof() is not exposed by default (need c99) and may return invalid values on certain machines/distributions here it was pcc32. diff --git a/demos/grinder/params.c b/demos/grinder/params.c index 17aebb9..2734980 100644 --- a/demos/grinder/params.c +++ b/demos/grinder/params.c @@ -219,18 +219,18 @@ int set_bool(int *res, char *val) int set_float(float *res, char *val) { char *end; - float f; + double d; errno = 0; - f = strtof(val, &end); + d = strtod(val, &end); if (*end != '0') return 1; if (errno != 0) return 1; - - *res = f; + + *res = d; return 0; } @@ -262,7 +262,7 @@ int param_parse(const char *params, const struct param *param_desc, void *priv, char *par; unsigned int n, i; va_list va; - int ret; + int ret = 0; if (params == NULL || *params == '0') return 0; http://repo.or.cz/w/gfxprim.git/commit/a3c22bffdd3edb82a0f612542e15cae53647… commit a3c22bffdd3edb82a0f612542e15cae53647e3b1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jul 23 18:31:54 2013 +0200 loaders: Fix PPM loader on big endian. diff --git a/libs/loaders/GP_PPM.c b/libs/loaders/GP_PPM.c index 106e78d..e84b71b 100644 --- a/libs/loaders/GP_PPM.c +++ b/libs/loaders/GP_PPM.c @@ -117,11 +117,12 @@ static int write_binary_ppm(FILE *f, GP_Context *src) for (y = 0; y < src->h; y++) for (x = 0; x < src->w; x++) { GP_Pixel pix = GP_GetPixel_Raw_24BPP(src, x, y); - //TODO endianess? - GP_SWAP(((uint8_t*)&pix)[0], ((uint8_t*)&pix)[2]); + uint8_t buf[3] = {GP_Pixel_GET_R_RGB888(pix), + GP_Pixel_GET_G_RGB888(pix), + GP_Pixel_GET_B_RGB888(pix)}; - if (fwrite(&pix, 3, 1, f) < 1) + if (fwrite(buf, 3, 1, f) < 1) return 1; } ----------------------------------------------------------------------- Summary of changes: demos/grinder/params.c | 10 +++++----- include/core/GP_FnPerBpp.gen.h.t | 2 +- libs/core/GP_Context.c | 2 +- libs/filters/GP_Resize.c | 14 +++++++++++++- libs/loaders/GP_PPM.c | 7 ++++--- 5 files changed, 24 insertions(+), 11 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 4e46a97e8f7fab77c38ac3f2c3f3620ea7ea3aeb
by bluebear 06 Nov '11

06 Nov '11

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, master has been updated via 4e46a97e8f7fab77c38ac3f2c3f3620ea7ea3aeb (commit) from 87668c03813dbb86473d1080c58810a60e56f8f8 (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/4e46a97e8f7fab77c38ac3f2c3f3620ea7ea… commit 4e46a97e8f7fab77c38ac3f2c3f3620ea7ea3aeb Author: BlueBear <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Nov 6 17:22:10 2011 +0100 Fixed some typos in documentation. diff --git a/doc/filters.txt b/doc/filters.txt index af8e467..066d04c 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -3,7 +3,7 @@ Context filters Pixel filters for 'GP_Context'. -The context filter is basially an function that operates on context pixels. +The context filter is basically a function that operates on context pixels. The result may be stored into a new bitmap or placed to bitmap passed as argument or, in some cases, the filter could be used 'in place' so the result is stored into the same context as the one passed as filter source. @@ -11,7 +11,7 @@ is stored into the same context as the one passed as filter source. Common filter API ~~~~~~~~~~~~~~~~~ -The filters have, for your convinience unified API. +For convenience, the filters API is unified: * Each filter returns pointer to destination context or 'NULL' on failure * The first two arguments are source and destination @@ -19,13 +19,13 @@ The filters have, for your convinience unified API. Each filter function could be used in two modes. -By passing non 'NULL' argument as filter destination user requests result to +By passing non-'NULL' argument as filter destination user requests result to be stored into the destination context. The context must have correct pixel type and the context size must be big enough to store the result. -For filters that works 'in-place' (which is explicitly said for each filter) +For filters that work 'in-place' (which is explicitly said for each filter) the source and the destination could be the same context. Note that this is -not expected to work if you do several overlaping subcontextes and pass these +not expected to work if you do several overlaping subcontexts and pass these as arguments. When 'NULL' is passed as destination new context for storing the result is @@ -148,7 +148,7 @@ Rotate context by 90 degrees. Doesn't work 'in-place' (yet). -The destinatoin has to have the same pixel type and destination size must be +The destination has to have the same pixel type and destination size must be big enough to fit rotated context (eg. W and H are swapped). [source,c] @@ -252,8 +252,8 @@ destination defined by 'w' and 'h'. Nearest Neighbour Interpolation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Fast, but produces "pixelated" images may however work better for images with -sharp edges mostly consisting of big one colour regions (eg. doesn't blur the +Fast, but produces "pixelated" images. May however work better for images with +sharp edges mostly consisting of big one colour regions (it doesn't blur the result on upscaling). Bicubic Interpolation @@ -261,7 +261,7 @@ Bicubic Interpolation Works well as is on image upscaling. To get decent result on downscaling low-pass filter (gaussian blur) must be used on original image before actuall -downscaling. To do this reasonably fast we could cheat a little first resize -big images a little without the low-past filter, then apply low-pass filter and +downscaling. To do this reasonably fast we could cheat a little: first resize +big images a little without the low-pass filter, then apply low-pass filter and finally downscale it to desired size. diff --git a/doc/loaders.txt b/doc/loaders.txt index 73a6b28..7a752e8 100644 --- a/doc/loaders.txt +++ b/doc/loaders.txt @@ -36,7 +36,7 @@ Opens file and checks for 'PNG' signature upon successful return (file could be opened, signature matches), the opened file is returned and the file possition points right after the end of the 'PNG' signature. -This function is semi-internal, you should rather use functions listed bellow. +This function is semi-internal, you should rather use functions listed below. [source,c] ------------------------------------------------------------------------------- @@ -71,7 +71,7 @@ GP_RetCode GP_SavePNG(const char *dst_path, GP_Context *src, ------------------------------------------------------------------------------- Writes a Context into a 'PNG' image. If aborted by a callback, the opened file -is closed and unliked before the call returns 'GP_EINTR'. +is closed and removed before the call returns 'GP_EINTR'. Currently only 'RGB888' format is supported, you should convert the GP_Context to 'RGB888' before calling this function otherwise 'GP_ENOIMPL' will be @@ -93,7 +93,7 @@ Opens file and checks for 'JPG' signature upon successful return (file could be opened, signature matches), the opened file is returned and the file possition points right after the end of the 'JPG' signature. -This function is semi-internal, you should rather use functions listed bellow. +This function is semi-internal, you should rather use functions listed below. 'TODO:' This is not finished yet, currently this just opens and returns the file and the 'GP_ReadJPG()' reads the signature instead. @@ -120,7 +120,7 @@ GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, ------------------------------------------------------------------------------- Same as abowe but takes path to the file as a parameter and check for the -signature. Basically this combines both of the calls abowe. +signature. Basically this combines both of the calls above. [source,c] ------------------------------------------------------------------------------- @@ -131,7 +131,7 @@ GP_RetCode GP_SaveJPG(const char *dst_path, GP_Context *src, ------------------------------------------------------------------------------- Writes a Context into a 'JPG' image. If aborted by a callback, the opened file -is closed and unliked before the call returns 'GP_EINTR'. +is closed and removed before the call returns 'GP_EINTR'. The 'JPG' format could store either 'G8' or 'RGB888' pixeltypes and you must convert the context into one of them before this fucntions is called. ----------------------------------------------------------------------- Summary of changes: doc/filters.txt | 20 ++++++++++---------- doc/loaders.txt | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 87668c03813dbb86473d1080c58810a60e56f8f8
by metan 06 Nov '11

06 Nov '11

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, master has been updated via 87668c03813dbb86473d1080c58810a60e56f8f8 (commit) via 73686098d636fbfd72a4ae5b3bb8d2e0c241ba80 (commit) from 025f1bba56285d57ebab61325415cd2c07a0073c (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/87668c03813dbb86473d1080c58810a60e56… commit 87668c03813dbb86473d1080c58810a60e56f8f8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 6 14:24:12 2011 +0100 doc: Fixed basic types and moved progress callback docs. diff --git a/doc/basic_types.txt b/doc/basic_types.txt index efc9c7b..8f7283c 100644 --- a/doc/basic_types.txt +++ b/doc/basic_types.txt @@ -19,7 +19,8 @@ typedef enum GP_RetCode { GP_EBADFILE, /* error in file, or bad file format */ GP_ENOENT, /* no such file or another object */ GP_ENOMEM, /* not enough memory */ - GP_EMAX, + GP_EINTR, /* interrupted by a callback */ + GP_EMAX, } GP_RetCode; -------------------------------------------------------------------------------- @@ -35,7 +36,6 @@ Coord and Size For drawing API there are two integer types defined the 'GP_Coord' for coordinates and 'GP_Size' for size, length or so. - Color and pixel types ~~~~~~~~~~~~~~~~~~~~~ @@ -58,6 +58,7 @@ typedef enum GP_Color { GP_COL_INVALID = -1, GP_COL_BLACK, ... + GP_COL_MAX, } GP_Color; -------------------------------------------------------------------------------- @@ -66,15 +67,62 @@ successful match and conversion and false otherwise. [source,c] -------------------------------------------------------------------------------- -#include <core/GP_Color.h> +#include <GP_Color.h> -GP_Pixel GP_ColorToPixel(GP_Context *context, GP_Color color); +GP_Pixel GP_ColorToPixel(GP_Color color, GP_PixelType pixel_type); +GP_Pixel GP_ColorToContextPixel(GP_Color color, GP_Context *context); GP_Color GP_ColorNameToColor(const char *color_name); - const char *GP_ColorToColorName(GP_Color color); -bool GP_ColorNameToPixel(GP_Context *context, const char *color_name, +bool GP_ColorNameToPixel(const char *color_name, GP_PixelType pixel_type, GP_Pixel *pixel); +bool GP_ColorNameToContextPixel(const char *color_name, GP_Context *context, + GP_Pixel *pixel); +-------------------------------------------------------------------------------- + +Functions to convert color to pixel and color to context pixel. The last two +returns true if color with such name was found. + +[source,c] +-------------------------------------------------------------------------------- +#include <GP_Color.h> + +void GP_ColorLoadPixels(GP_Pixel pixels[], GP_PixelType pixel_type); +void GP_ColorLoadContextPixels(GP_Pixel pixels[], GP_Context *context); -------------------------------------------------------------------------------- +Loads array of 'GP_Pixel' of size 'GP_COL_MAX', the array is then used with +the GP_Color enum as 'pixels[GP_COL_BLACK]'. + +Progress Callback +~~~~~~~~~~~~~~~~~ + +Progress callback is a structure that stores user-defined callback function, +pointer to store location of user data and percentage. + +It is passed as last parameter to functions that could take some time to +complete and adds capability to track the operation progress as well as to +abort the operation. + +Currently it's used for filters and loaders. + +[source,c] +------------------------------------------------------------------------------- +typdedef struct GP_ProgressCallback { + float percentage; + int (*callback)(struct GP_ProgressCallback *self); + void *priv; +} GP_ProgressCallback; +------------------------------------------------------------------------------- + +If non 'NULL' progress callback structure is passed to a function, the +callback function is periodically called and the percentage is updated. + +The return value from callback could abort the function execution. If non zero +value is returned the filter is aborted, all memory freed etc. and the +function either returns 'NULL' if pointer is returned or 'GP_EINTR' in case +filter returns 'GP_RetCode'. + +The callback, if supported, is the last parameter of a function. + diff --git a/doc/filters.txt b/doc/filters.txt index c189599..af8e467 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -8,31 +8,6 @@ The result may be stored into a new bitmap or placed to bitmap passed as argument or, in some cases, the filter could be used 'in place' so the result is stored into the same context as the one passed as filter source. -Progress Callback -~~~~~~~~~~~~~~~~~ - -Progress callback is a structure that stores user-defined callback function, -pointer to store location of user data and percentage. - -[source,c] -------------------------------------------------------------------------------- -typdedef struct GP_ProgressCallback { - float percentage; - int (*callback)(struct GP_ProgressCallback *self); - void *priv; -} GP_ProgressCallback; -------------------------------------------------------------------------------- - -If non 'NULL' progress callback structure is passed to a filter function, the -callback function is periodically called and the percentage is updated. - -The return value from callback could abort the filter execution. If non zero -value is returned the filter is aborted, all memory freed etc. and the filter -either returns 'NULL' if pointer is returned or 'GP_EINTR' in case filter -returns 'GP_RetCode'. - -The callback, if supported, is the last parameter of the filter function. - Common filter API ~~~~~~~~~~~~~~~~~ http://repo.or.cz/w/gfxprim.git/commit/73686098d636fbfd72a4ae5b3bb8d2e0c241… commit 73686098d636fbfd72a4ae5b3bb8d2e0c241ba80 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 6 14:17:31 2011 +0100 core: Fix typo in color API. diff --git a/include/core/GP_Color.h b/include/core/GP_Color.h index 4e39e07..514fe82 100644 --- a/include/core/GP_Color.h +++ b/include/core/GP_Color.h @@ -94,11 +94,11 @@ bool GP_ColorNameToPixel(const char *color_name, GP_PixelType pixel_type, * * Returns true if conversion was successful false otherwise. */ -static inline bool GP_ColorNameContextToPixel(const char *color_name, - GP_PixelType pixel_type, - GP_Pixel *pixel) +static inline bool GP_ColorNameToContextPixel(const char *color_name, + GP_Context *context, + GP_Pixel *pixel) { - return GP_ColorNameToPixel(color_name, pixel_type, pixel); + return GP_ColorNameToPixel(color_name, context->pixel_type, pixel); } /* ----------------------------------------------------------------------- Summary of changes: doc/basic_types.txt | 60 ++++++++++++++++++++++++++++++++++++++++++---- doc/filters.txt | 25 ------------------- include/core/GP_Color.h | 8 +++--- 3 files changed, 58 insertions(+), 35 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 025f1bba56285d57ebab61325415cd2c07a0073c
by metan 06 Nov '11

06 Nov '11

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, master has been updated via 025f1bba56285d57ebab61325415cd2c07a0073c (commit) from fa647eaeeb44a5b63a6f2141f3ced35ccf27364a (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/025f1bba56285d57ebab61325415cd2c07a0… commit 025f1bba56285d57ebab61325415cd2c07a0073c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 6 14:06:42 2011 +0100 doc: added basic documentation for JPG and PNG loaders. diff --git a/doc/loaders.txt b/doc/loaders.txt index a086213..73a6b28 100644 --- a/doc/loaders.txt +++ b/doc/loaders.txt @@ -1,6 +1,142 @@ Context loaders --------------- -Loaders are functions GP_Context from various file formats. +This part of gfxprim library aims to create API to load/save images from/to +common image fileformats. + +Common Loader +~~~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Loads image from a file. The image format is now recognized by the file +filename extension. Format detection using file signature is planned. + +The loading process could be aborted by process callback. + +PNG +~~~ + +Just now, the 'PNG' support is not fully finished, the Alpha channel as well +as palletes doesn't work well or at all, we are working on that. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_OpenPNG(const char *src, FILE **f); +------------------------------------------------------------------------------- + +Opens file and checks for 'PNG' signature upon successful return (file could +be opened, signature matches), the opened file is returned and the file +possition points right after the end of the 'PNG' signature. + +This function is semi-internal, you should rather use functions listed bellow. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Loads 'PNG' file into context the file pointer must point to the start of the +'PNG' data stream (eg. should point right after the signature). The context, +to store the image to, is allocated. The loading process could by aborted by a +callback, in such case all memory is freed and the call returns 'GP_EINTR'. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Same as abowe but takes path to the file as a parameter and check for the +signature. Basically this combines both of the calls abowe. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_SavePNG(const char *dst_path, GP_Context *src, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Writes a Context into a 'PNG' image. If aborted by a callback, the opened file +is closed and unliked before the call returns 'GP_EINTR'. + +Currently only 'RGB888' format is supported, you should convert the GP_Context +to 'RGB888' before calling this function otherwise 'GP_ENOIMPL' will be +returned. + +JPG +~~~ + +The 'JPG' format is supported for both 'G8' as well as 'RGB888' pixel formats. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_OpenJPG(const char *src, FILE **f); +------------------------------------------------------------------------------- + +Opens file and checks for 'JPG' signature upon successful return (file could +be opened, signature matches), the opened file is returned and the file +possition points right after the end of the 'JPG' signature. + +This function is semi-internal, you should rather use functions listed bellow. + +'TODO:' This is not finished yet, currently this just opens and returns the +file and the 'GP_ReadJPG()' reads the signature instead. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Loads 'JPG' file into context the file pointer must point to the start of the +'JPG' data stream (eg. should point right after the signature). The context, to +store the image to, is allocated. The loading process could by aborted by a +callback, in such case all memory is freed and the call returns 'GP_EINTR'. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Same as abowe but takes path to the file as a parameter and check for the +signature. Basically this combines both of the calls abowe. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Loaders.h> + +GP_RetCode GP_SaveJPG(const char *dst_path, GP_Context *src, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Writes a Context into a 'JPG' image. If aborted by a callback, the opened file +is closed and unliked before the call returns 'GP_EINTR'. + +The 'JPG' format could store either 'G8' or 'RGB888' pixeltypes and you must +convert the context into one of them before this fucntions is called. + +'TODO:' add parameters to change the encoding settings. PBM ~~~ ----------------------------------------------------------------------- Summary of changes: doc/loaders.txt | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 137 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: fa647eaeeb44a5b63a6f2141f3ced35ccf27364a
by metan 06 Nov '11

06 Nov '11

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, master has been updated via fa647eaeeb44a5b63a6f2141f3ced35ccf27364a (commit) from 30a31dc2d764c91837a690112c601e6363db224e (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/fa647eaeeb44a5b63a6f2141f3ced35ccf27… commit fa647eaeeb44a5b63a6f2141f3ced35ccf27364a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 6 13:17:31 2011 +0100 doc: Update the filter documentation. diff --git a/doc/filters.txt b/doc/filters.txt index d806786..c189599 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -18,7 +18,7 @@ pointer to store location of user data and percentage. ------------------------------------------------------------------------------- typdedef struct GP_ProgressCallback { float percentage; - void (*callback)(struct GP_ProgressCallback *self); + int (*callback)(struct GP_ProgressCallback *self); void *priv; } GP_ProgressCallback; ------------------------------------------------------------------------------- @@ -26,7 +26,12 @@ typdedef struct GP_ProgressCallback { If non 'NULL' progress callback structure is passed to a filter function, the callback function is periodically called and the percentage is updated. -The callback is, if supported, the last parameter of the filter function. +The return value from callback could abort the filter execution. If non zero +value is returned the filter is aborted, all memory freed etc. and the filter +either returns 'NULL' if pointer is returned or 'GP_EINTR' in case filter +returns 'GP_RetCode'. + +The callback, if supported, is the last parameter of the filter function. Common filter API ~~~~~~~~~~~~~~~~~ ----------------------------------------------------------------------- Summary of changes: doc/filters.txt | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 30a31dc2d764c91837a690112c601e6363db224e
by metan 04 Nov '11

04 Nov '11

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, master has been updated via 30a31dc2d764c91837a690112c601e6363db224e (commit) via 7f9e2efe90d7fe60e03bf60ab55f59e110113036 (commit) from 05551ed06488f6e537a0705980630f2d36b47c40 (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/30a31dc2d764c91837a690112c601e6363db… commit 30a31dc2d764c91837a690112c601e6363db224e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 4 16:17:06 2011 +0100 Basic JPG writer support. diff --git a/include/loaders/GP_JPG.h b/include/loaders/GP_JPG.h index fddac6e..db9c51f 100644 --- a/include/loaders/GP_JPG.h +++ b/include/loaders/GP_JPG.h @@ -33,22 +33,28 @@ #include "core/GP_ProgressCallback.h" /* - * Opens up file and checks signature. Upon successful return the file - * possition would be set to eight bytes (exactly after the PNG signature). + * Opens up file and checks signature. */ GP_RetCode GP_OpenJPG(const char *src_path, FILE **f); /* - * Reads PNG from an open FILE. Expects the file possition set after the eight - * bytes PNG signature. + * Reads JPG from an open FILE. Expects the file possition set after the eight + * bytes JPG signature. */ GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, GP_ProgressCallback *callback); /* - * Loads a PNG file into GP_Context. The Context is newly allocated. + * Loads a JPG file into GP_Context. The Context is newly allocated. */ GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, GP_ProgressCallback *callback); +/* + * Saves JPG to a file. + */ +GP_RetCode GP_SaveJPG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback); + + #endif /* LOADERS_GP_JPG_H */ diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index be0b67c..cbb5758 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -64,7 +64,7 @@ static void my_error_exit(j_common_ptr cinfo) { struct my_jpg_err *my_err = (struct my_jpg_err*) cinfo->err; - GP_DEBUG(1, "ERROR reading jpeg file"); + GP_DEBUG(1, "ERROR reading/writing jpeg file"); longjmp(my_err->setjmp_buf, 1); } @@ -194,3 +194,93 @@ GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, return GP_ReadJPG(f, res, callback); } + +GP_RetCode GP_SaveJPG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback) +{ + FILE *f; + GP_RetCode ret; + struct jpeg_compress_struct cinfo; + struct my_jpg_err my_err; + + if (src->pixel_type != GP_PIXEL_RGB888 && + src->pixel_type != GP_PIXEL_G8) { + GP_DEBUG(1, "Can't save png with pixel type %s", + GP_PixelTypeName(src->pixel_type)); + return GP_ENOIMPL; + } + + f = fopen(dst_path, "wb"); + + if (f == NULL) { + GP_DEBUG(1, "Failed to open '%s' for writing: %s", + dst_path, strerror(errno)); + return GP_EBADFILE; + } + + if (setjmp(my_err.setjmp_buf)) { + ret = GP_EBADFILE;; + goto err1; + } + + cinfo.err = jpeg_std_error(&my_err.error_mgr); + my_err.error_mgr.error_exit = my_error_exit; + + jpeg_create_compress(&cinfo); + + jpeg_stdio_dest(&cinfo, f); + + cinfo.image_width = src->w; + cinfo.image_height = src->h; + cinfo.input_components = src->pixel_type == GP_PIXEL_RGB888 ? 3 : 1; + cinfo.in_color_space = JCS_RGB; + + jpeg_set_defaults(&cinfo); + + jpeg_start_compress(&cinfo, TRUE); + + while (cinfo.next_scanline < cinfo.image_height) { + uint32_t y = cinfo.next_scanline; + + if (src->pixel_type == GP_PIXEL_RGB888) { + uint32_t i; + uint8_t tmp[3 * src->w]; + + memcpy(tmp, GP_PIXEL_ADDR(src, 0, y), 3 * src->w); + + /* fix the pixels as we want in fact BGR */ + for (i = 0; i < src->w; i++) { + uint8_t *pix = tmp + 3 * i; + GP_SWAP(pix[0], pix[2]); + } + + JSAMPROW row = (void*)tmp; + jpeg_write_scanlines(&cinfo, &row, 1); + } else { + JSAMPROW row = (void*)GP_PIXEL_ADDR(src, 0, y); + jpeg_write_scanlines(&cinfo, &row, 1); + } + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { + GP_DEBUG(1, "Operation aborted"); + ret = GP_EINTR; + goto err1; + } + } + + jpeg_finish_compress(&cinfo); + + if (fclose(f)) { + GP_DEBUG(1, "Failed to close file '%s': %s", + dst_path, strerror(errno)); + return GP_EBADFILE; + } + + return GP_ESUCCESS; +//TODO: is cinfo allocated? +err1: + jpeg_destroy_compress(&cinfo); + fclose(f); + unlink(dst_path); + return ret; +} http://repo.or.cz/w/gfxprim.git/commit/7f9e2efe90d7fe60e03bf60ab55f59e11011… commit 7f9e2efe90d7fe60e03bf60ab55f59e110113036 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 4 15:10:01 2011 +0100 Basic PNG writer code. diff --git a/include/loaders/GP_PNG.h b/include/loaders/GP_PNG.h index cfa9438..1b4d9cf 100644 --- a/include/loaders/GP_PNG.h +++ b/include/loaders/GP_PNG.h @@ -51,4 +51,10 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, GP_ProgressCallback *callback); -#endif /* GP_PNG_H */ +/* + * Saves PNG to a file. + */ +GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback); + +#endif /* LOADERS_GP_PNG_H */ diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index b013c42..d7da8ae 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -70,13 +70,25 @@ err: return GP_EBADFILE; } +static const char *interlace_type_name(int interlace) +{ + switch (interlace) { + case PNG_INTERLACE_NONE: + return "none"; + case PNG_INTERLACE_ADAM7: + return "adam7"; + default: + return "unknown"; + } +} + GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, GP_ProgressCallback *callback) { png_structp png; png_infop png_info = NULL; png_uint_32 w, h; - int depth, color_type; + int depth, color_type, interlace_type; GP_PixelType pixel_type = GP_PIXEL_UNKNOWN; GP_RetCode ret; @@ -107,9 +119,10 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, png_read_info(png, png_info); png_get_IHDR(png, png_info, &w, &h, &depth, - &color_type, NULL, NULL, NULL); + &color_type, &interlace_type, NULL, NULL); - GP_DEBUG(2, "Have %s%s PNG%s size %ux%u depth %i", + GP_DEBUG(2, "Have %s%s interlace %s PNG%s size %ux%u depth %i", + interlace_type_name(interlace_type), color_type & PNG_COLOR_MASK_PALETTE ? "pallete " : "", color_type & PNG_COLOR_MASK_COLOR ? "color" : "gray", color_type & PNG_COLOR_MASK_ALPHA ? " with alpha channel" : "", @@ -156,6 +169,7 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, } if (pixel_type == GP_PIXEL_UNKNOWN) { + GP_DEBUG(1, "Unimplemented png format"); ret = GP_ENOIMPL; goto err2; } @@ -168,10 +182,11 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, } uint32_t y; - + + /* start the actuall reading */ for (y = 0; y < h; y++) { - png_bytep addr = GP_PIXEL_ADDR(*res, 0, y); - png_read_rows(png, &addr, NULL, 1); + png_bytep row = GP_PIXEL_ADDR(*res, 0, y); + png_read_rows(png, &row, NULL, 1); if (GP_ProgressCallbackReport(callback, y, h, w)) { GP_DEBUG(1, "Operation aborted"); @@ -204,3 +219,88 @@ GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, return GP_ReadPNG(f, res, callback); } + +GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback) +{ + FILE *f; + GP_RetCode ret; + png_structp png; + png_infop png_info = NULL; + + if (src->pixel_type != GP_PIXEL_RGB888) { + GP_DEBUG(1, "Can't save png with pixel type %s", + GP_PixelTypeName(src->pixel_type)); + return GP_ENOIMPL; + } + + f = fopen(dst_path, "wb"); + + if (f == NULL) { + GP_DEBUG(1, "Failed to open '%s' for writing: %s", + dst_path, strerror(errno)); + return GP_EBADFILE; + } + + png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (png == NULL) { + GP_DEBUG(1, "Failed to allocate PNG write buffer"); + ret = GP_ENOMEM; + goto err1; + } + + png_info = png_create_info_struct(png); + + if (png_info == NULL) { + GP_DEBUG(1, "Failed to allocate PNG info buffer"); + ret = GP_ENOMEM; + goto err2; + } + + if (setjmp(png_jmpbuf(png))) { + GP_DEBUG(1, "Failed to write PNG file :("); + ret = GP_EBADFILE; + goto err2; + } + + png_init_io(png, f); + png_set_IHDR(png, png_info, src->w, src->h, 8, PNG_COLOR_TYPE_RGB, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, + PNG_FILTER_TYPE_DEFAULT); + + /* start the actuall writing */ + png_write_info(png, png_info); + png_set_bgr(png); + + uint32_t y; + + for (y = 0; y < src->h; y++) { + png_bytep row = GP_PIXEL_ADDR(src, 0, y); + png_write_row(png, row); + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { + GP_DEBUG(1, "Operation aborted"); + ret = GP_EINTR; + goto err2; + } + + } + + png_write_end(png, png_info); + png_destroy_write_struct(&png, &png_info); + + if (fclose(f)) { + GP_DEBUG(1, "Failed to close file '%s': %s", + dst_path, strerror(errno)); + return GP_EBADFILE; + } + + return GP_ESUCCESS; +err2: + png_destroy_write_struct(&png, png_info == NULL ? NULL : &png_info); +err1: + fclose(f); + unlink(dst_path); + return ret; +} ----------------------------------------------------------------------- Summary of changes: include/loaders/GP_JPG.h | 16 +++++-- include/loaders/GP_PNG.h | 8 +++- libs/loaders/GP_JPG.c | 92 +++++++++++++++++++++++++++++++++++++- libs/loaders/GP_PNG.c | 112 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 215 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 05551ed06488f6e537a0705980630f2d36b47c40
by metan 04 Nov '11

04 Nov '11

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, master has been updated via 05551ed06488f6e537a0705980630f2d36b47c40 (commit) via c793286d79acf527139becc2b6ba847193cad08d (commit) from a2f97569d98cda1ac080fbe73de4fa58fa5ae10b (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/05551ed06488f6e537a0705980630f2d36b4… commit 05551ed06488f6e537a0705980630f2d36b47c40 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 4 13:43:15 2011 +0100 Add progress callback to JPG and PNG loaders. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 260e821..ead85bf 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -69,6 +69,7 @@ static float calc_img_size(uint32_t img_w, uint32_t img_h, static void *image_loader(void *ptr) { struct loader_params *params = ptr; + GP_ProgressCallback callback = {.callback = image_loader_callback}; fprintf(stderr, "Loading '%s'n", params->img_path); @@ -83,7 +84,7 @@ static void *image_loader(void *ptr) GP_Context *img = NULL; - if (GP_LoadImage(params->img_path, &img) != 0) { + if (GP_LoadImage(params->img_path, &img, &callback) != 0) { GP_BoxCenteredText(&fb->context, NULL, 0, 0, fb->context.w, fb->context.h, "Failed to load image", white_pixel); @@ -115,7 +116,6 @@ static void *image_loader(void *ptr) img = tmp; } - GP_ProgressCallback callback = {.callback = image_loader_callback}; GP_Context *ret; diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 2854ac3..9833ea1 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -549,7 +549,7 @@ int main(int argc, char *argv[]) snprintf(buf, sizeof(buf), "out_%i.ppm", i - optind + 1); fprintf(stderr, "Processing '%s' -> '%s'n", argv[i], buf); - if ((ret = GP_LoadImage(argv[i], &bitmap))) { + if ((ret = GP_LoadImage(argv[i], &bitmap, NULL))) { fprintf(stderr, "Failed to load bitmap: %sn", GP_RetCodeName(ret)); return 1; diff --git a/include/loaders/GP_JPG.h b/include/loaders/GP_JPG.h index bef6e10..fddac6e 100644 --- a/include/loaders/GP_JPG.h +++ b/include/loaders/GP_JPG.h @@ -26,10 +26,11 @@ */ -#ifndef GP_JPG_H -#define GP_JPG_H +#ifndef LOADERS_GP_JPG_H +#define LOADERS_GP_JPG_H #include "core/GP_Context.h" +#include "core/GP_ProgressCallback.h" /* * Opens up file and checks signature. Upon successful return the file @@ -41,11 +42,13 @@ GP_RetCode GP_OpenJPG(const char *src_path, FILE **f); * Reads PNG from an open FILE. Expects the file possition set after the eight * bytes PNG signature. */ -GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res); +GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, + GP_ProgressCallback *callback); /* * Loads a PNG file into GP_Context. The Context is newly allocated. */ -GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res); +GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); -#endif /* GP_JPG_H */ +#endif /* LOADERS_GP_JPG_H */ diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_Loaders.h index e3ff703..b327744 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_Loaders.h @@ -29,10 +29,11 @@ */ -#ifndef GP_LOADERS_H -#define GP_LOADERS_H +#ifndef LOADERS_GP_LOADERS_H +#define LOADERS_GP_LOADERS_H #include "core/GP_Context.h" +#include "core/GP_ProgressCallback.h" #include "GP_PBM.h" #include "GP_PGM.h" @@ -45,6 +46,7 @@ /* * Tries to load image accordingly to extension. */ -GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res); +GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); -#endif /* GP_LOADERS_H */ +#endif /* LOADERS_GP_LOADERS_H */ diff --git a/include/loaders/GP_PNG.h b/include/loaders/GP_PNG.h index 2b02deb..cfa9438 100644 --- a/include/loaders/GP_PNG.h +++ b/include/loaders/GP_PNG.h @@ -26,9 +26,10 @@ */ -#ifndef GP_PNG_H -#define GP_PNG_H +#ifndef LOADERS_GP_PNG_H +#define LOADERS_GP_PNG_H +#include "core/GP_ProgressCallback.h" #include "core/GP_Context.h" /* @@ -41,11 +42,13 @@ GP_RetCode GP_OpenPNG(const char *src_path, FILE **f); * Reads PNG from an open FILE. Expects the file possition set after the eight * bytes PNG signature. */ -GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res); +GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, + GP_ProgressCallback *callback); /* * Loads a PNG file into GP_Context. The Context is newly allocated. */ -GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res); +GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback); #endif /* GP_PNG_H */ diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index 5958dab..be0b67c 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -36,8 +36,8 @@ #include <jpeglib.h> -#include <GP_Context.h> -#include <GP_Debug.h> +#include "GP_JPG.h" +#include "core/GP_Debug.h" GP_RetCode GP_OpenJPG(const char *src_path, FILE **f) { @@ -87,7 +87,8 @@ static const char *get_colorspace(J_COLOR_SPACE color_space) }; } -GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res) +GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, + GP_ProgressCallback *callback) { struct jpeg_decompress_struct cinfo; struct my_jpg_err my_err; @@ -163,17 +164,27 @@ GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res) uint8_t *pix = GP_PIXEL_ADDR(ret, i, y); GP_SWAP(pix[0], pix[2]); } + + if (GP_ProgressCallbackReport(callback, y, ret->h, ret->w)) { + GP_DEBUG(1, "Operation aborted"); + jpeg_destroy_decompress(&cinfo); + fclose(f); + GP_ContextFree(ret); + return GP_EINTR; + } } jpeg_finish_decompress(&cinfo); jpeg_destroy_decompress(&cinfo); fclose(f); *res = ret; - + + GP_ProgressCallbackDone(callback); return GP_ESUCCESS; } -GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res) +GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback) { FILE *f; GP_RetCode ret; @@ -181,5 +192,5 @@ GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res) if ((ret = GP_OpenJPG(src_path, &f))) return ret; - return GP_ReadJPG(f, res); + return GP_ReadJPG(f, res, callback); } diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 8f69d03..8a57c59 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -30,11 +30,12 @@ #include <unistd.h> #include <errno.h> -#include <GP_Debug.h> +#include "core/GP_Debug.h" #include "GP_Loaders.h" -GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res) +GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback) { int len = strlen(src_path); GP_RetCode ret = GP_ENOIMPL; @@ -54,13 +55,13 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res) case 'N': if (src_path[len - 3] == 'p' || src_path[len - 3] == 'P') - ret = GP_LoadPNG(src_path, res); + ret = GP_LoadPNG(src_path, res, callback); break; case 'p': case 'P': if (src_path[len - 3] == 'j' || src_path[len - 3] == 'J') - ret = GP_LoadJPG(src_path, res); + ret = GP_LoadJPG(src_path, res, callback); break; case 'e': case 'E': @@ -68,7 +69,7 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res) src_path[len - 3] == 'P') && (src_path[len - 4] == 'j' || src_path[len - 4] == 'J')) - ret = GP_LoadJPG(src_path, res); + ret = GP_LoadJPG(src_path, res, callback); break; } break; diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index dae8120..b013c42 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -34,8 +34,8 @@ #include <png.h> -#include <GP_Context.h> -#include <GP_Debug.h> +#include "GP_PNG.h" +#include "core/GP_Debug.h" GP_RetCode GP_OpenPNG(const char *src_path, FILE **f) { @@ -70,7 +70,8 @@ err: return GP_EBADFILE; } -GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res) +GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, + GP_ProgressCallback *callback) { png_structp png; png_infop png_info = NULL; @@ -171,8 +172,19 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res) for (y = 0; y < h; y++) { png_bytep addr = GP_PIXEL_ADDR(*res, 0, y); png_read_rows(png, &addr, NULL, 1); + + if (GP_ProgressCallbackReport(callback, y, h, w)) { + GP_DEBUG(1, "Operation aborted"); + png_destroy_read_struct(&png, &png_info, NULL); + fclose(f); + GP_ContextFree(*res); + return GP_EINTR; + } + } + GP_ProgressCallbackDone(callback); + ret = GP_ESUCCESS; err2: png_destroy_read_struct(&png, png_info ? &png_info : NULL, NULL); @@ -181,7 +193,8 @@ err1: return ret; } -GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res) +GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, + GP_ProgressCallback *callback) { FILE *f; GP_RetCode ret; @@ -189,5 +202,5 @@ GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res) if ((ret = GP_OpenPNG(src_path, &f))) return ret; - return GP_ReadPNG(f, res); + return GP_ReadPNG(f, res, callback); } diff --git a/tests/SDL/showimage.c b/tests/SDL/showimage.c index 134f8f9..9df416d 100644 --- a/tests/SDL/showimage.c +++ b/tests/SDL/showimage.c @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) GP_RetCode ret; - if ((ret = GP_LoadImage(argv[1], &bitmap))) { + if ((ret = GP_LoadImage(argv[1], &bitmap, NULL))) { fprintf(stderr, "Failed to load bitmap: %sn", GP_RetCodeName(ret)); return 1; } http://repo.or.cz/w/gfxprim.git/commit/c793286d79acf527139becc2b6ba847193ca… commit c793286d79acf527139becc2b6ba847193cad08d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 4 13:26:56 2011 +0100 Added GP_EINTR ret code. diff --git a/include/core/GP_RetCode.h b/include/core/GP_RetCode.h index 9241a26..ce875fd 100644 --- a/include/core/GP_RetCode.h +++ b/include/core/GP_RetCode.h @@ -19,12 +19,12 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#ifndef GP_RETCODE_H -#define GP_RETCODE_H +#ifndef CORE_GP_RETCODE_H +#define CORE_GP_RETCODE_H typedef enum GP_RetCode { GP_ESUCCESS, @@ -38,9 +38,10 @@ typedef enum GP_RetCode { GP_EBADFILE, /* error in file, or bad file format */ GP_ENOENT, /* no such file or another object */ GP_ENOMEM, /* not enough memory */ + GP_EINTR, /* operation interrupted by user */ GP_EMAX, } GP_RetCode; const char *GP_RetCodeName(GP_RetCode code); -#endif /* GP_RETCODE_H */ +#endif /* CORE_GP_RETCODE_H */ diff --git a/libs/core/GP_RetCode.c b/libs/core/GP_RetCode.c index a4069c5..f14b5cc 100644 --- a/libs/core/GP_RetCode.c +++ b/libs/core/GP_RetCode.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -37,10 +37,10 @@ static char *ret_code_names[] = { "Bad context", "Bad file", "Not found", - "Not enough memory" + "Not enough memory", + "Operation interrupted" }; - const char *GP_RetCodeName(GP_RetCode code) { if (code >= GP_EMAX) ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 4 ++-- demos/grinder/grinder.c | 2 +- include/core/GP_RetCode.h | 9 +++++---- include/loaders/GP_JPG.h | 13 ++++++++----- include/loaders/GP_Loaders.h | 10 ++++++---- include/loaders/GP_PNG.h | 11 +++++++---- libs/core/GP_RetCode.c | 6 +++--- libs/loaders/GP_JPG.c | 23 +++++++++++++++++------ libs/loaders/GP_Loaders.c | 11 ++++++----- libs/loaders/GP_PNG.c | 23 ++++++++++++++++++----- tests/SDL/showimage.c | 2 +- 11 files changed, 74 insertions(+), 40 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0