- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: b45098c71ca5dab7345e2b2f704ae6452a7b52cb
by metan 05 Jun '12

05 Jun '12

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 b45098c71ca5dab7345e2b2f704ae6452a7b52cb (commit) from 40459eab2c4a3af4a5eccd1b3cbe1bd94353f9c7 (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/b45098c71ca5dab7345e2b2f704ae6452a7b… commit b45098c71ca5dab7345e2b2f704ae6452a7b52cb Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jun 5 15:18:09 2012 +0200 filters: Add noise filter. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index abdf546..1bc7360 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -16,7 +16,7 @@ * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -354,6 +354,28 @@ static GP_RetCode contrast(GP_Context **c, const char *params) return GP_ESUCCESS; } +/* noise */ +static struct param noise_params[] = { + {"ratio", PARAM_FLOAT, "noise", NULL, NULL}, + {NULL, 0, NULL, NULL, NULL} +}; + +static GP_RetCode noise(GP_Context **c, const char *params) +{ + float rat; + + if (param_parse(params, noise_params, "noise", param_err, &rat)) + return GP_EINVAL; + + GP_FILTER_PARAMS((*c)->pixel_type, filter_params); + + GP_FilterParamSetFloatAll(filter_params, rat); + + GP_FilterNoise(*c, *c, filter_params, progress_callback); + + return GP_ESUCCESS; +} + /* invert */ static struct param invert_params[] = { @@ -675,6 +697,7 @@ static struct filter filter_table[] = { {"contrast", "alter image contrast", contrast_params, contrast}, {"invert", "inverts image", invert_params, invert}, {"add_noise", "adds noise", add_noise_params, add_noise}, + {"noise", "adds noise", noise_params, noise}, {"blur", "gaussian blur", blur_params, blur}, {"dither", "dithers bitmap", dither_params, dither}, {"arithmetic", "arithmetic operation", arithmetic_params, arithmetic}, diff --git a/include/filters/GP_Point.h b/include/filters/GP_Point.h index 1ab3756..31e9747 100644 --- a/include/filters/GP_Point.h +++ b/include/filters/GP_Point.h @@ -72,6 +72,12 @@ GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); /* + * Noise filter. + */ +GP_Context *GP_FilterNoise(const GP_Context *src, GP_Context *dst, + GP_FilterParam ratio[], GP_ProgressCallback *callback); + +/* * Generic slow point filter. * * The filter_callback[] is expected to be filled with pointers diff --git a/libs/filters/GP_Noise.gen.c.t b/libs/filters/GP_Noise.gen.c.t new file mode 100644 index 0000000..7afca65 --- /dev/null +++ b/libs/filters/GP_Noise.gen.c.t @@ -0,0 +1,34 @@ +%% extends "filter.point.c.t" + +{% block descr %}Noise filter -- Adds noise to an image.{% endblock %} + +%% block body + +{{ filter_point_include() }} + +%% macro filter_op(chann_name, chann_size) +{{ chann_name }} = {{ chann_name }} + (random() % ({{ chann_name }}_max * 2)) - {{ chann_name }}_max; +{{ filter_clamp_val(chann_name, chann_size) }} +%% endmacro + +/* + * Generated noise filters. + */ +%% call(pt) filter_point_per_channel('Noise', 'GP_FilterParam ratio[]', filter_op) +{{ filter_params(pt, 'ratio', 'float ', '_rat', 'f') }} +%% for chann in pt.chanslist + int {{ chann[0] }}_max = {{ chann[0] }}_rat * {{ 2 ** chann[2] - 1}} + 0.5; +%% endfor +%% endcall + +/* + * Generated noise filters for pixels with one channel. + */ +%% call(ps) filter_point_per_bpp('Noise', 'GP_FilterParam ratio[]', filter_op) +{{ filter_param(ps, 'ratio', 'float ', '_rat', 'f') }} + int pix_max = pix_rat * {{ 2 ** ps.size - 1}} + 0.5; +%% endcall + +{{ filter_functions('Noise', 'GP_FilterParam ratio[]', 'ratio') }} + +%% endblock body diff --git a/libs/filters/Makefile b/libs/filters/Makefile index 4bed64a..49993aa 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -3,7 +3,7 @@ TOPDIR=../.. STATS_FILTERS=GP_Histogram.gen.c POINT_FILTERS=GP_Contrast.gen.c GP_Brightness.gen.c GP_Invert.gen.c- GP_Point.gen.c + GP_Point.gen.c GP_Noise.gen.c ARITHMETIC_FILTERS=GP_Difference.gen.c GP_Addition.gen.c GP_Min.gen.c GP_Max.gen.c GP_Multiply.gen.c ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 25 ++++++++++++++++++++++++- include/filters/GP_Point.h | 6 ++++++ libs/filters/GP_Noise.gen.c.t | 34 ++++++++++++++++++++++++++++++++++ libs/filters/Makefile | 2 +- 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 libs/filters/GP_Noise.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: 40459eab2c4a3af4a5eccd1b3cbe1bd94353f9c7
by metan 04 Jun '12

04 Jun '12

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 discards 9c0d7122590ec63c4a9cb6e5b019f373e84a6106 (commit) via 40459eab2c4a3af4a5eccd1b3cbe1bd94353f9c7 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (9c0d7122590ec63c4a9cb6e5b019f373e84a6106) N -- N -- N (40459eab2c4a3af4a5eccd1b3cbe1bd94353f9c7) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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/40459eab2c4a3af4a5eccd1b3cbe1bd94353… commit 40459eab2c4a3af4a5eccd1b3cbe1bd94353f9c7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jun 4 16:22:41 2012 +0200 pywrap: Fix error reporting. The python headers define _GNU_SOURCE so the strerror_r variant is GNU one, which may use the passed buffer to, but that is not guaranted it also may return pointer to some statically allocated buffer. Also make sure _GNU_SOURCE is defined in pywrap.mk. diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 66b37b0..bc99ff3 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -23,11 +23,9 @@ %exception funcname { $action if (result == NULL) { - int errno0 = errno; - const int errbuf_len = 128; - char errbuf[errbuf_len]; - strerror_r(errno0, errbuf, errbuf_len); - PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errbuf); + char errbuf[128]; + char *errmsg = strerror_r(errno, errbuf, sizeof(errbuf)); + PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errmsg); return NULL; } } @@ -42,11 +40,9 @@ %exception funcname { $action if (result != 0) { - int errno0 = errno; - const int errbuf_len = 128; - char errbuf[errbuf_len]; - strerror_r(errno0, errbuf, errbuf_len); - PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errbuf); + char errbuf[128]; + char *errmsg = strerror_r(errno, errbuf, sizeof(errbuf)); + PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errmsg); return NULL; } } diff --git a/pywrap.mk b/pywrap.mk index 0ec5602..03d22cf 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -23,10 +23,10 @@ endif # VERBOSE $(SWIG_LIB): $(SWIG_C) ifdef VERBOSE - $(CC) $< $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ + $(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ else # VERBOSE @echo "LD $@" - @$(CC) $< $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ + @$(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ endif # VERBOSE endif # ifneq ($(SWIG),) ----------------------------------------------------------------------- Summary of changes: 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: 9c0d7122590ec63c4a9cb6e5b019f373e84a6106
by metan 04 Jun '12

