March 2013 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: b6471296e04e26c765fb2c348a728e23fde1ddf0
by metan 18 Mar '13

18 Mar '13

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/b6471296e04e26c765fb2c348a728e23fde1… commit b6471296e04e26c765fb2c348a728e23fde1ddf0 Author: Cyril Hrubis <metan(a)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/d6aa7076c6f1dc065a9dcbd3aa693ca5559a… commit d6aa7076c6f1dc065a9dcbd3aa693ca5559a9638 Author: Cyril Hrubis <metan(a)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/69ba492486b7e674f62accfe5c41f4d7b0e2… commit 69ba492486b7e674f62accfe5c41f4d7b0e27489 Author: Cyril Hrubis <metan(a)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/8bababd6a7972a3d0e724ac8fb4c3ee8495a… commit 8bababd6a7972a3d0e724ac8fb4c3ee8495a7e16 Author: Cyril Hrubis <metan(a)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(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: c12d40497d99bf25873566a9b848cd474319c7cd
by metan 10 Mar '13

10 Mar '13

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 c12d40497d99bf25873566a9b848cd474319c7cd (commit) from 7ed201b00c522cc717ae55bc2e801cbceecccc8c (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/c12d40497d99bf25873566a9b848cd474319… commit c12d40497d99bf25873566a9b848cd474319c7cd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 10 17:19:56 2013 +0100 libs: filters: Don't abort on unimplemented filter The library now returns failure instead. diff --git a/libs/filters/GP_Median.c b/libs/filters/GP_Median.c index e6dca7d..130ad92 100644 --- a/libs/filters/GP_Median.c +++ b/libs/filters/GP_Median.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Context.h" #include "core/GP_GetPutPixel.h" #include "core/GP_TempAlloc.h" @@ -176,8 +178,10 @@ static int GP_FilterMedian_Raw(const GP_Context *src, int i, x, y; unsigned int trigger = ((2*xmed+1)*(2*ymed+1))/2; - //TODO - GP_CHECK(src->pixel_type == GP_PIXEL_RGB888); + if (src->pixel_type != GP_PIXEL_RGB888) { + errno = ENOSYS; + return -1; + } GP_DEBUG(1, "Median filter size %ux%u xmed=%u ymed=%u", w_src, h_src, 2 * xmed + 1, 2 * ymed + 1); diff --git a/libs/filters/GP_Sigma.c b/libs/filters/GP_Sigma.c index 2d1f6aa..d6d78c8 100644 --- a/libs/filters/GP_Sigma.c +++ b/libs/filters/GP_Sigma.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Context.h" #include "core/GP_GetPutPixel.h" #include "core/GP_TempAlloc.h" @@ -44,7 +46,10 @@ static int GP_FilterSigma_Raw(const GP_Context *src, int x, y; unsigned int x1, y1; - GP_CHECK(src->pixel_type == GP_PIXEL_RGB888); + if (src->pixel_type != GP_PIXEL_RGB888) { + errno = ENOSYS; + return -1; + } GP_DEBUG(1, "Sigma Mean filter size %ux%u xrad=%u yrad=%u sigma=%.2f", w_src, h_src, xrad, yrad, sigma); diff --git a/libs/filters/GP_WeightedMedian.c b/libs/filters/GP_WeightedMedian.c index a34193d..aac0c75 100644 --- a/libs/filters/GP_WeightedMedian.c +++ b/libs/filters/GP_WeightedMedian.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Context.h" #include "core/GP_GetPutPixel.h" #include "core/GP_TempAlloc.h" @@ -86,7 +88,10 @@ static int GP_FilterWeightedMedian_Raw(const GP_Context *src, int x, y, sum = sum_weights(weights); unsigned int x1, y1; - GP_CHECK(src->pixel_type == GP_PIXEL_RGB888); + if (src->pixel_type != GP_PIXEL_RGB888) { + errno = ENOSYS; + return -1; + } GP_DEBUG(1, "Weighted Median filter size %ux%u xmed=%u ymed=%u sum=%u", w_src, h_src, weights->w, weights->h, sum); ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_Median.c | 10 +++++++--- libs/filters/GP_Sigma.c | 9 +++++++-- libs/filters/GP_WeightedMedian.c | 9 +++++++-- 3 files changed, 21 insertions(+), 7 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: 7ed201b00c522cc717ae55bc2e801cbceecccc8c
by metan 10 Mar '13

10 Mar '13

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 7ed201b00c522cc717ae55bc2e801cbceecccc8c (commit) from 14a7c31c3b039f035cbb271888cc5fa44c578802 (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/7ed201b00c522cc717ae55bc2e801cbceecc… commit 7ed201b00c522cc717ae55bc2e801cbceecccc8c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 10 17:13:08 2013 +0100 tests: filters: Fix coverage filter params. For the rotation filters the rotated context must fit into the destination, fix this for now by making the predefined context square. diff --git a/tests/filters/APICoverage.gen.c.t b/tests/filters/APICoverage.gen.c.t index 32dfd0e..fdffabe 100644 --- a/tests/filters/APICoverage.gen.c.t +++ b/tests/filters/APICoverage.gen.c.t @@ -97,7 +97,7 @@ ] %% macro prep_context(id, pt) - GP_Context *{{ id }} = GP_ContextAlloc(113, 900, GP_PIXEL_{{ pt.name }}); + GP_Context *{{ id }} = GP_ContextAlloc(331, 331, GP_PIXEL_{{ pt.name }}); %% endmacro %% macro prep_float(id) ----------------------------------------------------------------------- Summary of changes: tests/filters/APICoverage.gen.c.t | 2 +- 1 files changed, 1 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: 14a7c31c3b039f035cbb271888cc5fa44c578802
by metan 08 Mar '13

08 Mar '13

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 14a7c31c3b039f035cbb271888cc5fa44c578802 (commit) from cb2c440163c18fe8cdbe96969ea28fe38da3fb56 (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/14a7c31c3b039f035cbb271888cc5fa44c57… commit 14a7c31c3b039f035cbb271888cc5fa44c578802 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 8 15:26:50 2013 +0100 tests: filters: Add a few initializers to APICoverage. diff --git a/tests/filters/APICoverage.gen.c.t b/tests/filters/APICoverage.gen.c.t index 3b46006..32dfd0e 100644 --- a/tests/filters/APICoverage.gen.c.t +++ b/tests/filters/APICoverage.gen.c.t @@ -38,24 +38,34 @@ #include "tst_test.h" -%% set API_List = [['MirrorH', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], +%% set API_List = [['MirrorH', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], ['MirrorH_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['MirrorV', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['MirrorV', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], ['MirrorV_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['Rotate90', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate90_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate90', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['Rotate90_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['Rotate180', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate180_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate180', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['Rotate180_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['Rotate270', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate270_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - - ['GaussianBlur', 'GP_Context:in', 'GP_Context:out', + ['Rotate270', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['Rotate270_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['Convolution', 'GP_Context:in', 'GP_Context:out', + 'GP_FilterKernel2D:kernel', 'GP_ProgressCallback'], + ['ConvolutionAlloc', 'GP_Context:in', + 'GP_FilterKernel2D:kernel', 'GP_ProgressCallback'], + + ['GaussianBlur', 'GP_Context:in', 'GP_Context:out', 'float:sigma_x', 'float:sigma_y', 'GP_ProgressCallback'], - ['GaussianBlurAlloc', 'GP_Context:in', 'float:sigma_x', + ['GaussianBlurAlloc', 'GP_Context:in', 'float:sigma_x', 'float:sigma_y', 'GP_ProgressCallback'], ['GaussianNoiseAdd', 'GP_Context:in', 'GP_Context:out', @@ -68,13 +78,22 @@ ['MedianAlloc', 'GP_Context:in', 'int:xmed', 'int:ymed', 'GP_ProgressCallback'], - ['Sigma', 'GP_Context:in', 'GP_Context:out', - 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', 'GP_ProgressCallback'], - ['SigmaAlloc', 'GP_Context:in', - 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', 'GP_ProgressCallback'], - - ['ResizeNN', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['ResizeNNAlloc', 'GP_Context:in', 'int:w', 'int:h', 'GP_ProgressCallback'], + ['WeightedMedian', 'GP_Context:in', 'GP_Context:out', + 'GP_MedianWeights:weights', 'GP_ProgressCallback'], + ['WeightedMedianAlloc', 'GP_Context:in', + 'GP_MedianWeights:weights', 'GP_ProgressCallback'], + + ['Sigma', 'GP_Context:in', 'GP_Context:out', + 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', + 'GP_ProgressCallback'], + ['SigmaAlloc', 'GP_Context:in', + 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', + 'GP_ProgressCallback'], + + ['ResizeNN', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['ResizeNNAlloc', 'GP_Context:in', 'int:w', 'int:h', + 'GP_ProgressCallback'], ] %% macro prep_context(id, pt) @@ -89,6 +108,41 @@ int {{ id }} = 2; %% endmacro +%% macro prep_median_weights(id) + + unsigned int {{ id }}_w[] = { + 1, 2, 1, + 2, 4, 2, + 1, 2, 1, + }; + + GP_MedianWeights {{ id }}_s = { + .w = 3, + .h = 3, + .weights = {{ id }}_w, + }; + + GP_MedianWeights *{{ id }} = &{{ id }}_s; + +%% endmacro + +%% macro prep_filter_kernel_2d(id) + float {{ id }}_kern[] = { + 1, 1, 1, + 1, 1, 1, + 1, 1, 1, + }; + + GP_FilterKernel2D {{ id }}_s = { + .w = 3, + .h = 3, + .div = 9, + .kernel = {{ id }}_kern, + }; + + GP_FilterKernel2D *{{ id }} = &{{ id }}_s; +%% endmacro + %% macro prep_param(param, pt) %% if (param.split(':', 1)[0] == 'GP_Context') {{ prep_context(param.split(':', 1)[1], pt) }} @@ -99,27 +153,33 @@ %% if (param.split(':', 1)[0] == 'int') {{ prep_int(param.split(':', 1)[1]) }} %% endif +%% if (param.split(':', 1)[0] == 'GP_MedianWeights') +{{ prep_median_weights(param.split(':', 1)[1]) }} +%% endif +%% if (param.split(':', 1)[0] == 'GP_FilterKernel2D') +{{ prep_filter_kernel_2d(param.split(':', 1)[1]) }} +%% endif %% endmacro {% macro get_param(param) %}{% if len(param.split(':', 1)) == 1 %}NULL{% else %}{{ param.split(':', 1)[1] }}{% endif %}{% endmacro %} -%% for pt in pixeltypes -%% if not pt.is_unknown() %% for fn in API_List +%% for pt in pixeltypes +%% if not pt.is_unknown() static int Filter_{{ fn[0]}}_{{ pt.name }}(void) { -%% for param in fn[1:] +%% for param in fn[1:] {{ prep_param(param, pt) }} -%% endfor +%% endfor GP_Filter{{ fn[0] }}({{ get_param(fn[1]) }}{% for param in fn[2:] %}, {{ get_param(param) }}{% endfor %}); return TST_SUCCESS; } -%% endfor -%% endif +%% endif +%% endfor %% endfor const struct tst_suite tst_suite = { ----------------------------------------------------------------------- Summary of changes: tests/filters/APICoverage.gen.c.t | 108 ++++++++++++++++++++++++++++-------- 1 files changed, 84 insertions(+), 24 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: cb2c440163c18fe8cdbe96969ea28fe38da3fb56
by metan 08 Mar '13

08 Mar '13

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 cb2c440163c18fe8cdbe96969ea28fe38da3fb56 (commit) from abee71632bc9666b9b9c483868f17c9920be6343 (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/cb2c440163c18fe8cdbe96969ea28fe38da3… commit cb2c440163c18fe8cdbe96969ea28fe38da3fb56 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 8 13:46:32 2013 +0100 tests: filters: Add dump API Coverage generator. diff --git a/tests/filters/APICoverage.gen.c.t b/tests/filters/APICoverage.gen.c.t new file mode 100644 index 0000000..3b46006 --- /dev/null +++ b/tests/filters/APICoverage.gen.c.t @@ -0,0 +1,140 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + The purpose of this test is to exercise as much codepaths as possible + without checking for result corectness. + + */ + +%% extends "base.test.c.t" + +%% block body + +#include <stdio.h> + +#include <core/GP_Context.h> +#include <filters/GP_Filters.h> + +#include "tst_test.h" + +%% set API_List = [['MirrorH', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['MirrorH_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['MirrorV', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['MirrorV_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['Rotate90', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['Rotate90_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['Rotate180', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['Rotate180_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['Rotate270', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['Rotate270_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['GaussianBlur', 'GP_Context:in', 'GP_Context:out', + 'float:sigma_x', 'float:sigma_y', 'GP_ProgressCallback'], + ['GaussianBlurAlloc', 'GP_Context:in', 'float:sigma_x', + 'float:sigma_y', 'GP_ProgressCallback'], + + ['GaussianNoiseAdd', 'GP_Context:in', 'GP_Context:out', + 'float:sigma', 'float:mu', 'GP_ProgressCallback'], + ['GaussianNoiseAddAlloc', 'GP_Context:in', + 'float:sigma', 'float:mu', 'GP_ProgressCallback'], + + ['Median', 'GP_Context:in', 'GP_Context:out', + 'int:xmed', 'int:ymed', 'GP_ProgressCallback'], + ['MedianAlloc', 'GP_Context:in', + 'int:xmed', 'int:ymed', 'GP_ProgressCallback'], + + ['Sigma', 'GP_Context:in', 'GP_Context:out', + 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', 'GP_ProgressCallback'], + ['SigmaAlloc', 'GP_Context:in', + 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', 'GP_ProgressCallback'], + + ['ResizeNN', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['ResizeNNAlloc', 'GP_Context:in', 'int:w', 'int:h', 'GP_ProgressCallback'], +] + +%% macro prep_context(id, pt) + GP_Context *{{ id }} = GP_ContextAlloc(113, 900, GP_PIXEL_{{ pt.name }}); +%% endmacro + +%% macro prep_float(id) + float {{ id }} = 1; +%% endmacro + +%% macro prep_int(id) + int {{ id }} = 2; +%% endmacro + +%% macro prep_param(param, pt) +%% if (param.split(':', 1)[0] == 'GP_Context') +{{ prep_context(param.split(':', 1)[1], pt) }} +%% endif +%% if (param.split(':', 1)[0] == 'float') +{{ prep_float(param.split(':', 1)[1]) }} +%% endif +%% if (param.split(':', 1)[0] == 'int') +{{ prep_int(param.split(':', 1)[1]) }} +%% endif +%% endmacro + +{% macro get_param(param) %}{% if len(param.split(':', 1)) == 1 %}NULL{% else %}{{ param.split(':', 1)[1] }}{% endif %}{% endmacro %} + +%% for pt in pixeltypes +%% if not pt.is_unknown() +%% for fn in API_List + +static int Filter_{{ fn[0]}}_{{ pt.name }}(void) +{ +%% for param in fn[1:] +{{ prep_param(param, pt) }} +%% endfor + + GP_Filter{{ fn[0] }}({{ get_param(fn[1]) }}{% for param in fn[2:] %}, {{ get_param(param) }}{% endfor %}); + + return TST_SUCCESS; +} + +%% endfor +%% endif +%% endfor + +const struct tst_suite tst_suite = { + .suite_name = "Filters API Coverage", + .tests = { +%% for fn in API_List +%% for pt in pixeltypes +%% if not pt.is_unknown() + {.name = "Filter {{ fn[0] }} {{ pt.name }}", + .tst_fn = Filter_{{ fn[0] }}_{{ pt.name }}}, +%% endif +%% endfor +%% endfor + {.name = NULL} + } +}; + +%% endblock body diff --git a/tests/filters/Makefile b/tests/filters/Makefile index b0a590d..bda08a5 100644 --- a/tests/filters/Makefile +++ b/tests/filters/Makefile @@ -1,13 +1,16 @@ TOPDIR=../.. include $(TOPDIR)/pre.mk -CSOURCES=$(shell echo *.c) +CSOURCES=FilterMirrorH.c -APPS=FilterMirrorH +GENSOURCES=APICoverage.gen.c + +APPS=FilterMirrorH APICoverage.gen include ../tests.mk FilterMirrorH: common.o +include $(TOPDIR)/gen.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/tests/filters/runtest.sh b/tests/filters/runtest.sh index c820af1..6b11a77 100755 --- a/tests/filters/runtest.sh +++ b/tests/filters/runtest.sh @@ -10,3 +10,4 @@ export LIBC_FATAL_STDERR_=1 LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FilterMirrorH "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./APICoverage.gen "$@" diff --git a/tests/filters/test_list.txt b/tests/filters/test_list.txt index 2f9a127..4b3dee1 100644 --- a/tests/filters/test_list.txt +++ b/tests/filters/test_list.txt @@ -1,3 +1,4 @@ # Filters test list +APICoverage.gen FilterMirrorH ----------------------------------------------------------------------- Summary of changes: tests/filters/APICoverage.gen.c.t | 140 +++++++++++++++++++++++++++++++++++++ tests/filters/Makefile | 7 ++- tests/filters/runtest.sh | 1 + tests/filters/test_list.txt | 1 + 4 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 tests/filters/APICoverage.gen.c.t 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: abee71632bc9666b9b9c483868f17c9920be6343
by metan 03 Mar '13

03 Mar '13

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 abee71632bc9666b9b9c483868f17c9920be6343 (commit) from 51f403b8ec7418bee0bc1e80fd80136ad9d88586 (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/abee71632bc9666b9b9c483868f17c9920be… commit abee71632bc9666b9b9c483868f17c9920be6343 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 23:48:49 2013 +0100 doc: filters: Add link to progress callback description. diff --git a/doc/filters.txt b/doc/filters.txt index dba963e..adc5ce7 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -19,7 +19,7 @@ For convenience, the filters API is unified: * First argument(s) are always source(s) * Then, in case of second variant, destination * Other parameters follow -* And the last argument is progress callback +* And the last argument is link:progress_callback.html[progress callback] When using allocating version of the filter, pointer to the newly allocated context is returned, or in case of failure 'NULL' is returned. ----------------------------------------------------------------------- Summary of changes: doc/filters.txt | 2 +- 1 files changed, 1 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: 51f403b8ec7418bee0bc1e80fd80136ad9d88586
by metan 03 Mar '13

03 Mar '13

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 51f403b8ec7418bee0bc1e80fd80136ad9d88586 (commit) from 443c7577a6a1961dde7b5a150e9a3ec25d317260 (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/51f403b8ec7418bee0bc1e80fd80136ad9d8… commit 51f403b8ec7418bee0bc1e80fd80136ad9d88586 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 23:43:18 2013 +0100 filters: FilterMirrorH: Small fixes, more to come. diff --git a/libs/filters/GP_Rotate.c b/libs/filters/GP_Rotate.c index 7bfa309..a164886 100644 --- a/libs/filters/GP_Rotate.c +++ b/libs/filters/GP_Rotate.c @@ -16,14 +16,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Core.h" #include "core/GP_FnPerBpp.h" -#include "GP_Rotate.h" +#include "filters/GP_Rotate.h" #include <string.h> @@ -32,34 +34,39 @@ int GP_FilterMirrorH_Raw(const GP_Context *src, GP_Context *dst, { uint32_t bpr = src->bytes_per_row; uint8_t buf[bpr]; - uint32_t y; + unsigned int y; GP_DEBUG(1, "Mirroring image horizontally %ux%u", src->w, src->h); #warning FIXME: non byte aligned pixels - + /* Note that this should work both for src != dst and src == dst */ for (y = 0; y < src->h/2; y++) { - uint8_t *sl1 = src->pixels + bpr * y; - uint8_t *sl2 = src->pixels + bpr * (src->h - y - 1); - uint8_t *dl1 = dst->pixels + bpr * y; - uint8_t *dl2 = dst->pixels + bpr * (src->h - y - 1); + uint8_t *sl1 = GP_PIXEL_ADDR(src, 0, y); + uint8_t *sl2 = GP_PIXEL_ADDR(src, 0, src->h - y - 1); + uint8_t *dl1 = GP_PIXEL_ADDR(dst, 0, y); + uint8_t *dl2 = GP_PIXEL_ADDR(dst, 0, src->h - y - 1); + + int i; memcpy(buf, sl1, bpr); memcpy(dl1, sl2, bpr); memcpy(dl2, buf, bpr); - if (GP_ProgressCallbackReport(callback, 2 * y, src->h, src->w)) + if (GP_ProgressCallbackReport(callback, 2 * y, src->h, src->w)) { + GP_DEBUG(1, "Operation aborted"); + errno = ECANCELED; return 1; + } } /* Copy the middle odd line */ if (src != dst && src->h % 2) { y = src->h / 2; - uint8_t *sl = src->pixels + bpr * y; - uint8_t *dl = dst->pixels + bpr * y; - + uint8_t *sl = GP_PIXEL_ADDR(src, 0, y); + uint8_t *dl = GP_PIXEL_ADDR(dst, 0, y); + memcpy(dl, sl, bpr); } @@ -76,10 +83,8 @@ int GP_FilterMirrorH(const GP_Context *src, GP_Context *dst, GP_ASSERT(src->w <= dst->w && src->h <= dst->h, "Destination is not large enough"); - if (GP_FilterMirrorH_Raw(src, dst, callback)) { - GP_DEBUG(1, "Operation aborted"); + if (GP_FilterMirrorH_Raw(src, dst, callback)) return 1; - } return 0; } ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_Rotate.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 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: 443c7577a6a1961dde7b5a150e9a3ec25d317260
by metan 03 Mar '13

03 Mar '13

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 443c7577a6a1961dde7b5a150e9a3ec25d317260 (commit) from 8ac4aa41dac9e27830da30fc1b2804f4404edaa5 (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/443c7577a6a1961dde7b5a150e9a3ec25d31… commit 443c7577a6a1961dde7b5a150e9a3ec25d317260 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 22:57:55 2013 +0100 tests: filters: Add basic test for MirrorH filter. diff --git a/tests/filters/FilterMirrorH.c b/tests/filters/FilterMirrorH.c new file mode 100644 index 0000000..8aa50ac --- /dev/null +++ b/tests/filters/FilterMirrorH.c @@ -0,0 +1,311 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <errno.h> + +#include <core/GP_Context.h> +#include <filters/GP_Rotate.h> + +#include "tst_test.h" + +#include "common.h" + +struct testcase { + GP_Size w, h; + + GP_PixelType pixel_type; + + uint8_t offset; + + /* result */ + const char *res; + + /* source */ + char src[]; +}; + +static int test_mirror_h(struct testcase *t) +{ + GP_Context src, *c; + int err; + + /* Initialize source context */ + GP_ContextInit(&src, t->w, t->h, t->pixel_type, t->src); + + /* Set offset to emulate non-byte aligned subcontexts */ + src.offset = t->offset; + + /* Test with allocated destination */ + c = GP_ContextAlloc(t->w, t->h, t->pixel_type); + + if (c == NULL) { + tst_err("Failed to allocate context"); + return TST_UNTESTED; + } + + GP_FilterMirrorH(&src, c, NULL); + + err = compare_buffers(t->res, c); + + GP_ContextFree(c); + + /* And with in-place variant */ +// GP_FilterMirrorH(&src, &src, NULL); + +// err |= compare_buffers(t->res, &src); + + if (err) + return TST_FAILED; + + return TST_SUCCESS; +} + +struct testcase testcase_1x1 = { + .w = 1, + .h = 1, + + .pixel_type = GP_PIXEL_G8, + + .res = (const char[]) { + 0xf0, + }, + + .src = { + 0xf0, + } +}; + +struct testcase testcase_2x2 = { + .w = 2, + .h = 2, + + .pixel_type = GP_PIXEL_G8, + + .res = (const char[]) { + 2, 3, + 0, 1, + }, + + .src = { + 0, 1, + 2, 3, + } +}; + +struct testcase testcase_10x2 = { + .w = 10, + .h = 2, + + .pixel_type = GP_PIXEL_G8, + + .res = (const char[]) { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + }, + + .src = { + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + } +}; + +struct testcase testcase_2x3 = { + .w = 2, + .h = 3, + + .pixel_type = GP_PIXEL_G8, + + .res = (const char[]) { + 4, 5, + 2, 3, + 0, 1, + }, + + .src = { + 0, 1, + 2, 3, + 4, 5, + } +}; + + +struct testcase testcase_3x3 = { + .w = 3, + .h = 3, + + .pixel_type = GP_PIXEL_G8, + + .res = (const char[]) { + 6, 7, 8, + 3, 4, 5, + 0, 1, 2, + }, + + .src = { + 0, 1, 2, + 3, 4, 5, + 6, 7, 8, + } +}; + +struct testcase testcase_4x4 = { + .w = 4, + .h = 4, + + .pixel_type = GP_PIXEL_G8, + + .res = (const char[]) { + 12, 13, 14, 15, + 8, 9, 10, 11, + 4, 5, 6, 7, + 0, 1, 2, 3, + }, + + .src = { + 0, 1, 2, 3, + 4, 5, 6, 7, + 8, 9, 10, 11, + 12, 13, 14, 15, + } +}; + +/* Now tests with pixel types that are not byte aligned */ +//TODO: Fix comparsion +struct testcase testcase_G1_16x2 = { + .w = 3, + .h = 2, + + .pixel_type = GP_PIXEL_G1, + + .offset = 4, + + .res = (const char[]) { + 0x0f, 0xaa, 0xf0, + 0xff, 0xff, 0xff, + }, + + .src = { + 0x0f, 0xff, 0xf0, + 0xff, 0xaa, 0xff, + } +}; + +static int abort_callback_fn(GP_ProgressCallback GP_UNUSED(*self)) +{ + return 1; +} + +static GP_ProgressCallback abort_callback = { + .callback = abort_callback_fn, +}; + +static int test_abort(void) +{ + int ret; + GP_Context *c; + + c = GP_ContextAlloc(10, 10, GP_PIXEL_G8); + + if (c == NULL) { + tst_err("Failed to allocate context"); + return TST_UNTESTED; + } + + ret = GP_FilterMirrorH(c, c, &abort_callback); + + if (ret == 0) { + tst_msg("Aborted filter haven't returned non-zero"); + return TST_FAILED; + } + + if (errno != ECANCELED) { + tst_msg("Errno wasn't set to ECANCELED"); + return TST_FAILED; + } + + return TST_SUCCESS; +} + +static int all_pixels(void) +{ + GP_Pixel pixel_type; + + for (pixel_type = 1; pixel_type < GP_PIXEL_MAX; pixel_type++) { + GP_Context *c; + + tst_msg("Trying pixel %s", GP_PixelTypeName(pixel_type)); + + c = GP_ContextAlloc(10, 10, pixel_type); + + if (c == NULL) { + tst_err("Failed to allocate context"); + return TST_UNTESTED; + } + + GP_FilterMirrorH(c, c, NULL); + + GP_ContextFree(c); + } + + return TST_SUCCESS; +} + +const struct tst_suite tst_suite = { + .suite_name = "MirrorH Filter Testsuite", + .tests = { + {.name = "MirrorH 1x1", + .tst_fn = test_mirror_h, + .data = &testcase_1x1}, + + {.name = "MirrorH 2x2", + .tst_fn = test_mirror_h, + .data = &testcase_2x2}, + + {.name = "MirrorH 10x2", + .tst_fn = test_mirror_h, + .data = &testcase_10x2}, + + {.name = "MirrorH 2x3", + .tst_fn = test_mirror_h, + .data = &testcase_2x3}, + + {.name = "MirrorH 3x3", + .tst_fn = test_mirror_h, + .data = &testcase_3x3}, + + {.name = "MirrorH 4x4", + .tst_fn = test_mirror_h, + .data = &testcase_3x3}, + + {.name = "MirrorH G1 16x2", + .tst_fn = test_mirror_h, + .data = &testcase_G1_16x2}, + + {.name = "MirrorH Callback Abort", + .tst_fn = test_abort}, + + {.name = "MirrorH x Pixels", + .tst_fn = all_pixels}, + + {.name = NULL} + } +}; diff --git a/tests/filters/Makefile b/tests/filters/Makefile index aaa6125..b0a590d 100644 --- a/tests/filters/Makefile +++ b/tests/filters/Makefile @@ -3,9 +3,11 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -APPS=LinearConvolution +APPS=FilterMirrorH include ../tests.mk +FilterMirrorH: common.o + include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/tests/filters/common.c b/tests/filters/common.c new file mode 100644 index 0000000..35a6d13 --- /dev/null +++ b/tests/filters/common.c @@ -0,0 +1,87 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <stdio.h> + +#include "common.h" + +static void dump_buffer(const char *pattern, int w, int h) +{ + int x, y; + + for (y = 0; y < h; y++) { + for (x = 0; x < w; x++) + printf("%2x ", (uint8_t)pattern[x + y * w]); + printf("n"); + } +} + +void dump_buffers(const char *pattern, const GP_Context *c) +{ + printf("Expected pattern:n"); + dump_buffer(pattern, c->w, c->h); + printf("Rendered pattern:n"); + dump_buffer((char*)c->pixels, c->w, c->h); + printf("Difference:n"); + + unsigned int x, y; + + for (y = 0; y < c->h; y++) { + for (x = 0; x < c->w; x++) { + unsigned int idx = x + y * c->w; + char p = ((char*)c->pixels)[idx]; + + if (pattern[idx] != p) { + /* TODO: we expect background to be 0 */ + if (p == 0) + printf(" x "); + else + printf(" * "); + } else { + printf("%2x ", (uint8_t)pattern[idx]); + } + + } + + printf("n"); + } +} + +int compare_buffers(const char *pattern, const GP_Context *c) +{ + GP_Size x, y; + int err = 0; + + for (x = 0; x < c->w; x++) { + for (y = 0; y < c->h; y++) { + unsigned int idx = x + y * c->w; + + if (pattern[idx] != ((char*)c->pixels)[idx]) + err++; + } + } + + if (err) + dump_buffers(pattern, c); + + return err; +} diff --git a/tests/filters/common.h b/tests/filters/common.h new file mode 100644 index 0000000..65b9d19 --- /dev/null +++ b/tests/filters/common.h @@ -0,0 +1,32 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#ifndef __COMMON_H__ +#define __COMMON_H__ + +#include <core/GP_Context.h> + +void dump_buffers(const char *pattern, const GP_Context *c); + +int compare_buffers(const char *pattern, const GP_Context *c); + +#endif /* __COMMON_H__ */ diff --git a/tests/filters/runtest.sh b/tests/filters/runtest.sh index 9efe909..c820af1 100755 --- a/tests/filters/runtest.sh +++ b/tests/filters/runtest.sh @@ -9,4 +9,4 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./LinearConvolution "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FilterMirrorH "$@" diff --git a/tests/filters/test_list.txt b/tests/filters/test_list.txt new file mode 100644 index 0000000..2f9a127 --- /dev/null +++ b/tests/filters/test_list.txt @@ -0,0 +1,3 @@ +# Filters test list + +FilterMirrorH ----------------------------------------------------------------------- Summary of changes: tests/filters/FilterMirrorH.c | 311 +++++++++++++++++++++++++++++++++++++++ tests/filters/Makefile | 4 +- tests/{gfx => filters}/common.c | 0 tests/{gfx => filters}/common.h | 0 tests/filters/runtest.sh | 2 +- tests/filters/test_list.txt | 3 + 6 files changed, 318 insertions(+), 2 deletions(-) create mode 100644 tests/filters/FilterMirrorH.c copy tests/{gfx => filters}/common.c (100%) copy tests/{gfx => filters}/common.h (100%) create mode 100644 tests/filters/test_list.txt 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: 8ac4aa41dac9e27830da30fc1b2804f4404edaa5
by metan 03 Mar '13

03 Mar '13

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 8ac4aa41dac9e27830da30fc1b2804f4404edaa5 (commit) via 8bfe15827e2fc8dcdee58cf3d435a78e8b9955b8 (commit) via 5614a72ad692285e00909d83a971eab6e0aa6199 (commit) via fad224dbbcdf6744e57cbf0ca235f226e37f794a (commit) from 402373dac8551c34bf48ceeba4aace19cee0eea9 (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/8ac4aa41dac9e27830da30fc1b2804f4404e… commit 8ac4aa41dac9e27830da30fc1b2804f4404edaa5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 19:06:38 2013 +0100 core: context: Fix GP_PIXEL_ADDR() macro. diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index 0977a27..83d3c10 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -19,7 +19,7 @@ * Copyright (C) 2009-2011 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -78,9 +78,9 @@ typedef struct GP_Context { * Rows and columns are specified in the image's orientation * (i.e. they might not be XY if the image is rotated). */ -#define GP_PIXEL_ADDR(context, x, y) (((context)->pixels - + y * (context)->bytes_per_row - + (x * (context)->bpp) / 8)) +#define GP_PIXEL_ADDR(context, x, y) ((context)->pixels + + (y) * (context)->bytes_per_row + + ((x) * (context)->bpp) / 8) #define GP_CALC_ROW_SIZE(pixel_type, width) ((GP_PixelSize(pixel_type) * width) / 8 + http://repo.or.cz/w/gfxprim.git/commit/8bfe15827e2fc8dcdee58cf3d435a78e8b99… commit 8bfe15827e2fc8dcdee58cf3d435a78e8b9955b8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 17:45:03 2013 +0100 doc: Update debug layer docs. diff --git a/doc/debug.txt b/doc/debug.txt index 3f1cc69..cdc3d4b 100644 --- a/doc/debug.txt +++ b/doc/debug.txt @@ -1,8 +1,23 @@ Debug Messages -------------- -The GFXprim library includes a debug messages infrastructure in order to ease -debugging. +The GFXprim library includes a debug message infrastructure in order to ease +the debugging. + +Many places of the library uses debug messages to report warnings, bugs, or +generally important events (i.e. context has been allocated, filter function +has been called). + +Debug messages are printed into the stderr and could be redirected to custom +handler. + +The verbosity of the messages could be changed by the debug level. The debug +level is an unsigned integer (by default set to '0') and only messages that have +debug level lower or equal to debug level are printed. + +There are few special debug message types with negative debug level (that +means that they are always printed), and as so these are used on various error +conditions, see bellow for more information. [source,c] ------------------------------------------------------------------------------- @@ -15,17 +30,17 @@ void GP_SetDebugLevel(unsigned int level); unsigned int GP_GetDebugLevel(void); ------------------------------------------------------------------------------- -Sets or gets library debug level. The default level is 0 at which only BUG, -WARNING, TODO and messages with debug level 0 are shown. +Sets or gets library debug level. The default level is '0' at which only +'FATAL', 'BUG', 'WARNING', 'TODO' and messages with debug level '0' are shown. Increasing this number would cause the library to be more verbose in debugging messages. -Setting debug level to 1 would expose debug messages when object was created +Setting debug level to '1' would expose debug messages when object was created or destroyed or when particular algorithm has been started. -Setting debug level to value higher than 1 would expose even more verbose -messages the current maximum used by debug messages is 4. +Setting debug level to value higher than '1' would expose even more verbose +messages the current maximum used by debug messages is '4'. The debug level may also be set by setting the 'GP_DEBUG' environment variable. In such case the debug level is set accordingly to its value when @@ -45,10 +60,47 @@ GP_WARN(...) GP_BUG(...) +GP_FATAL(...) + void GP_DebugPrint(int level, const char *file, const char *function, int line, const char *fmt, ...); ------------------------------------------------------------------------------- -Printf-like macros used to create debug messages. All of them calls the -'GP_DebugPrint()' function with correct parameters. +Printf-like macros used to print debug messages. All of them calls the +'GP_DebugPrint()' function with slightly parameters. + +[source,c] +------------------------------------------------------------------------------- +enum GP_DebugType { + GP_DEBUG_TODO = -1, + GP_DEBUG_WARN = -2, + GP_DEBUG_BUG = -3, + GP_DEBUG_FATAL = -4, +}; + +/* + * Custom debug message handler structure. + */ +struct GP_DebugMsg { + int level; + const char *file; + const char *fn; + unsigned int line; + const char *msg; +}; + +/* + * Sets custom debug message handler. + * + * If NULL is passed, custom handler is disabled and debug messages are printed + * into the stderr. + */ +void GP_SetDebugHandler(void (*handler)(const struct GP_DebugMsg *msg)); + +------------------------------------------------------------------------------- + +By default debug messages are printed into the 'stderr' you can redirect them +to your debug handler by this function. +NOTE: For more information see debug message handler + link:example_debug_handler.html[example]. diff --git a/doc/example_debug_handler.txt b/doc/example_debug_handler.txt new file mode 100644 index 0000000..a859f68 --- /dev/null +++ b/doc/example_debug_handler.txt @@ -0,0 +1,7 @@ +Debug Message Handler Example +----------------------------- + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/debug_handler.c[] +------------------------------------------------------------------ http://repo.or.cz/w/gfxprim.git/commit/5614a72ad692285e00909d83a971eab6e0aa… commit 5614a72ad692285e00909d83a971eab6e0aa6199 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 17:26:59 2013 +0100 libs: backends: GP_X11: Small cleanup. diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index e3ee8eb..59b28ae 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -97,14 +97,7 @@ static void x11_flip(GP_Backend *self) XLockDisplay(win->dpy); -#ifdef HAVE_X_SHM - if (win->shm_flag) - XShmPutImage(win->dpy, win->win, DefaultGC(win->dpy, win->scr), - win->img, 0, 0, 0, 0, w, h, False); - else -#endif /* HAVE_X_SHM */ - XPutImage(win->dpy, win->win, DefaultGC(win->dpy, win->scr), - win->img, 0, 0, 0, 0, w, h); + putimage(win, 0, 0, w - 1, h - 1); XFlush(win->dpy); @@ -113,9 +106,9 @@ static void x11_flip(GP_Backend *self) static void x11_ev(XEvent *ev) { - /* Lookup for window */ static struct x11_win *win = NULL; + /* Lookup for window */ if (win == NULL || win->win != ev->xany.window) { win = win_list_lookup(ev->xany.window); @@ -566,12 +559,12 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, goto err1; } - /* Init the event queue, once we know the window size */ - GP_EventQueueInit(&backend->event_queue, wreq.w, wreq.h, 0); - if (flags & GP_X11_FULLSCREEN) x11_win_fullscreen(win, 1); + /* Init the event queue, once we know the window size */ + GP_EventQueueInit(&backend->event_queue, wreq.w, wreq.h, 0); + backend->context = NULL; if ((flags & GP_X11_DISABLE_SHM) || create_shm_ximage(backend, w, h)) http://repo.or.cz/w/gfxprim.git/commit/fad224dbbcdf6744e57cbf0ca235f226e37f… commit fad224dbbcdf6744e57cbf0ca235f226e37f794a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 3 17:16:59 2013 +0100 libs: core: debug: API for custom message handler. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index bca6fa2..3e741cc 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -18,7 +18,8 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch virtual_backend_example meta_data meta_data_dump tmp_file showimage v4l2_show v4l2_grab convolution weighted_median shapetest koch input_example fileview linetest randomshapetest fonttest- loaders_register blittest textaligntest abort sin_AA x11_windows + loaders_register blittest textaligntest abort sin_AA x11_windows+ debug_handler ifeq ($(HAVE_LIBSDL),yes) APPS+=SDL_glue diff --git a/libs/core/GP_Debug.c b/demos/c_simple/debug_handler.c similarity index 55% copy from libs/core/GP_Debug.c copy to demos/c_simple/debug_handler.c index 75a54f3..9623645 100644 --- a/libs/core/GP_Debug.c +++ b/demos/c_simple/debug_handler.c @@ -16,76 +16,59 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#include <stdarg.h> +/* + + Example on custom debug message handler. -#include "GP_Debug.h" + */ -static unsigned int debug_level = GP_DEFAULT_DEBUG_LEVEL; -static int env_used = 0; +#include <GP.h> -void GP_SetDebugLevel(unsigned int level) +static char level_to_c(int level) { - debug_level = level; + switch (level) { + case GP_DEBUG_TODO: + return 'T'; + case GP_DEBUG_WARN: + return 'W'; + case GP_DEBUG_BUG: + return 'B'; + case GP_DEBUG_FATAL: + return 'F'; + case 0 ... 9: + return '0' + level; + default: + return 'U'; + } } -unsigned int GP_GetDebugLevel(void) +void debug_handler(const struct GP_DebugMsg *msg) { - return debug_level; + printf("%c: %s->%s():%u: %sn", level_to_c(msg->level), msg->file, + msg->fn, msg->line, msg->msg); } -void GP_DebugPrint(int level, const char *file, const char *function, int line, - const char *fmt, ...) +int main(void) { - int i; + /* Set custom debug handler */ + GP_SetDebugHandler(debug_handler); - if (!env_used) { - char *level = getenv("GP_DEBUG"); - - env_used = 1; - - if (level != NULL) { - int new_level = atoi(level); - - if (new_level >= 0) { - debug_level = new_level; + /* Print some debug messages */ + GP_WARN("This is a warning"); + GP_FATAL("This is a fatal condition"); - GP_DEBUG(1, "Using debug level GP_DEBUG=%i " - "from enviroment variable", - debug_level); - } - } - } - - if (level > (int)debug_level) - return; + /* Turn on verbose debug and call some library functions */ + GP_SetDebugLevel(10); - for (i = 1; i < level; i++) - fputc(' ', stderr); + GP_Context *ctx = GP_ContextAlloc(1000, 1000, 1); - switch (level) { - case -3: - fprintf(stderr, "*** BUG: %s:%s():%u: ", file, function, line); - break; - case -2: - fprintf(stderr, "*** WARNING: %s:%s():%u: ", file, function, line); - break; - case -1: - fprintf(stderr, "*** TODO: %s:%s():%u: ", file, function, line); - break; - default: - fprintf(stderr, "%u: %s:%s():%u: ", - level, file, function, line); - break; - } + GP_FilterGaussianBlur(ctx, ctx, 10, 10, NULL); + + GP_ContextFree(ctx); - va_list va; - va_start(va, fmt); - vfprintf(stderr, fmt, va); - va_end(va); - - fputc('n', stderr); + return 0; } diff --git a/include/core/GP_Debug.h b/include/core/GP_Debug.h index a09ba69..4008bcd 100644 --- a/include/core/GP_Debug.h +++ b/include/core/GP_Debug.h @@ -16,37 +16,63 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ /* - - Debug messages and debug level. Debug level is an unsigned integer. - Messages with debug level 0 are always printed (you should generally avoid - using them unless you wan't user to see the message.) + Debug message layer. - Debug level 1 should be used on object initalization and generally rare and - important events. + Many places of the library uses debug messages to report warnings, bugs, or + generally important events (i.e. context has been allocated, filter function + has been called). - Debug level > 1 is intended for more verbose reporting, like inner cycles - or loop debugging. + Debug messages are printed into the stderr and could be redirected to custom + handler. - Debug levels with negative level are special. Debug level -1 means TODO, - level -2 says WARNING while -2 means BUG (i.e. library get into unconsistent - state). + The verbosity of the messages could be changed by the debug level. The debug + level is an unsigned integer (by default set to '0') and only messages that have + debug level lower or equal to debug level are printed. + + There are few special debug message types with negative debug level (that + means that they are always printed), and as so these are used on various error + conditions, see bellow for more information. */ -#ifndef GP_DEBUG_H -#define GP_DEBUG_H +#ifndef CORE_GP_DEBUG_H +#define CORE_GP_DEBUG_H #include <stdio.h> #include <stdint.h> #include <stdlib.h> #include <unistd.h> +/* + * Messages with debug level 0 are always printed (you should generally avoid + * using them unless you wan't user to see the message.) + * + * Debug level 1 should be used on object initalization and generally rare and + * important events. + * + * Debug level > 1 is intended for more verbose reporting, like inner cycles + * or loop debugging. + * + * Debug levels with negative level are special. + * + * -1 TODO - not implemented feature + * -2 WARNING - generally error that can be recovered + * -3 BUG - library gets into unconsistent state + * -4 FATAL - fatal condition, not compiled with XYZ support etc. + */ +enum GP_DebugType { + GP_DEBUG_TODO = -1, + GP_DEBUG_WARN = -2, + GP_DEBUG_BUG = -3, + GP_DEBUG_FATAL = -4, +}; + #define GP_DEFAULT_DEBUG_LEVEL 0 #define GP_DEBUG(level, ...) @@ -61,11 +87,40 @@ #define GP_BUG(...) GP_DebugPrint(-3, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) +#define GP_FATAL(...) + GP_DebugPrint(-4, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) + +void GP_DebugPrint(int level, const char *file, const char *function, int line, + const char *fmt, ...) __attribute__ ((format (printf, 5, 6))); + +/* + * Sets debug level. + */ void GP_SetDebugLevel(unsigned int level); +/* + * Returns current debug level. + */ unsigned int GP_GetDebugLevel(void); -void GP_DebugPrint(int level, const char *file, const char *function, int line, - const char *fmt, ...) __attribute__ ((format (printf, 5, 6))); -#endif /* GP_DEBUG_H */ +/* + * Custom debug message handler structure. + */ +struct GP_DebugMsg { + int level; + const char *file; + const char *fn; + unsigned int line; + const char *msg; +}; + +/* + * Sets custom debug message handler. + * + * If NULL is passed, custom handler is disabled and debug messages are printed + * into the stderr. + */ +void GP_SetDebugHandler(void (*handler)(const struct GP_DebugMsg *msg)); + +#endif /* CORE_GP_DEBUG_H */ diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index 6cb08a5..ff65884 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -47,6 +47,9 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) uint32_t bpr = get_bpr(bpp, w); void *pixels; + GP_DEBUG(1, "Allocating context %u x %u - %s", + w, h, GP_PixelTypeName(type)); + pixels = malloc(bpr * h); context = malloc(sizeof(GP_Context)); @@ -58,10 +61,10 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) return NULL; } - context->pixels = pixels; - context->bpp = bpp; - context->bytes_per_row = bpr; - context->offset = 0; + context->pixels = pixels; + context->bpp = bpp; + context->bytes_per_row = bpr; + context->offset = 0; context->w = w; context->h = h; diff --git a/libs/core/GP_Debug.c b/libs/core/GP_Debug.c index 75a54f3..db1ed26 100644 --- a/libs/core/GP_Debug.c +++ b/libs/core/GP_Debug.c @@ -16,17 +16,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ #include <stdarg.h> -#include "GP_Debug.h" +#include "core/GP_Debug.h" static unsigned int debug_level = GP_DEFAULT_DEBUG_LEVEL; + static int env_used = 0; +static void (*debug_handler)(const struct GP_DebugMsg *msg) = NULL; + void GP_SetDebugLevel(unsigned int level) { debug_level = level; @@ -37,6 +40,11 @@ unsigned int GP_GetDebugLevel(void) return debug_level; } +void GP_SetDebugHandler(void (*handler)(const struct GP_DebugMsg *msg)) +{ + debug_handler = handler; +} + void GP_DebugPrint(int level, const char *file, const char *function, int line, const char *fmt, ...) { @@ -63,17 +71,42 @@ void GP_DebugPrint(int level, const char *file, const char *function, int line, if (level > (int)debug_level) return; + /* If handler is set, fill struct msg and call it */ + if (debug_handler) { + char buf[256]; + + va_list va; + va_start(va, fmt); + vsnprintf(buf, sizeof(buf), fmt, va); + va_end(va); + + struct GP_DebugMsg msg = { + .level = level, + .file = file, + .fn = function, + .line = line, + .msg = buf, + }; + + debug_handler(&msg); + + return; + } + for (i = 1; i < level; i++) fputc(' ', stderr); switch (level) { - case -3: + case GP_DEBUG_FATAL: + fprintf(stderr, "*** FATAL: %s:%s():%u: ", file, function, line); + break; + case GP_DEBUG_BUG: fprintf(stderr, "*** BUG: %s:%s():%u: ", file, function, line); break; - case -2: + case GP_DEBUG_WARN: fprintf(stderr, "*** WARNING: %s:%s():%u: ", file, function, line); break; - case -1: + case GP_DEBUG_TODO: fprintf(stderr, "*** TODO: %s:%s():%u: ", file, function, line); break; default: ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 3 +- .../c_simple/debug_handler.c | 66 ++++++++------ doc/debug.txt | 70 +++++++++++++-- ...ress_callback.txt => example_debug_handler.txt} | 6 +- include/core/GP_Context.h | 8 +- include/core/GP_Debug.h | 89 ++++++++++++++++---- libs/backends/GP_X11.c | 17 +--- libs/core/GP_Context.c | 11 ++- libs/core/GP_Debug.c | 43 ++++++++- 9 files changed, 230 insertions(+), 83 deletions(-) copy tests/drivers/linux_input.c => demos/c_simple/debug_handler.c (66%) copy doc/{example_loaders_progress_callback.txt => example_debug_handler.txt} (58%) 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: 402373dac8551c34bf48ceeba4aace19cee0eea9
by metan 01 Mar '13

01 Mar '13

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 402373dac8551c34bf48ceeba4aace19cee0eea9 (commit) via 9c639e42fa7d4c0254d00294bd7100ef24ca42a8 (commit) from 21e1fa797b0f25794c323793ebcff1c1762c755a (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/402373dac8551c34bf48ceeba4aace19cee0… commit 402373dac8551c34bf48ceeba4aace19cee0eea9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 1 23:36:26 2013 +0100 examples: add X11 multiple windows example. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 782eee2..bca6fa2 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -18,7 +18,7 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch virtual_backend_example meta_data meta_data_dump tmp_file showimage v4l2_show v4l2_grab convolution weighted_median shapetest koch input_example fileview linetest randomshapetest fonttest- loaders_register blittest textaligntest abort sin_AA + loaders_register blittest textaligntest abort sin_AA x11_windows ifeq ($(HAVE_LIBSDL),yes) APPS+=SDL_glue diff --git a/demos/c_simple/x11_windows.c b/demos/c_simple/x11_windows.c new file mode 100644 index 0000000..2c77075 --- /dev/null +++ b/demos/c_simple/x11_windows.c @@ -0,0 +1,123 @@ +/***************************************************************************** + * 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-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + Simple backend example. + + */ + +#include <GP.h> + +static void redraw(struct GP_Context *context) +{ + GP_Pixel white_pixel, black_pixel; + + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); + + GP_Fill(context, black_pixel); + GP_Line(context, 0, 0, context->w - 1, context->h - 1, white_pixel); + GP_Line(context, 0, context->h - 1, context->w - 1, 0, white_pixel); +} + +static int ev_loop(struct GP_Backend *backend, const char *name) +{ + GP_Event ev; + + if (backend == NULL) + return 0; + + while (GP_BackendGetEvent(backend, &ev)) { + + printf("-------------------------- %sn", name); + + GP_EventDump(&ev); + + switch (ev.type) { + case GP_EV_KEY: + switch (ev.val.val) { + case GP_KEY_ESC: + case GP_KEY_Q: + GP_BackendExit(backend); + return 1; + break; + } + break; + case GP_EV_SYS: + switch (ev.code) { + case GP_EV_SYS_RESIZE: + GP_BackendResizeAck(backend); + break; + case GP_EV_SYS_QUIT: + GP_BackendExit(backend); + return 1; + break; + } + break; + } + + printf("-----------------------------n"); + } + + return 0; +} + +int main(void) +{ + GP_Backend *win_1, *win_2; + + win_1 = GP_BackendX11Init(NULL, 0, 0, 300, 300, "win 1", 0); + win_2 = GP_BackendX11Init(NULL, 0, 0, 300, 300, "win 2", 0); + + /* Update the backend screen */ + redraw(win_1->context); + redraw(win_2->context); + + GP_BackendFlip(win_1); + GP_BackendFlip(win_2); + + for (;;) { + /* + * Wait for backend event. + * + * Either window is fine as they share connection. + */ + GP_Backend *b = win_1 ? win_1 : win_2; + + if (b == NULL) + return 0; + + GP_BackendWait(b); + + if (ev_loop(win_1, "win 1")) + win_1 = NULL; + + if (ev_loop(win_2, "win 2")) + win_2 = NULL; + } + + GP_BackendExit(win_1); + GP_BackendExit(win_2); + + return 0; +} http://repo.or.cz/w/gfxprim.git/commit/9c639e42fa7d4c0254d00294bd7100ef24ca… commit 9c639e42fa7d4c0254d00294bd7100ef24ca42a8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 1 23:35:26 2013 +0100 backends: X11: Fix double close on exit. This fixes segfault for multiple window X11 backend. diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index 3a6e2ba..e3ee8eb 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -525,8 +525,6 @@ static void x11_exit(GP_Backend *self) { window_close(self); - x11_close(); - free(self); } diff --git a/libs/backends/GP_X11_Win.h b/libs/backends/GP_X11_Win.h index 759ec73..11786a8 100644 --- a/libs/backends/GP_X11_Win.h +++ b/libs/backends/GP_X11_Win.h @@ -394,7 +394,8 @@ void x11_win_close(struct x11_win *win) else destroy_ximage(self); */ - + XUnmapWindow(win->dpy, win->win); + XDestroyWindow(win->dpy, win->win); XUnlockDisplay(win->dpy); ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- .../c_simple/{backend_example.c => x11_windows.c} | 129 +++++++++++--------- libs/backends/GP_X11.c | 2 - libs/backends/GP_X11_Win.h | 3 +- 4 files changed, 74 insertions(+), 62 deletions(-) copy demos/c_simple/{backend_example.c => x11_windows.c} (63%) 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