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/3ff64e524d3ea031c6573df03ad9081b7238d... commit 3ff64e524d3ea031c6573df03ad9081b7238d41a Author: Cyril Hrubis <metan@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/93801b75af9601cad8fddcaa83856f05cf59e... commit 93801b75af9601cad8fddcaa83856f05cf59e05f Author: Cyril Hrubis <metan@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/61a0d6e6c5d1b9bba188466918ac52df9d98f... commit 61a0d6e6c5d1b9bba188466918ac52df9d98f260 Author: Cyril Hrubis <metan@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/22df756bf97829e969623f0c9bf21bacb3895... commit 22df756bf97829e969623f0c9bf21bacb3895987 Author: Cyril Hrubis <metan@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/a3c22bffdd3edb82a0f612542e15cae53647e... commit a3c22bffdd3edb82a0f612542e15cae53647e3b1 Author: Cyril Hrubis <metan@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@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.")