04 Jun '12

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 9c0d7122590ec63c4a9cb6e5b019f373e84a6106 (commit) via 1d12df083de4555dbd7aaba94980ca96c71988b8 (commit) from 0243aecd593c5c712078dfa1fbcf8bba1187a736 (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/9c0d7122590ec63c4a9cb6e5b019f373e84a… commit 9c0d7122590ec63c4a9cb6e5b019f373e84a6106 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jun 4 16:22:41 2012 +0200 pywrap: Fix error reporting. The python headers define _GNU_SOURCE so the strerror_r variant is GNU one, which uses the passed buffer to create it's data structure and returns pointer to the message. Also make sure _GNU_SOURCE is defined in pywrap.mk. diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 66b37b0..bc99ff3 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -23,11 +23,9 @@ %exception funcname { $action if (result == NULL) { - int errno0 = errno; - const int errbuf_len = 128; - char errbuf[errbuf_len]; - strerror_r(errno0, errbuf, errbuf_len); - PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errbuf); + char errbuf[128]; + char *errmsg = strerror_r(errno, errbuf, sizeof(errbuf)); + PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errmsg); return NULL; } } @@ -42,11 +40,9 @@ %exception funcname { $action if (result != 0) { - int errno0 = errno; - const int errbuf_len = 128; - char errbuf[errbuf_len]; - strerror_r(errno0, errbuf, errbuf_len); - PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errbuf); + char errbuf[128]; + char *errmsg = strerror_r(errno, errbuf, sizeof(errbuf)); + PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errmsg); return NULL; } } diff --git a/pywrap.mk b/pywrap.mk index 0ec5602..03d22cf 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -23,10 +23,10 @@ endif # VERBOSE $(SWIG_LIB): $(SWIG_C) ifdef VERBOSE - $(CC) $< $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ + $(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ else # VERBOSE @echo "LD $@" - @$(CC) $< $(CFLAGS) $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ + @$(CC) $< $(CFLAGS) -D_GNU_SOURCE=1 $(LDFLAGS) -I$(PYTHON_INCLUDE) --shared -lGP $(LDLIBS) -L$(TOPDIR)/build/ -o $@ endif # VERBOSE endif # ifneq ($(SWIG),) http://repo.or.cz/w/gfxprim.git/commit/1d12df083de4555dbd7aaba94980ca96c719… commit 1d12df083de4555dbd7aaba94980ca96c71988b8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jun 4 16:05:49 2012 +0200 pywrap: Add make dependency for common.i. diff --git a/pylib/gfxprim/core/Makefile b/pylib/gfxprim/core/Makefile index 0ee5e15..3be0466 100644 --- a/pylib/gfxprim/core/Makefile +++ b/pylib/gfxprim/core/Makefile @@ -3,6 +3,9 @@ LIBNAME=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk + +$(SWIG_C): ../common.i + include $(TOPDIR)/post.mk include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/loaders/Makefile b/pylib/gfxprim/loaders/Makefile index 791fc74..dd23e98 100644 --- a/pylib/gfxprim/loaders/Makefile +++ b/pylib/gfxprim/loaders/Makefile @@ -4,6 +4,9 @@ INCLUDE=core include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk + +$(SWIG_C): ../common.i + include $(TOPDIR)/post.mk include ../silence_swig_warnings.mk ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/common.i | 16 ++++++---------- pylib/gfxprim/core/Makefile | 3 +++ pylib/gfxprim/loaders/Makefile | 3 +++ pywrap.mk | 4 ++-- 4 files changed, 14 insertions(+), 12 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: 0243aecd593c5c712078dfa1fbcf8bba1187a736
by gavento 04 Jun '12

04 Jun '12

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 0243aecd593c5c712078dfa1fbcf8bba1187a736 (commit) via 6d342080a27ffc532abb09f4d34485a2b44b46bd (commit) via 975521142bd84de4a192d418325cb1b47a642a60 (commit) via 524cd8c33aab67f7c64ea54ee8ab194dbee1df53 (commit) from 9270ef0f3556aa8a1bd8f4e7191d0813ec5708dc (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/0243aecd593c5c712078dfa1fbcf8bba1187… commit 0243aecd593c5c712078dfa1fbcf8bba1187a736 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 4 14:01:16 2012 +0200 pywrap: error checking for some modules Done for: core (except for GP_ContextDump - legacy) backends gfx (none needed) loaders (except for GP_P?M.h - legacy) Not done: filters input text diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index 1c909e1..fb3fb7d 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -27,20 +27,31 @@ %immutable GP_Backend::name; %ignore GP_BackendFD; +ERROR_ON_NONZERO(GP_BackendSetCaption); +ERROR_ON_NONZERO(GP_BackendResize); + %include "GP_Backend.h" -/* - * Particular backends. We need to list every header separately. - */ -/* Overall backend init header */ +ERROR_ON_NULL(GP_BackendInit); %newobject GP_BackendInit; %include "GP_BackendInit.h" +/* + * Particular backends. + */ + +ERROR_ON_NULL(GP_BackendVirtualInit); +%newobject GP_BackendVirtualInit; +%include "GP_BackendVirtual.h" + +ERROR_ON_NULL(GP_BackendLinuxFBInit); %newobject GP_BackendLinuxFBInit; %include "GP_LinuxFB.h" +ERROR_ON_NULL(GP_BackendLinuxSDLInit); %newobject GP_BackendSDLInit; %include "GP_SDL.h" +ERROR_ON_NULL(GP_BackendLinuxX11Init); %newobject GP_BackendX11Init; %include "GP_X11.h" diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 3e1bea5..86b0233 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -9,6 +9,8 @@ * Basic types and common methods */ +ERROR_ON_NULL(GP_GetCounter); + %include "GP_Common.h" %include "GP_Core.h" %include "GP_Debug.h" @@ -25,6 +27,8 @@ * Color and pixel types */ +ERROR_ON_NULL(GP_ColorToColorName); + %include "GP_Color.h" %include "GP_Pixel.h" %include "GP_Pixel.gen.h" /* Includes enum GP_PixelType definition */ @@ -83,6 +87,13 @@ and self.thisown.") GP_Context; } }; +/* Error handling */ +ERROR_ON_NONZERO(GP_ContextResize); +ERROR_ON_NULL(GP_ContextAlloc); +ERROR_ON_NULL(GP_ContextCopy); +ERROR_ON_NULL(GP_ContextSubContext); +ERROR_ON_NULL(GP_ContextConvert); + /* Indicate new wrapper-owned GP_Context */ %newobject GP_ContextAlloc; %newobject GP_ContextCopy; diff --git a/pylib/gfxprim/loaders/loaders.i b/pylib/gfxprim/loaders/loaders.i index bcfcaef..2e54d41 100644 --- a/pylib/gfxprim/loaders/loaders.i +++ b/pylib/gfxprim/loaders/loaders.i @@ -8,11 +8,45 @@ %import ../core/core.i +ERROR_ON_NULL(GP_LoadImage); +ERROR_ON_NONZERO(GP_LoadMetaData); +ERROR_ON_NONZERO(GP_SaveImage); + %include "GP_Loaders.h" +ERROR_ON_NONZERO(GP_OpenJPG); +ERROR_ON_NULL(GP_ReadJPG); +ERROR_ON_NULL(GP_LoadJPG); +ERROR_ON_NONZERO(GP_ReadJPGMetaData); +ERROR_ON_NONZERO(GP_LoadJPGMetaData); +ERROR_ON_NONZERO(GP_SaveJPG); + %include "GP_JPG.h" + +ERROR_ON_NONZERO(GP_OpenBMP); +ERROR_ON_NULL(GP_ReadBMP); +ERROR_ON_NULL(GP_LoadBMP); + +%include "GP_BMP.h" + +ERROR_ON_NONZERO(GP_OpenGIF); +ERROR_ON_NULL(GP_ReadGIF); +ERROR_ON_NULL(GP_LoadGIF); + +%include "GP_GIF.h" + +ERROR_ON_NONZERO(GP_OpenPNG); +ERROR_ON_NULL(GP_ReadPNG); +ERROR_ON_NULL(GP_LoadPNG); +ERROR_ON_NONZERO(GP_ReadPNGMetaData); +ERROR_ON_NONZERO(GP_LoadPNGMetaData); +ERROR_ON_NONZERO(GP_SavePNG); + +%include "GP_PNG.h" + +/* TODO: No error checking - legacy GP_RetCode form */ %include "GP_PBM.h" %include "GP_PGM.h" %include "GP_PPM.h" -%include "GP_PNG.h" + http://repo.or.cz/w/gfxprim.git/commit/6d342080a27ffc532abb09f4d34485a2b44b… commit 6d342080a27ffc532abb09f4d34485a2b44b46bd Merge: 9755211 9270ef0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 4 13:53:02 2012 +0200 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/975521142bd84de4a192d418325cb1b47a64… commit 975521142bd84de4a192d418325cb1b47a642a60 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 4 13:28:46 2012 +0200 pywrap: add error-checking wrappers diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 0734e1a..66b37b0 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -10,3 +10,44 @@ %nodefaultctor; +/* + * Error handling declarations + */ + +/* + * Wrapped function is executed and the return value is checked. + * If NULL, errno is checked and an exception raised. + */ + +%define ERROR_ON_NULL(funcname) +%exception funcname { + $action + if (result == NULL) { + int errno0 = errno; + const int errbuf_len = 128; + char errbuf[errbuf_len]; + strerror_r(errno0, errbuf, errbuf_len); + PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errbuf); + return NULL; + } +} +%enddef + +/* + * Wrapped function is executed and the return value is checked. + * If non-zero, errno is checked and an exception raised + */ + +%define ERROR_ON_NONZERO(funcname) +%exception funcname { + $action + if (result != 0) { + int errno0 = errno; + const int errbuf_len = 128; + char errbuf[errbuf_len]; + strerror_r(errno0, errbuf, errbuf_len); + PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errbuf); + return NULL; + } +} +%enddef http://repo.or.cz/w/gfxprim.git/commit/524cd8c33aab67f7c64ea54ee8ab194dbee1… commit 524cd8c33aab67f7c64ea54ee8ab194dbee1df53 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Jun 4 13:28:02 2012 +0200 Relocate some common SWIG code diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index dd1394d..1c909e1 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -1,3 +1,4 @@ +%include "../common.i" %module(package="gfxprim.backends") backends_c %{ @@ -6,11 +7,6 @@ #include "core/GP_Debug.h" %} -#define __attribute__(X) -%include <stdint.i> - -%feature("autodoc"); - %import ../core/core.i diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i new file mode 100644 index 0000000..0734e1a --- /dev/null +++ b/pylib/gfxprim/common.i @@ -0,0 +1,12 @@ +/* + * common SWIG declarations for all modules + */ + +#define __attribute__(X) + +%include <stdint.i> + +%feature("autodoc"); + +%nodefaultctor; + diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 3668c2f..3e1bea5 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -1,17 +1,10 @@ +%include "../common.i" %module(package="gfxprim.core") core_c %{ #include "core/GP_Core.h" %} -#define __attribute__(X) - -%include <stdint.i> - -%feature("autodoc"); - -%nodefaultctor; - /* * Basic types and common methods */ @@ -42,7 +35,6 @@ %import "GP_FnPerBpp.h" %import "GP_FnPerBpp.gen.h" - /* * GP_Context wrapping */ @@ -99,7 +91,6 @@ and self.thisown.") GP_Context; %include "GP_Context.h" - /* * Context manipulation */ @@ -108,3 +99,4 @@ and self.thisown.") GP_Context; %import "GP_GetPutPixel.gen.h" %include "GP_WritePixel.h" %include "GP_Blit.h" + diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i index b617508..9d3e070 100644 --- a/pylib/gfxprim/filters/filters.i +++ b/pylib/gfxprim/filters/filters.i @@ -1,17 +1,12 @@ +%include "../common.i" %module(package="gfxprim.filters") filters_c %{ #include "filters/GP_Filters.h" %} -#define __attribute__(X) - %import ../core/core.i -%include <stdint.i> - -%nodefaultctor; - %include "GP_Filters.h" /* Listed in GP_Filters.h: */ diff --git a/pylib/gfxprim/gfx/gfx.i b/pylib/gfxprim/gfx/gfx.i index 1f59443..eb684da 100644 --- a/pylib/gfxprim/gfx/gfx.i +++ b/pylib/gfxprim/gfx/gfx.i @@ -1,17 +1,12 @@ +%include "../common.i" %module(package="gfxprim.gfx") gfx_c %{ #include "gfx/GP_Gfx.h" %} -#define __attribute__(X) - %import ../core/core.i -%include <stdint.i> - -%nodefaultctor; - %include "GP_Gfx.h" /* Listed in GP_Gfx.h: */ diff --git a/pylib/gfxprim/input/input.i b/pylib/gfxprim/input/input.i index f870e10..a9899a3 100644 --- a/pylib/gfxprim/input/input.i +++ b/pylib/gfxprim/input/input.i @@ -1,3 +1,4 @@ +%include "../common.i" %module(package="gfxprim.input") input_c %{ diff --git a/pylib/gfxprim/loaders/loaders.i b/pylib/gfxprim/loaders/loaders.i index 7939dd8..bcfcaef 100644 --- a/pylib/gfxprim/loaders/loaders.i +++ b/pylib/gfxprim/loaders/loaders.i @@ -1,3 +1,4 @@ +%include "../common.i" %module(package="gfxprim.loaders") loaders_c %{ @@ -5,14 +6,8 @@ #include "loaders/GP_Loaders.h" %} -#define __attribute__(X) - %import ../core/core.i -%include <stdint.i> - -%nodefaultctor; - %include "GP_Loaders.h" %include "GP_JPG.h" diff --git a/pylib/gfxprim/text/text.i b/pylib/gfxprim/text/text.i index 94f8baf..fe40996 100644 --- a/pylib/gfxprim/text/text.i +++ b/pylib/gfxprim/text/text.i @@ -1,3 +1,4 @@ +%include "../common.i" %module(package="gfxprim.text") text_c %{ @@ -5,14 +6,8 @@ #include "text/GP_Font.h" %} -#define __attribute__(X) - %import ../core/core.i -%include <stdint.i> - -%nodefaultctor; - %ignore GP_GlyphBitmap::bitmap; %ignore GP_FontFace::glyph_offsets; %include "GP_Text.h" ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/backends/backends.i | 25 +++++++++++------ pylib/gfxprim/common.i | 53 +++++++++++++++++++++++++++++++++++++ pylib/gfxprim/core/core.i | 23 +++++++++------- pylib/gfxprim/filters/filters.i | 7 +---- pylib/gfxprim/gfx/gfx.i | 7 +---- pylib/gfxprim/input/input.i | 1 + pylib/gfxprim/loaders/loaders.i | 41 ++++++++++++++++++++++++---- pylib/gfxprim/text/text.i | 7 +---- 8 files changed, 121 insertions(+), 43 deletions(-) create mode 100644 pylib/gfxprim/common.i 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: 9270ef0f3556aa8a1bd8f4e7191d0813ec5708dc
by metan 03 Jun '12

03 Jun '12

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 9270ef0f3556aa8a1bd8f4e7191d0813ec5708dc (commit) from a2a5ee04d3fbbdc6fdcc4c7a932a5b11f3edee49 (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/9270ef0f3556aa8a1bd8f4e7191d0813ec57… commit 9270ef0f3556aa8a1bd8f4e7191d0813ec5708dc Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 21:26:05 2012 +0200 backends: X11, Add CREATE_ROOT mode. diff --git a/include/backends/GP_X11.h b/include/backends/GP_X11.h index e03baf4..6d10928 100644 --- a/include/backends/GP_X11.h +++ b/include/backends/GP_X11.h @@ -30,6 +30,10 @@ enum GP_BackendX11Flags { * When set, w and h is ignored and root window is used */ GP_X11_USE_ROOT_WIN = 0x01, + /* + * Create new borderless window above the root window. + */ + GP_X11_CREATE_ROOT_WIN = 0x02, }; diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index 316b137..31fd3bf 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -147,6 +147,11 @@ static int x11_params_to_flags(const char *param, GP_Size *w, GP_Size *h, return 0; } + if (!strcasecmp(param, "CREATE_ROOT")) { + *flags |= GP_X11_CREATE_ROOT_WIN; + return 0; + } + /* * Accepts only string with format "intxint" or "intXint" */ diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index ffc7dca..8b12562 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -29,6 +29,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> +#include <X11/Xatom.h> +#include <X11/Xmd.h> #include "input/GP_InputDriverX11.h" #include "GP_X11.h" @@ -264,7 +266,7 @@ void create_window(struct x11_priv *x11, int x, int y, unsigned long attr_mask = 0; /* Set event mask */ - attrs.event_mask = ExposureMask | StructureNotifyMask |KeyPressMask | + attrs.event_mask = ExposureMask | StructureNotifyMask | KeyPressMask | KeyReleaseMask | PointerMotionMask; attr_mask |= CWEventMask; @@ -281,18 +283,149 @@ void create_window(struct x11_priv *x11, int x, int y, *w, *h); XChangeWindowAttributes(x11->dpy, x11->win, attr_mask, &attrs); - + return; } - GP_DEBUG(2, "Opening window '%s' %ix%i-%ux%u", - caption, x, y, *w, *h); - /* * For some reason reading mouse button clicks on root win are not * allowed... */ - attrs.event_mask |= ButtonPressMask | ButtonReleaseMask ; + attrs.event_mask |= ButtonPressMask | ButtonReleaseMask; + + /* + * Create undecoreated root window on background + */ + if (flags & GP_X11_CREATE_ROOT_WIN) { + Atom xa; + + *w = DisplayWidth(x11->dpy, x11->scr); + *h = DisplayHeight(x11->dpy, x11->scr); + + GP_DEBUG(2, "Creating a window above root, owerriding size to %ux%u", + *w, *h); + + x11->win = XCreateWindow(x11->dpy, DefaultRootWindow(x11->dpy), + 0, 0, *w, *h, 0, CopyFromParent, + InputOutput, CopyFromParent, attr_mask, &attrs); + + /* Set empty WM_PROTOCOLS */ + GP_DEBUG(2, "Setting empty MW_PROTOCOLS"); + XSetWMProtocols(x11->dpy, x11->win, NULL, 0); + + /* Set window type to desktop */ + xa = XInternAtom(x11->dpy, "_NET_WM_WINDOW_TYPE", False); + + if (xa != None) { + GP_DEBUG(2, "Setting Atom _NET_WM_WINDOW_TYPE to _NET_WM_WINDOW_TYPE_DESKTOP"); + + Atom xa_prop = XInternAtom(x11->dpy, "_NET_WM_WINDOW_TYPE_DESKTOP", False); + + XChangeProperty(x11->dpy, x11->win, xa, XA_ATOM, 32, + PropModeReplace, (unsigned char *) &xa_prop, 1); + } + + /* Turn off window decoration */ + xa = XInternAtom(x11->dpy, "_MOTIF_WM_HINTS", False); + + if (xa != None) { + GP_DEBUG(2, "Setting Atom _MOTIF_WM_HINTS to 2, 0, 0, 0, 0"); + + long prop[5] = {2, 0, 0, 0, 0}; + + XChangeProperty(x11->dpy, x11->win, xa, xa, 32, + PropModeReplace, (unsigned char *) prop, 5); + } + + /* Set below other windows */ + xa = XInternAtom(x11->dpy, "_WIN_LAYER", False); + + if (xa != None) { + GP_DEBUG(2, "Setting Atom _WIN_LAYER to 6"); + + long prop = 6; + + XChangeProperty(x11->dpy, x11->win, xa, XA_CARDINAL, 32, + PropModeAppend, (unsigned char *) &prop, 1); + } + + xa = XInternAtom(x11->dpy, "_NET_WM_STATE", False); + + if (xa != None) { + GP_DEBUG(2, "Setting Atom _NET_WM_STATE to _NET_WM_STATE_BELOW"); + + Atom xa_prop = XInternAtom(x11->dpy, "_NET_WM_STATE_BELOW", False); + + XChangeProperty(x11->dpy, x11->win, xa, XA_ATOM, 32, + PropModeAppend, (unsigned char *) &xa_prop, 1); + } + + /* Set sticky */ + xa = XInternAtom(x11->dpy, "_NET_WM_DESKTOP", False); + + if (xa != None) { + GP_DEBUG(2, "Setting Atom _NET_WM_DESKTOP to 0xffffffff"); + + CARD32 xa_prop = 0xffffffff; + + XChangeProperty(x11->dpy, x11->win, xa, XA_CARDINAL, 32, + PropModeAppend, (unsigned char *) &xa_prop, 1); + } + + xa = XInternAtom(x11->dpy, "_NET_WM_STATE", False); + + if (xa != None) { + GP_DEBUG(2, "Appending to Atom _NET_WM_STATE atom _NET_WM_STATE_STICKY"); + + Atom xa_prop = XInternAtom(x11->dpy, "_NET_WM_STATE_STICKY", False); + + XChangeProperty(x11->dpy, x11->win, xa, XA_ATOM, 32, + PropModeAppend, (unsigned char *) &xa_prop, 1); + } + + /* Skip taskbar */ + xa = XInternAtom(x11->dpy, "_NET_WM_STATE", False); + + if (xa != None) { + GP_DEBUG(2, "Appending to Atom _NET_WM_STATE atom _NET_STATE_SKIP_TASKBAR"); + + Atom xa_prop = XInternAtom(x11->dpy, "_NET_WM_STATE_SKIP_TASKBAR", False); + + XChangeProperty(x11->dpy, x11->win, xa, XA_ATOM, 32, + PropModeAppend, (unsigned char *) &xa_prop, 1); + } + + /* Skip pager */ + xa = XInternAtom(x11->dpy, "_NET_WM_STATE", False); + + if (xa != None) { + GP_DEBUG(2, "Appending to Atom _NET_WM_STATE atom _NET_STATE_SKIP_PAGER"); + + Atom xa_prop = XInternAtom(x11->dpy, "_NET_WM_STATE_SKIP_PAGER", False); + + XChangeProperty(x11->dpy, x11->win, xa, XA_ATOM, 32, + PropModeAppend, (unsigned char *) &xa_prop, 1); + } + + /* Set 100% opacity */ + xa = XInternAtom(x11->dpy, "_NET_WM_WINDOW_OPACITY", False); + + if (xa != None) { + GP_DEBUG(2, "Setting Atom _NET_WM_WINDOW_OPACITY to 0xffffffff"); + + long prop = 0xffffffff; + + XChangeProperty(x11->dpy, x11->win, xa, XA_CARDINAL, 32, + PropModeAppend, (unsigned char *) &prop, 1); + } + + /* Show window */ + XMapWindow(x11->dpy, x11->win); + return; + } + + GP_DEBUG(2, "Opening window '%s' %ix%i-%ux%u", + caption, x, y, *w, *h); x11->win = XCreateWindow(x11->dpy, DefaultRootWindow(x11->dpy), x, y, *w, *h, 0, CopyFromParent, ----------------------------------------------------------------------- Summary of changes: include/backends/GP_X11.h | 4 + libs/backends/GP_BackendInit.c | 5 ++ libs/backends/GP_X11.c | 145 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 148 insertions(+), 6 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: a2a5ee04d3fbbdc6fdcc4c7a932a5b11f3edee49
by metan 03 Jun '12

03 Jun '12

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 a2a5ee04d3fbbdc6fdcc4c7a932a5b11f3edee49 (commit) from 1ef7dcb59e9b7b131e59c4965e3ce775e8b26de5 (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/a2a5ee04d3fbbdc6fdcc4c7a932a5b11f3ed… commit a2a5ee04d3fbbdc6fdcc4c7a932a5b11f3edee49 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 15:51:08 2012 +0200 doc: Add meta-data examples. diff --git a/doc/examples.txt b/doc/examples.txt index 5c426f0..ec356e2 100644 --- a/doc/examples.txt +++ b/doc/examples.txt @@ -23,6 +23,19 @@ Example in C utilizing progress callback include::../demos/c_simple/loaders.c[] ------------------------------------------------------------------ +Example in C using image meta-data interface +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/meta_data.c[] +------------------------------------------------------------------ + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/meta_data_dump.c[] +------------------------------------------------------------------ + Example in Python ~~~~~~~~~~~~~~~~~ ----------------------------------------------------------------------- Summary of changes: doc/examples.txt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 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: 1ef7dcb59e9b7b131e59c4965e3ce775e8b26de5
by metan 03 Jun '12

03 Jun '12

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 1ef7dcb59e9b7b131e59c4965e3ce775e8b26de5 (commit) from c67470e8571d4b391c9c0440b96a9cd1d578fe10 (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/1ef7dcb59e9b7b131e59c4965e3ce775e8b2… commit 1ef7dcb59e9b7b131e59c4965e3ce775e8b26de5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 15:37:50 2012 +0200 pywrap: Update GP_FilterParam pywrap. diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i index 274c765..e12ca55 100644 --- a/pylib/gfxprim/filters/filters.i +++ b/pylib/gfxprim/filters/filters.i @@ -15,13 +15,22 @@ %include "GP_Filters.h" /* Listed in GP_Filters.h: */ -%include "GP_FilterParam.h" %include "GP_Point.h" %ignore GP_Histogram::hist; %include "GP_Stats.h" %include "GP_Linear.h" %include "GP_Resize.h" +%extend GP_FilterParam { + ~GP_FilterParam() { + GP_DEBUG(2, "[wrapper] GP_FilterParamFree"); + GP_FilterParamDestroy($self); + } +} + +%newobject GP_FilterParamCreate; +%include "GP_FilterParam.h" + /* Functions returning new allocated context */ %immutable GP_FilterSymmetryNames; ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/filters/filters.i | 11 ++++++++++- 1 files changed, 10 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: c67470e8571d4b391c9c0440b96a9cd1d578fe10
by metan 03 Jun '12

03 Jun '12

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 c67470e8571d4b391c9c0440b96a9cd1d578fe10 (commit) via a5f35c8236697c090110f3c00875dcec810655f6 (commit) via 5815d5e6aec94722550bf2a5eb9da1bf3dd8abdf (commit) from 9ba3f4f318081d8fc506b58a782375d3b36e19b2 (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/c67470e8571d4b391c9c0440b96a9cd1d578… commit c67470e8571d4b391c9c0440b96a9cd1d578fe10 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 15:33:59 2012 +0200 doc: Add GP_FilterParam into filters. diff --git a/doc/filters.txt b/doc/filters.txt index 32c9fe0..1abf977 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -69,6 +69,148 @@ int GP_FilterFoo_Raw(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- +Filter Parameters +~~~~~~~~~~~~~~~~~ + +In order to pass, per-channel, filter parameters to a filter, structure called +GP_FilterParams was created. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +typedef union GP_FilterParamVal { + float f; + uint32_t ui; + int32_t i; + void *ptr; +} GP_FilterParamVal; + +typedef struct GP_FilterParam { + char channel_name[2]; + union GP_FilterParamVal val; +} GP_FilterParam; +------------------------------------------------------------------------------- + +Some filters do take an empty channel_name terminated (empty channel_name is +empty string i.e. "0") array of GP_FilterParam, which is used to describe +per-channel parameters. + + +There are two methods how to construct GP_FilterParam structure. First one is +to use macro that expands to a code which declares and initializes the array on +the stack second uses memory allocated by a malloc(). In both cases the +structure is has initialized channel names and terminator. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +#define GP_FILTER_PARAMS(pixel_type, name) + GP_FilterParam name[GP_PixelTypes[pixel_type].numchannels + 1]; + GP_FilterParamInitChannels(name, pixel_type); +------------------------------------------------------------------------------- + +Macro that declares and initializes GP_FilterParam structure for a given +pixel_type. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +GP_FilterParam *GP_FilterParamCreate(GP_PixelType pixel_type); + +void GP_FilterParamDestroy(GP_FilterParam *self); +------------------------------------------------------------------------------- + +Second possible way allocates memory using malloc(). + +Functions for manipulating and querying existing GP_FilterParam follows. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +void GP_FilterParamInitChannels(GP_FilterParam params[], + GP_PixelType pixel_type); +------------------------------------------------------------------------------- + +Initializes filter param array channel names (accordingly to pixel type) and +terminator. The params array must be large enough to hold number of pixel type +channels plus one. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +GP_FilterParam *GP_FilterParamChannel(GP_FilterParam params[], + const char *channel_name); +------------------------------------------------------------------------------- + +Does lookup for a given channel name and returns, if found, corresponding +GP_FilterParam, otherwise 'NULL' is returned. + +This function is primary used in filters, where filter, at the start, resolves +all it's parameters. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +int GP_FilterParamCheckPixelType(GP_FilterParam params[], + GP_PixelType pixel_type); +------------------------------------------------------------------------------- + +Matches param structure against pixel_type. Returns zero if params describes +exactly same channels like pixel_type, non-zero otherwise. + +[source,c] +------------------------------------------------------------------------------- +#include <GP.h> +/* or */ +#include <filters/GP_FilterParam.h> + +void GP_FilterParamSetIntAll(GP_FilterParam params[], int32_t val); + +int GP_FilterParamSetInt(GP_FilterParam params[], const char *channel_name, + int32_t val); + +void GP_FilterParamSetFloatAll(GP_FilterParam params[], float val); + +int GP_FilterParamSetFloat(GP_FilterParam params[], const char *channel_name, + float val); + +void GP_FilterParamSetUIntAll(GP_FilterParam params[], uint32_t val); + +int GP_FilterParamSetUInt(GP_FilterParam params[], const char *channel_name, + uint32_t val); + +void GP_FilterParamSetPtrAll(GP_FilterParam params[], void *ptr); + +int GP_FilterParamSetPtr(GP_FilterParam params[], const char *channel_name, + void *ptr); + +void GP_FilterParamFreePtrAll(GP_FilterParam params[]); +------------------------------------------------------------------------------- + +Parameter setters. Those that sets individual value returns zero on success +(i.e. channel was found) and non-zero otherwise. + +The last one calls free() on all param pointers, which is used to free +allocate memory. + Point operation filters ~~~~~~~~~~~~~~~~~~~~~~~ http://repo.or.cz/w/gfxprim.git/commit/a5f35c8236697c090110f3c00875dcec8106… commit a5f35c8236697c090110f3c00875dcec810655f6 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 15:31:48 2012 +0200 filters: Cleanup GP_FilterParams API a little. diff --git a/include/filters/GP_FilterParam.h b/include/filters/GP_FilterParam.h index 892f166..6520354 100644 --- a/include/filters/GP_FilterParam.h +++ b/include/filters/GP_FilterParam.h @@ -16,7 +16,7 @@ * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -46,14 +46,27 @@ typedef union GP_FilterParamVal { * Filter takes, empty channel name terminated, arrray of these as parameter. */ typedef struct GP_FilterParam { - //TODO: this must be >= for maximal channel name (now it's 2) + //TODO: this must be > than maximal channel name (now it's 2) char channel_name[2]; union GP_FilterParamVal val; } GP_FilterParam; /* - * Takes array of filter parameters and returns channel. + * Creates filter param structure large enough for given pixel_type. * + * The returned structure has initalized channel_names and terminator. + */ +GP_FilterParam *GP_FilterParamCreate(GP_PixelType pixel_type); + +/* + * Destroys filter param structure. + */ +void GP_FilterParamDestroy(GP_FilterParam *self); + +/* + * Takes array of filter parameters and returns filter parameter by a channel + * name. + * * Returns NULL if channel wasn't found. */ GP_FilterParam *GP_FilterParamChannel(GP_FilterParam params[], @@ -69,7 +82,7 @@ uint32_t GP_FilterParamChannels(GP_FilterParam params[]); * match. */ int GP_FilterParamCheckPixelType(GP_FilterParam params[], - GP_PixelType type); + GP_PixelType pixel_type); /* * Returns zero only if params have exactly same channels as array of @@ -85,53 +98,59 @@ int GP_FilterParamCheckChannels(GP_FilterParam params[], GP_FilterParam name[GP_PixelTypes[pixel_type].numchannels + 1]; GP_FilterParamInitChannels(name, pixel_type); -#define GP_FILTER_PARAMS_INT(pixel_type, name, val) - GP_FILTER_PARAMS(pixel_type, name) - GP_FilterParamSetIntAll(name, val); - -#define GP_FILTER_PARAMS_UINT(pixel_type, name, val) - GP_FILTER_PARAMS(pixel_type, name) - GP_FilterParamSetUIntAll(name, val); - -#define GP_FILTER_PARAMS_FLOAT(pixel_type, name, val) - GP_FILTER_PARAMS(pixel_type, name) - GP_FilterParamSetFloatAll(name, val); - -#define GP_FILTER_PARAMS_PTR(pixel_type, name, ptr) - GP_FILTER_PARAMS(pixel_type, name) - GP_FilterParamSetPtrAll(name, ptr); - /* * Initalize param names and terminator. * * Sets all values to 0. */ void GP_FilterParamInitChannels(GP_FilterParam params[], - GP_PixelType type); + GP_PixelType pixel_type); /* * Sets all values to integer value. */ -void GP_FilterParamSetIntAll(GP_FilterParam params[], - int32_t val); +void GP_FilterParamSetIntAll(GP_FilterParam params[], int32_t val); + +/* + * Sets integer value. Returns 0 if such value was found, non-zero otherwise. + */ +int GP_FilterParamSetInt(GP_FilterParam params[], const char *channel_name, + int32_t val); /* * Sets all values to float value. */ -void GP_FilterParamSetFloatAll(GP_FilterParam params[], - float val); +void GP_FilterParamSetFloatAll(GP_FilterParam params[], float val); + +/* + * Sets float value. Returns 0 if such value was found, non-zero otherwise. + */ +int GP_FilterParamSetFloat(GP_FilterParam params[], const char *channel_name, + float val); /* * Sets all values to unsigned integer value. */ -void GP_FilterParamSetUIntAll(GP_FilterParam params[], - uint32_t val); +void GP_FilterParamSetUIntAll(GP_FilterParam params[], uint32_t val); + +/* + * Sets unsigned integer value. Returns 0 if such value was found, non-zero + * otherwise. + */ +int GP_FilterParamSetUInt(GP_FilterParam params[], const char *channel_name, + uint32_t val); /* * Sets all values to pointer value. */ -void GP_FilterParamSetPtrAll(GP_FilterParam params[], - void *ptr); +void GP_FilterParamSetPtrAll(GP_FilterParam params[], void *ptr); + +/* + * Sets pointer value. Returns 0 if such value was found, non-zero otherwise. + */ +int GP_FilterParamSetPtr(GP_FilterParam params[], const char *channel_name, + void *ptr); + /* * Call free on all pointer values. */ diff --git a/libs/filters/GP_FilterParam.c b/libs/filters/GP_FilterParam.c index e968a4b..e6c0f6b 100644 --- a/libs/filters/GP_FilterParam.c +++ b/libs/filters/GP_FilterParam.c @@ -16,16 +16,38 @@ * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ #include <string.h> -#include <GP_Debug.h> +#include "core/GP_Debug.h" #include "GP_FilterParam.h" +GP_FilterParam *GP_FilterParamCreate(GP_PixelType pixel_type) +{ + GP_FilterParam *ret; + + ret = malloc((GP_PixelTypes[pixel_type].numchannels + 1) + * sizeof(GP_FilterParam)); + + if (ret == NULL) { + GP_WARN("Malloc Failed"); + return NULL; + } + + GP_FilterParamInitChannels(ret, pixel_type); + + return ret; +} + +void GP_FilterParamDestroy(GP_FilterParam *self) +{ + free(self); +} + static unsigned int count_channels(GP_FilterParam params[]) { unsigned int i = 0; @@ -115,6 +137,19 @@ void GP_FilterParamSetIntAll(GP_FilterParam params[], params[i].val.i = val; } +int GP_FilterParamSetInt(GP_FilterParam params[], const char *channel_name, + int32_t val) +{ + GP_FilterParam *param; + param = GP_FilterParamChannel(params, channel_name); + + if (param == NULL) + return 1; + + param->val.i = val; + return 0; +} + void GP_FilterParamSetFloatAll(GP_FilterParam params[], float val) { @@ -124,6 +159,19 @@ void GP_FilterParamSetFloatAll(GP_FilterParam params[], params[i].val.f = val; } +int GP_FilterParamSetFloat(GP_FilterParam params[], const char *channel_name, + float val) +{ + GP_FilterParam *param; + param = GP_FilterParamChannel(params, channel_name); + + if (param == NULL) + return 1; + + param->val.f = val; + return 0; +} + void GP_FilterParamSetUIntAll(GP_FilterParam params[], uint32_t val) { @@ -133,6 +181,19 @@ void GP_FilterParamSetUIntAll(GP_FilterParam params[], params[i].val.ui = val; } +int GP_FilterParamSetUInt(GP_FilterParam params[], const char *channel_name, + uint32_t val) +{ + GP_FilterParam *param; + param = GP_FilterParamChannel(params, channel_name); + + if (param == NULL) + return 1; + + param->val.ui = val; + return 0; +} + void GP_FilterParamSetPtrAll(GP_FilterParam params[], void *ptr) { @@ -142,6 +203,19 @@ void GP_FilterParamSetPtrAll(GP_FilterParam params[], params[i].val.ptr = ptr; } +int GP_FilterParamSetPtr(GP_FilterParam params[], const char *channel_name, + void *ptr) +{ + GP_FilterParam *param; + param = GP_FilterParamChannel(params, channel_name); + + if (param == NULL) + return 1; + + param->val.ptr = ptr; + return 0; +} + void GP_FilterParamFreePtrAll(GP_FilterParam params[]) { unsigned int i; diff --git a/tests/SDL/showimage.c b/tests/SDL/showimage.c index 90bc393..a63ba78 100644 --- a/tests/SDL/showimage.c +++ b/tests/SDL/showimage.c @@ -51,7 +51,8 @@ void event_loop(void) case SDLK_DOWN: { brightness-=1; - GP_FILTER_PARAMS_INT(bitmap->pixel_type, param, brightness); + GP_FILTER_PARAMS(bitmap->pixel_type, param); + GP_FilterParamSetIntAll(param, brightness); res = GP_FilterBrightness(bitmap, NULL, param, NULL); printf("brightness = %i %ux%un", brightness, res->w, res->h); http://repo.or.cz/w/gfxprim.git/commit/5815d5e6aec94722550bf2a5eb9da1bf3dd8… commit 5815d5e6aec94722550bf2a5eb9da1bf3dd8abdf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 13:57:30 2012 +0200 doc: Update common filter API example. diff --git a/doc/filters.txt b/doc/filters.txt index 9329361..32c9fe0 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -41,17 +41,21 @@ as arguments. /* * Filter common API. */ -GP_Context *GP_FilterFoo(const GP_Context *src, GP_Context *dst, - foo params ..., - GP_ProgressCallback *callback); +int GP_FilterFoo(const GP_Context *src, GP_Context *dst, + foo params ..., + GP_ProgressCallback *callback); + +GP_Context *GP_FilterFooAlloc(const GP_Context *src, + foo params ..., + GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Filters also exists in _Raw variant (that just takes source context, -destination context, filters parameters and progress callback). These filter -APIs are used for internal implementation and shouldn't be called by user as -the destination is expected to be crafted exactly for storing the filter -result and there are 'NO' sanity checks in place. +Filters also exists in _Raw variant whose interface is similar to the first +type of filter function. These filter APIs are used for internal +implementation and shouldn't be called by user as the destination is expected +to be crafted exactly for storing the filter result and there are 'NO' sanity +checks in place. 'You could use these at your own risk' @@ -60,9 +64,9 @@ result and there are 'NO' sanity checks in place. /* * Raw filter common API. */ -void GP_FilterFoo_Raw(const GP_Context *src, GP_Context *dst, - foo params ..., - GP_ProgressCallback *callback); +int GP_FilterFoo_Raw(const GP_Context *src, GP_Context *dst, + foo params ..., + GP_ProgressCallback *callback); ------------------------------------------------------------------------------- Point operation filters ----------------------------------------------------------------------- Summary of changes: doc/filters.txt | 168 +++++++++++++++++++++++++++++++++++--- include/filters/GP_FilterParam.h | 77 +++++++++++------- libs/filters/GP_FilterParam.c | 78 +++++++++++++++++- tests/SDL/showimage.c | 3 +- 4 files changed, 283 insertions(+), 43 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: 9ba3f4f318081d8fc506b58a782375d3b36e19b2
by metan 03 Jun '12

03 Jun '12

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 9ba3f4f318081d8fc506b58a782375d3b36e19b2 (commit) from 4c2a2fda5d4751fdc40f987c9aa8b80197b79f6b (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/9ba3f4f318081d8fc506b58a782375d3b36e… commit 9ba3f4f318081d8fc506b58a782375d3b36e19b2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 13:40:41 2012 +0200 pywrap: Update list of newobject filters. diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i index 866ea9b..274c765 100644 --- a/pylib/gfxprim/filters/filters.i +++ b/pylib/gfxprim/filters/filters.i @@ -17,7 +17,6 @@ /* Listed in GP_Filters.h: */ %include "GP_FilterParam.h" %include "GP_Point.h" -%include "GP_Arithmetic.h" %ignore GP_Histogram::hist; %include "GP_Stats.h" %include "GP_Linear.h" @@ -26,16 +25,22 @@ /* Functions returning new allocated context */ %immutable GP_FilterSymmetryNames; -%include "GP_Rotate.h" - %newobject GP_FilterMirrorH_Alloc; %newobject GP_FilterMirrorV_Alloc; %newobject GP_FilterRotate90_Alloc; %newobject GP_FilterRotate180_Alloc; %newobject GP_FilterRotate270_Alloc; %newobject GP_FilterSymmetry_Alloc; +%include "GP_Rotate.h" -%include "GP_Dither.h" %newobject GP_FilterFloydSteinberg_RGB888_Alloc; %newobject GP_FilterHilbertPeano_RGB888_Alloc; +%include "GP_Dither.h" + +%newobject GP_FilterAdditionAlloc; +%newobject GP_FilterMultiplyAlloc; +%newobject GP_FilterDifferenceAlloc; +%newobject GP_FilterMaxAlloc; +%newobject GP_FilterMinAlloc; +%include "GP_Arithmetic.h" ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/filters/filters.i | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 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: 4c2a2fda5d4751fdc40f987c9aa8b80197b79f6b
by metan 03 Jun '12

03 Jun '12

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 4c2a2fda5d4751fdc40f987c9aa8b80197b79f6b (commit) via 997b04b5ded1777428594d22cbd0ec9862bceca4 (commit) via a0576560f951f9bb3b9d4257597c4e82910a1379 (commit) from 427d2740236f2b4c0e9045282ca3d8d1cc37042a (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/4c2a2fda5d4751fdc40f987c9aa8b80197b7… commit 4c2a2fda5d4751fdc40f987c9aa8b80197b79f6b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 13:36:49 2012 +0200 doc: Update filters docs. diff --git a/doc/filters.txt b/doc/filters.txt index fad32b2..9329361 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -13,28 +13,29 @@ Common filter 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 -* The last argument is progress callback - -Each filter function could be used in two modes. +* There are two functions for each filter + - first one takes destination as an argument + - second one allocates the destination and returns pointer to it +* First argument(s) are always source(s) +* Then, in case of second variant, destination +* Other parameters follow +* And the last argument is 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. If filter has +been interrupted by a callback, all allocated memory is freed and 'NULL' is +returned. -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. +When using non-allocating variant of the filter, the destination context must +have correct pixel type and the context size must be big enough to store the +result. The return value from such filter is either zero, in case of success, +or non-zero when filter was interrupted by a callback. 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 overlapping subcontexts and pass these +not expected to work if you do several overlapping sub-contexts and pass these as arguments. -When 'NULL' is passed as destination new context for storing the result is -allocated and returned. - -The return value is either pointer to destination context or 'NULL' either -when malloc(2) has failed or if the filter is not implemented for such -pixel_type, parameters, etc... - [source,c] ------------------------------------------------------------------------------- /* @@ -103,12 +104,106 @@ GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, Inverts the image, for each channel the result value is computed as "chan_max - val". +Arithmetic filters +~~~~~~~~~~~~~~~~~~ + +Arithmetic filters do take two contexts as an input and combines them into one +output context. + +The pixel type of both input contexts must match. + +If size of the input contexts differs, minimum is used. + +[source,c] +------------------------------------------------------------------------------- +#include <filters/GP_Arithmetic.h> +/* or */ +#include <GP.h> + +int GP_FilterAddition(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterAdditionAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Produces saturated (clamped) addition of two contexts. + +[source,c] +------------------------------------------------------------------------------- +#include <filters/GP_Arithmetic.h> +/* or */ +#include <GP.h> + +int GP_FilterMultiply(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterMultiplyAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Produces saturated (clamped) multiplication of two contexts. + +[source,c] +------------------------------------------------------------------------------- +#include <filters/GP_Arigthmetic.h> +/* or */ +#include <GP.h> + +int GP_FilterDifference(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterDifferenceAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); + +------------------------------------------------------------------------------- + +Produces symmetric difference (i.e. abs(a - b)). + +[source,c] +------------------------------------------------------------------------------- +#include <filters/GP_Arigthmetic.h> +/* or */ +#include <GP.h> + +int GP_FilterMax(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterMaxAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); + +int GP_FilterMin(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterMinAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Maximum and minimum filter. + Rotation and Symmetry filters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [source,c] ------------------------------------------------------------------------------- -#include <GP_Filters.h> +#include <filters/GP_Rotate.h> +/* or */ +#include <GP.h> int GP_FilterMirrorH(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); @@ -126,7 +221,9 @@ as large as source. [source,c] ------------------------------------------------------------------------------- -#include <GP_Filters.h> +#include <filters/GP_Rotate.h> +/* or */ +#include <GP.h> int GP_FilterMirrorV(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); @@ -144,7 +241,9 @@ as large as source. [source,c] ------------------------------------------------------------------------------- -#include <GP_Filters.h> +#include <filters/GP_Rotate.h> +/* or */ +#include <GP.h> int GP_FilterRotate90(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); @@ -162,7 +261,9 @@ fit rotated context (i.e. W and H are swapped). [source,c] ------------------------------------------------------------------------------- -#include <GP_Filters.h> +#include <filters/GP_Rotate.h> +/* or */ +#include <GP.h> int GP_FilterRotate180(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); @@ -180,7 +281,9 @@ as large as source. [source,c] ------------------------------------------------------------------------------- -#include <GP_Filters.h> +#include <filters/GP_Rotate.h> +/* or */ +#include <GP.h> int GP_FilterRotate270(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); @@ -194,10 +297,14 @@ Rotate context by 270 degrees. Doesn't work 'in-place' (yet). The destination has to have the same pixel type and destination size must be -large enough to fit rotated context (eg. W and H are swapped). +large enough to fit rotated context (i.e. W and H are swapped). [source,c] ------------------------------------------------------------------------------- +#include <filters/GP_Rotate.h> +/* or */ +#include <GP.h> + typedef enum GP_FilterSymmetries { GP_ROTATE_90, GP_ROTATE_CW = GP_ROTATE_90, @@ -263,7 +370,7 @@ Doesn't work 'in-place' (this is quite impossible as the size of the bitmap is changed by the filter). If the filter destination is non 'NULL' and the 'w' and 'h' is smaller than the -destination size the source image is interpolated into subcontext of +destination size the source image is interpolated into sub-context of destination defined by 'w' and 'h'. 'TODO:' this filter is implemented for RGB888 only. http://repo.or.cz/w/gfxprim.git/commit/997b04b5ded1777428594d22cbd0ec9862bc… commit 997b04b5ded1777428594d22cbd0ec9862bceca4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 12:22:48 2012 +0200 filters: Change arithmetics filters API. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 3da5037..abdf546 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -608,19 +608,19 @@ static GP_RetCode arithmetic(GP_Context **c, const char *params) switch (op) { case 0: - res = GP_FilterDifference(*c, img, NULL, progress_callback); + res = GP_FilterDifferenceAlloc(*c, img, progress_callback); break; case 1: - res = GP_FilterAddition(*c, img, NULL, progress_callback); + res = GP_FilterAdditionAlloc(*c, img, progress_callback); break; case 2: - res = GP_FilterMultiply(*c, img, NULL, progress_callback); + res = GP_FilterMultiplyAlloc(*c, img, progress_callback); break; case 3: - res = GP_FilterMin(*c, img, NULL, progress_callback); + res = GP_FilterMinAlloc(*c, img, progress_callback); break; case 4: - res = GP_FilterMax(*c, img, NULL, progress_callback); + res = GP_FilterMaxAlloc(*c, img, progress_callback); break; } diff --git a/include/filters/GP_Arithmetic.h b/include/filters/GP_Arithmetic.h index 9f1cb20..47fca47 100644 --- a/include/filters/GP_Arithmetic.h +++ b/include/filters/GP_Arithmetic.h @@ -16,7 +16,7 @@ * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -34,21 +34,30 @@ /* * Addition filter. * - * Produces clamped addtion. + * Produces saturated (clamped) addtion. */ -GP_Context *GP_FilterAddition(const GP_Context *src_a, - const GP_Context *src_b, - GP_Context *dst, - GP_ProgressCallback *callback); +int GP_FilterAddition(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterAdditionAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); + /* * Multiply filter. * - * Produces clamped multiplication. + * Produces saturated (clamped) multiplication. */ -GP_Context *GP_FilterMultiply(const GP_Context *src_a, - const GP_Context *src_b, - GP_Context *dst, - GP_ProgressCallback *callback); +int GP_FilterMultiply(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterMultiplyAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); /* * Difference filter. @@ -56,25 +65,37 @@ GP_Context *GP_FilterMultiply(const GP_Context *src_a, * Produces symetric difference. * eg. dst = abs(src_a - src_b) */ -GP_Context *GP_FilterDifference(const GP_Context *src_a, - const GP_Context *src_b, - GP_Context *dst, - GP_ProgressCallback *callback); +int GP_FilterDifference(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterDifferenceAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); /* * Maximum filter. */ -GP_Context *GP_FilterMax(const GP_Context *src_a, - const GP_Context *src_b, - GP_Context *dst, - GP_ProgressCallback *callback); +int GP_FilterMax(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterMaxAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); /* * Minimum filter. */ -GP_Context *GP_FilterMin(const GP_Context *src_a, - const GP_Context *src_b, - GP_Context *dst, - GP_ProgressCallback *callback); +int GP_FilterMin(const GP_Context *src_a, + const GP_Context *src_b, + GP_Context *dst, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterMinAlloc(const GP_Context *src_a, + const GP_Context *src_b, + GP_ProgressCallback *callback); #endif /* FILTERS_GP_ARITHMETIC_H */ diff --git a/pylib/templates/filter.arithmetic.c.t b/pylib/templates/filter.arithmetic.c.t index e083921..d74ddce 100644 --- a/pylib/templates/filter.arithmetic.c.t +++ b/pylib/templates/filter.arithmetic.c.t @@ -116,10 +116,30 @@ int GP_Filter{{ name }}_Raw(const GP_Context *src_a, const GP_Context *src_b, return 1; } -GP_Context *GP_Filter{{ name }}(const GP_Context *src_a, const GP_Context *src_b, - GP_Context *dst{{ maybe_opts_l(opts) }}, GP_ProgressCallback *callback) +int GP_Filter{{ name }}(const GP_Context *src_a, const GP_Context *src_b, + GP_Context *dst{{ maybe_opts_l(opts) }}, + GP_ProgressCallback *callback) { - GP_Context *res = dst; + GP_Size w = GP_MIN(src_a->w, src_b->w); + GP_Size h = GP_MIN(src_a->h, src_b->h); + + GP_ASSERT(src_a->pixel_type == dst->pixel_type, + "The src and dst pixel types must match"); + GP_ASSERT(w <= dst->w && h <= dst->h, + "Destination is not big enough"); + + if (GP_Filter{{ name }}_Raw(src_a, src_b, dst{{ maybe_opts_l(params) }}, callback)) { + GP_DEBUG(1, "Operation aborted"); + return 1; + } + + return 0; +} + +GP_Context *GP_Filter{{ name }}Alloc(const GP_Context *src_a, const GP_Context *src_b, + {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) +{ + GP_Context *res; GP_ASSERT(src_a->pixel_type == src_b->pixel_type, "Pixel types for sources must match."); @@ -127,24 +147,15 @@ GP_Context *GP_Filter{{ name }}(const GP_Context *src_a, const GP_Context *src_b GP_Size w = GP_MIN(src_a->w, src_b->w); GP_Size h = GP_MIN(src_a->h, src_b->h); - if (res == NULL) { - - res = GP_ContextAlloc(w, h, src_a->pixel_type); - - if (res == NULL) - return NULL; - } else { - GP_ASSERT(src_a->pixel_type == dst->pixel_type, - "The src and dst pixel types must match"); - GP_ASSERT(w <= dst->w && h <= dst->h, - "Destination is not big enough"); - } + res = GP_ContextAlloc(w, h, src_a->pixel_type); + + if (res == NULL) + return NULL; if (GP_Filter{{ name }}_Raw(src_a, src_b, res{{ maybe_opts_l(params) }}, callback)) { GP_DEBUG(1, "Operation aborted"); - if (dst == NULL) - GP_ContextFree(res); + GP_ContextFree(res); return NULL; } http://repo.or.cz/w/gfxprim.git/commit/a0576560f951f9bb3b9d4257597c4e82910a… commit a0576560f951f9bb3b9d4257597c4e82910a1379 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jun 3 12:22:12 2012 +0200 doc: Update backend docs. diff --git a/doc/Makefile b/doc/Makefile index d709a78..8d4ffbf 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,7 +1,7 @@ all: api.html examples.html api.html: general.txt api.txt context.txt loaders.txt filters.txt - basic_types.txt drawing_api.txt + basic_types.txt drawing_api.txt backends.txt asciidoc -a toc api.txt examples.html: examples.txt ../demos/c_simple/*.c ../demos/py_simple/*.py diff --git a/doc/backends.txt b/doc/backends.txt index 2a614ff..9ce83d7 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -15,16 +15,16 @@ Initialization functions [source,c] ------------------------------------------------------------------------------- -GP_Backend *GP_BackendLinuxFBInit(const char *path); +GP_Backend *GP_BackendLinuxFBInit(const char *path, int flag); ------------------------------------------------------------------------------- Initializes mmaped frame-buffer backend. The path is path to the frame-buffer device i.e. '/dev/fbX'. This backend is not buffered, everything you draw appears on the screen right away (an switch may be added for that purpose). -Also note that this backend doesn't initialize any input driver. You need to -initialize input driver in order to get keystrokes and/or pointer events. - +If flag is set console KBD driver is used to feed keystrokes into the event +queue, otherwise no events are generated and you are expected to initialize +input event driver in order to get keystrokes and/or pointer events. [source,c] ------------------------------------------------------------------------------- @@ -39,28 +39,47 @@ GP_Backend *GP_BackendSDLInit(GP_Size w, GP_Size h, ------------------------------------------------------------------------------- Initialize SDL as an backend driver. The backend is thread safe as all the -operations are guarded by locks. You can't initialize more than one backend at a -time, that is inherited SDL limitation. If you call the initialization for a -second time, you will get a pointer to already running backend. This driver -feeds input events into global input event queue (see input docs for details). -If w, h and/or bpp are zero SDL tries to do a guess, most of the time wrong for -w and h though. The caption is window caption and may be ignored for some of -the backends. And finally flags may change the SDL to go to full-screen mode or -make the window resizable. +operations are guarded by locks. + +You can't initialize more than one backend at a time, which is inherited SDL +limitation. If you call the initialization for a second time, you will get a +pointer to already running backend. + +This driver feeds input events into global input event queue (see input docs +for details). + +If w, h and/or bpp are zero SDL tries to do a guess, most of the time wrong +for w and h though. + +The caption is window caption. + +And finally flags may change the SDL to go to full-screen mode or make the +window resizable. [source,c] ------------------------------------------------------------------------------- +enum GP_BackendX11Flags { + /* + * When set, w and h is ignored and root window is used + */ + GP_X11_USE_ROOT_WIN = 0x01, +}; + GP_Backend *GP_BackendX11Init(const char *display, int x, int y, unsigned int w, unsigned int h, - const char *caption); + const char *caption, + enum GP_BackendX11Flags flags); ------------------------------------------------------------------------------- -Returns pointer to backend. When display is NULL default display is used -(which is what you want most of the time). This backend feeds key events into -global input queue (pointer events not implemented yet). Note this is -experimental version of X11 backend and will be changed to support more -windows at a time. +Returns pointer to initialized X11 backend or in case of failure NULL. + +When display is NULL default display is used (which is what you want most of the +time). +This backend feeds key events into global input queue. + +Note this is experimental version of X11 backend and will be changed to support +more windows at a time. Overall init function ~~~~~~~~~~~~~~~~~~~~~ @@ -95,7 +114,29 @@ initialization yields pointer to this structure. Although is possible to call these pointers directly it's not recommended and everybody should rather use backend inline functions instead. -The backend API consist of several functions: +The backend API consist GP_Backend structure and of several functions: + +[source,c] +------------------------------------------------------------------------------- +typdef struct GP_Backend { + /* + * Backend name. + */ + const char *name; + + /* + * Pointer to context app should draw to. + */ + GP_Context *context; + + ... + + /* + * Connection fd. Set to -1 if not available + */ + int fd; +}; +------------------------------------------------------------------------------- [source,c] ------------------------------------------------------------------------------- @@ -128,3 +169,23 @@ void GP_BackendPoll(GP_Backend *backend); Polls for backend events. For backends that do not expose file descriptor (namely SDL) this should be called repeatedly. For other backend it may be called either repeatedly or when data are ready on file-descriptor. + +[source,c] +------------------------------------------------------------------------------- +int GP_BackendSetCaption(GP_Backend *backend, const char *caption) +------------------------------------------------------------------------------- + +Sets backend caption. On success zero is returned. On failure (backend doesn't +support caption, operation failed) non zero is returned. + +[source,c] +------------------------------------------------------------------------------- +int GP_BackendResize(GP_Backend *backend, uint32_t w, uint32_t h); +------------------------------------------------------------------------------- + +Resize backend, if supported. On success zero is returned and backend is +resized, otherwise (if resize failed, or is not supported) non-zero is +returned. If backend size already matches w and h, nothing is done. + +Note that backend->context pointer may change upon calling this function and +at least backend->context->pixels pointer will change. ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 10 +- doc/Makefile | 2 +- doc/backends.txt | 99 +++++++++++++++++---- doc/filters.txt | 155 ++++++++++++++++++++++++++++----- include/filters/GP_Arithmetic.h | 67 +++++++++----- pylib/templates/filter.arithmetic.c.t | 45 ++++++---- 6 files changed, 289 insertions(+), 89 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