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 b6471296e04e26c765fb2c348a728e23fde1ddf0 (commit) via d6aa7076c6f1dc065a9dcbd3aa693ca5559a9638 (commit) via 69ba492486b7e674f62accfe5c41f4d7b0e27489 (commit) via 8bababd6a7972a3d0e724ac8fb4c3ee8495a7e16 (commit) from c12d40497d99bf25873566a9b848cd474319c7cd (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/b6471296e04e26c765fb2c348a728e23fde1d... commit b6471296e04e26c765fb2c348a728e23fde1ddf0 Author: Cyril Hrubis <metan@ucw.cz> Date: Mon Mar 18 21:03:53 2013 +0100 pywrap:core: Make members of GP_DebugMsg immutable. diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index b7725eb..6e616a1 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -11,13 +11,23 @@ %include "GP_Common.h" %include "GP_Core.h" -%include "GP_Debug.h" %include "GP_Types.h" %include "GP_Transform.h" %include "GP_GetSetBits.h" %include "GP_Transform.h" %include "GP_ProgressCallback.h" +/* + * Make members of GP_DebugMsg structure immutable + */ + +%immutable GP_DebugMsg::level; +%immutable GP_DebugMsg::file; +%immutable GP_DebugMsg::fn; +%immutable GP_DebugMsg::line; +%immutable GP_DebugMsg::msg; + +%include "GP_Debug.h" /* * Color and pixel types http://repo.or.cz/w/gfxprim.git/commit/d6aa7076c6f1dc065a9dcbd3aa693ca5559a9... commit d6aa7076c6f1dc065a9dcbd3aa693ca5559a9638 Author: Cyril Hrubis <metan@ucw.cz> Date: Mon Mar 18 20:57:12 2013 +0100 pylib:templates,gfxprim_config: Add 16bit Grayscale. Add 16 bit grayscale into the config, fix filter templates. diff --git a/gfxprim_config.py b/gfxprim_config.py index b0aafed..cb3fb44 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -121,6 +121,9 @@ config = GfxPrimConfig( PixelType(name='G8', pixelsize=PS_8BPP, chanslist=[ ('V', 0, 8)]), + + PixelType(name='G16', pixelsize=PS_16BPP, chanslist=[ + ('V', 0, 16)]), # # Experiments diff --git a/pylib/templates/filter.arithmetic.c.t b/pylib/templates/filter.arithmetic.c.t index d74ddce..1bbeab1 100644 --- a/pylib/templates/filter.arithmetic.c.t +++ b/pylib/templates/filter.arithmetic.c.t @@ -57,7 +57,7 @@ static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src_a, const GP_C */ %% macro filter_arithmetic_per_bpp(name, filter_op, opts="") %% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 +%% if ps.size > 1 static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src_a, const GP_Context *src_b, GP_Context *dst, {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) { diff --git a/pylib/templates/filter.point.c.t b/pylib/templates/filter.point.c.t index c084efd..dde4ce4 100644 --- a/pylib/templates/filter.point.c.t +++ b/pylib/templates/filter.point.c.t @@ -50,7 +50,7 @@ static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context * */ %% macro filter_point_per_bpp(name, opts="", filter_op) %% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 +%% if ps.size > 1 static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) { diff --git a/pylib/templates/filter.stats.c.t b/pylib/templates/filter.stats.c.t index 14779a9..5b65f3b 100644 --- a/pylib/templates/filter.stats.c.t +++ b/pylib/templates/filter.stats.c.t @@ -46,7 +46,7 @@ static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, */ %% macro filter_point_per_bpp(name, opts="", filter_op) %% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 +%% if ps.size > 1 static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) { http://repo.or.cz/w/gfxprim.git/commit/69ba492486b7e674f62accfe5c41f4d7b0e27... commit 69ba492486b7e674f62accfe5c41f4d7b0e27489 Author: Cyril Hrubis <metan@ucw.cz> Date: Mon Mar 18 20:46:24 2013 +0100 loaders: PSP: Fix 'set but not used' warnings. diff --git a/libs/loaders/GP_PSP.c b/libs/loaders/GP_PSP.c index d77ee29..7585d91 100644 --- a/libs/loaders/GP_PSP.c +++ b/libs/loaders/GP_PSP.c @@ -303,7 +303,6 @@ static int psp_read_composite_image_block(FILE *f, struct psp_img_attrs *attrs, GP_ProgressCallback *callback) { uint8_t buf[8]; - uint32_t chunk_size; uint32_t i, composite_image_count; /* we are allready in subblock -> error */ @@ -317,7 +316,6 @@ static int psp_read_composite_image_block(FILE *f, struct psp_img_attrs *attrs, return EIO; } - chunk_size = BUF_TO_4(buf, 0); composite_image_count = BUF_TO_4(buf, 4); //TODO: utilize chunk_size @@ -366,15 +364,12 @@ static int psp_read_composite_attributes_block(FILE *f, struct psp_img_attrs *at { uint8_t buf[24]; struct psp_comp_img_attr_info info; - uint32_t chunk_size; if (fread(buf, sizeof(buf), 1, f) < 1) { GP_DEBUG(1, "Failed to read Composite Image Bank Info Chunk"); return EIO; } - chunk_size = BUF_TO_4(buf, 0); - info.w = BUF_TO_4(buf, 4); info.h = BUF_TO_4(buf, 8); info.bit_depth = BUF_TO_2(buf, 12); @@ -404,7 +399,6 @@ static int psp_read_jpeg(FILE *f, struct psp_img_attrs *attrs, GP_ProgressCallback *callback) { uint8_t buf[14]; - uint32_t chunk_size; int err; if (fread(buf, sizeof(buf), 1, f) < 1) { @@ -412,8 +406,6 @@ static int psp_read_jpeg(FILE *f, struct psp_img_attrs *attrs, return EIO; } - chunk_size = BUF_TO_4(buf, 0); - //TODO: utilize chunk_size GP_DEBUG(5, "JPEG Chunk"); http://repo.or.cz/w/gfxprim.git/commit/8bababd6a7972a3d0e724ac8fb4c3ee8495a7... commit 8bababd6a7972a3d0e724ac8fb4c3ee8495a7e16 Author: Cyril Hrubis <metan@ucw.cz> Date: Mon Mar 18 20:41:37 2013 +0100 core: Convert_Scale: Add support for > 8bits. Add support for conversion macros up to 32bits per channel and also make the header more readable by writing the shift as a C shift. diff --git a/include/core/GP_Convert_Scale.gen.h.t b/include/core/GP_Convert_Scale.gen.h.t index c358576..a7dae41 100644 --- a/include/core/GP_Convert_Scale.gen.h.t +++ b/include/core/GP_Convert_Scale.gen.h.t @@ -3,7 +3,7 @@ {% block descr %}Fast value scaling macros{% endblock %} {% macro multcoef(s1, s2) -%} -(0{% for i in range((s2 + s1 - 1) // s1) %}+{{ 2 ** (i * s1) }}{% endfor %}) +(0{% for i in range((s2 + s1 - 1) // s1) %}+(2<<{{ (i * s1) }}){% endfor %}) {%- endmacro %} %% block body @@ -15,8 +15,8 @@ #define GP_SCALE_VAL(s1, s2, val) ( GP_SCALE_VAL_##s1##_##s2(val) ) -%% for s1 in range(1,9) -%% for s2 in range(1,9) +%% for s1 in range(1,33) +%% for s2 in range(1,33) %% if s2>s1 #define GP_SCALE_VAL_{{s1}}_{{s2}}(val) (((val) * {{ multcoef(s1, s2) }}) >> {{ (-s2) % s1 }}) %% else ----------------------------------------------------------------------- Summary of changes: gfxprim_config.py | 3 +++ include/core/GP_Convert_Scale.gen.h.t | 6 +++--- libs/loaders/GP_PSP.c | 8 -------- pylib/gfxprim/core/core.i | 12 +++++++++++- pylib/templates/filter.arithmetic.c.t | 2 +- pylib/templates/filter.point.c.t | 2 +- pylib/templates/filter.stats.c.t | 2 +- 7 files changed, 20 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. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")