Gfxprim December 2013

gfxprim@ucw.cz

1 participants
21 discussions

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc0-316-g6fb5278
by metan 18 Dec '13

18 Dec '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 6fb527824eda1a4f749d1212a1fcadd680b4bd36 (commit) from 132863aa4d50fefb0bd28f05de4e816e56c87e77 (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/6fb527824eda1a4f749d1212a1fcadd680b4… commit 6fb527824eda1a4f749d1212a1fcadd680b4bd36 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Dec 18 22:40:51 2013 +0100 libs: backend: Set timer event timestamp correctly The time in timer event wasn't initialized. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index 9af3c63..454cb11 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -114,6 +114,7 @@ static uint32_t pushevent_callback(GP_Timer *self) GP_Event ev; ev.type = GP_EV_TMR; + gettimeofday(&ev.time, NULL); ev.val.tmr = self; GP_EventQueuePut(self->priv, &ev); ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_Backend.c | 1 + 1 files changed, 1 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: 1.0.0-rc0-315-g132863a
by metan 18 Dec '13

18 Dec '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 132863aa4d50fefb0bd28f05de4e816e56c87e77 (commit) via 8a1ac4fff755c365067ea30dc801ecaf0b525113 (commit) via 994b268f4aba098c33b97c2f0eaf5b24fc42df1e (commit) from 982f9d91035c3562536ea524b9d16aac1719ce13 (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/132863aa4d50fefb0bd28f05de4e816e56c8… commit 132863aa4d50fefb0bd28f05de4e816e56c87e77 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Dec 18 11:45:36 2013 +0100 demos: c_simple: Remove abort.c Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index c32d873..2d91834 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -17,7 +17,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 x11_windows+ loaders_register blittest textaligntest sin_AA x11_windows debug_handler gaussian_noise byte_utils version pretty_print timers zip_container backend_timers_example diff --git a/demos/c_simple/abort.c b/demos/c_simple/abort.c deleted file mode 100644 index d9c3e18..0000000 --- a/demos/c_simple/abort.c +++ /dev/null @@ -1,33 +0,0 @@ -/***************************************************************************** - * 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> * - * * - *****************************************************************************/ - -#include <GP.h> - -int main(void) -{ - GP_Context *ctx; - - /* this call causes library to abort because of invalid parameters */ - ctx = GP_ContextAlloc(0, 0, -1); - - return 0; -} http://repo.or.cz/w/gfxprim.git/commit/8a1ac4fff755c365067ea30dc801ecaf0b52… commit 8a1ac4fff755c365067ea30dc801ecaf0b525113 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Dec 18 11:44:00 2013 +0100 doc: text: Fix API docs. * The GP_Text() function prototype wasn't updated when background color was added to the parameters. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/text.txt b/doc/text.txt index 2ade0f5..3acdd81 100644 --- a/doc/text.txt +++ b/doc/text.txt @@ -25,16 +25,17 @@ typedef enum GP_TextAlign { } GP_TextAlign; void GP_Text(GP_Context *context, const GP_TextStyle *style, - int x, int y, int align, const char *str, GP_Pixel pixel); + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg, GP_Pixel bg, const char *str); GP_Size GP_Print(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, int align, - GP_Pixel fg_color, GP_Pixel bg_color, const char *fmt, ...); + GP_Pixel fg, GP_Pixel bg, const char *fmt, ...); GP_Size GP_VPrint(GP_Context *context, const GP_TextStyle *style, GP_Coord x, GP_Coord y, int align, - GP_Pixel fg_color, GP_Pixel bg_color, + GP_Pixel fg, GP_Pixel bg, const char *fmt, va_list va); -------------------------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/994b268f4aba098c33b97c2f0eaf5b24fc42… commit 994b268f4aba098c33b97c2f0eaf5b24fc42df1e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 17 23:25:37 2013 +0100 doc: Add two more examples. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/example_convolution.txt b/doc/example_convolution.txt new file mode 100644 index 0000000..42321af --- /dev/null +++ b/doc/example_convolution.txt @@ -0,0 +1,7 @@ +2D Linear Convolution +--------------------- + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/convolution.c[] +------------------------------------------------------------------ diff --git a/doc/example_showimage.txt b/doc/example_showimage.txt new file mode 100644 index 0000000..b363353 --- /dev/null +++ b/doc/example_showimage.txt @@ -0,0 +1,8 @@ +Showimage +--------- +A simple example that loads an image and shows it in X11 window. + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/showimage.c[] +------------------------------------------------------------------ ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- demos/c_simple/abort.c | 33 -------------------- doc/{example_input.txt => example_convolution.txt} | 5 +-- ...mple_py_showimage.txt => example_showimage.txt} | 6 ++-- doc/text.txt | 7 ++-- 5 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 demos/c_simple/abort.c copy doc/{example_input.txt => example_convolution.txt} (54%) copy doc/{example_py_showimage.txt => example_showimage.txt} (54%) 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: 1.0.0-rc0-312-g982f9d9
by metan 17 Dec '13

17 Dec '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 982f9d91035c3562536ea524b9d16aac1719ce13 (commit) from 10ef775932c40eaa18aa171b43d2c77450d93e43 (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/982f9d91035c3562536ea524b9d16aac1719… commit 982f9d91035c3562536ea524b9d16aac1719ce13 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 17 23:25:47 2013 +0100 spiv: cfg: Two fixes. * Fix opt_by_key() SegFault on config entry without key or name space * Fix read_key() to stop on '=' (so that parsing key=value (without spaces around the '=') works too) Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/cfg.c b/demos/spiv/cfg.c index 629929d..b110e07 100644 --- a/demos/spiv/cfg.c +++ b/demos/spiv/cfg.c @@ -39,22 +39,27 @@ struct cfg_opt *opt_by_key(struct cfg_opt *cfg_opts, const char *name_space, { struct cfg_opt *i; - GP_DEBUG(1, "Looking for key '%s' in name space '%s'", - key, name_space); + GP_DEBUG(1, "Looking for key '%s' in [%s]", key, name_space); for (i = cfg_opts; !terminal(i); i++) { - if (name_space == NULL) { - if (i->name_space == NULL && !strcmp(key, i->key)) - break; - } else { - if (i->name_space != NULL && !strcmp(key, i->key)) - break; - } + if (!i->key) + continue; + + if (name_space && !i->name_space) + continue; + + if (name_space && strcmp(i->name_space, name_space)) + continue; + + if (!strcmp(key, i->key)) + break; } if (terminal(i)) return NULL; + GP_DEBUG(1, "Found key '%s' in [%s]", i->key, i->name_space); + return i; } @@ -215,6 +220,7 @@ static int parse_namespace(struct parser_state *state) return 1; case ']': state->name_space[len] = '0'; + GP_DEBUG(1, "In namespace [%s]", state->name_space); return 0; default: state->name_space[len++] = c; @@ -226,9 +232,6 @@ static int parse_namespace(struct parser_state *state) break; } } - - - GP_DEBUG(1, "In namespace '%s'", state->name_space); } static int read_key(struct parser_state *state) @@ -245,6 +248,8 @@ static int read_key(struct parser_state *state) case EOF: case ' ': case 't': + case '=': + ungetc(c, state->f); state->buf[len] = '0'; GP_DEBUG(1, "Have key '%s'", state->buf); return 0; @@ -352,7 +357,7 @@ static int parse_cfg(struct parser_state *state) switch (c) { case EOF: - GP_DEBUG(1, "End of config reached at %u", + GP_DEBUG(1, "End of config reached at line %u", state->lineno); return 0; case 'n': ----------------------------------------------------------------------- Summary of changes: demos/spiv/cfg.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc0-311-g10ef775
by metan 17 Dec '13

17 Dec '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 10ef775932c40eaa18aa171b43d2c77450d93e43 (commit) from f960d6c1cdf7c20a15e0227fe54de099acff13e5 (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/10ef775932c40eaa18aa171b43d2c77450d9… commit 10ef775932c40eaa18aa171b43d2c77450d93e43 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 17 13:03:03 2013 +0100 tests: input: Fix and enable TimeStamp tests. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/input/TimeStamp.c b/tests/input/TimeStamp.c index 5ab2dc2..157ed5d 100644 --- a/tests/input/TimeStamp.c +++ b/tests/input/TimeStamp.c @@ -27,6 +27,7 @@ */ #include <stdlib.h> +#include <unistd.h> #include <input/GP_TimeStamp.h> #include "tst_test.h" @@ -35,9 +36,11 @@ static int time_stamp_monotonicity(void) { - uint64_t ts = 0, nts; + uint64_t ts = 0, nts, fts; int i, fail = 0; + fts = GP_GetTimeStamp(); + for (i = 0; i < MAX; i++) { nts = GP_GetTimeStamp(); if (nts < ts) { @@ -46,8 +49,11 @@ static int time_stamp_monotonicity(void) (long long unsigned) ts); fail++; } + usleep(10); } + tst_msg("Difference %llu", (long long unsigned)(nts - fts)); + if (fail) return TST_FAILED; diff --git a/tests/input/test_list.txt b/tests/input/test_list.txt index 777c39b..f3fac95 100644 --- a/tests/input/test_list.txt +++ b/tests/input/test_list.txt @@ -1,3 +1,4 @@ # Input test list Timer +TimeStamp ----------------------------------------------------------------------- Summary of changes: tests/input/TimeStamp.c | 8 +++++++- tests/input/test_list.txt | 1 + 2 files changed, 8 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: 1.0.0-rc0-310-gf960d6c
by metan 13 Dec '13

13 Dec '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 f960d6c1cdf7c20a15e0227fe54de099acff13e5 (commit) from 407c969f354f0d0234750ec1d6ac07b1a3de7140 (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/f960d6c1cdf7c20a15e0227fe54de099acff… commit f960d6c1cdf7c20a15e0227fe54de099acff13e5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 12 23:48:44 2013 +0100 demos: spiv: Fix typo in spiv help. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/spiv_help.c b/demos/spiv/spiv_help.c index 72be0bc..736756d 100644 --- a/demos/spiv/spiv_help.c +++ b/demos/spiv/spiv_help.c @@ -89,7 +89,7 @@ static const struct examples examples[] = { "Shows all images stored in zip file"}, {"spiv .", "Shows all loadable images in current directory"}, - {"spiv -t 5 vacation/", + {"spiv -s 5 vacation/", "Runs slideshow with 5 second delay"}, {"spiv -1 'cp %F sorted' images/", "Copies currently loaded image into directory 'sorted/' on pressing F1"}, ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv_help.c | 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: 1.0.0-rc0-309-g407c969
by metan 12 Dec '13

12 Dec '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 407c969f354f0d0234750ec1d6ac07b1a3de7140 (commit) from 0d4b41e7f7e0e3df0c3c05e5bdb4ef4aa7f1a678 (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/407c969f354f0d0234750ec1d6ac07b1a3de… commit 407c969f354f0d0234750ec1d6ac07b1a3de7140 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 12 22:04:42 2013 +0100 input: TimeStamp: Fallback to CLOCK_MONOTOMIC if available On some machines no clock is precise enough to have 1ms resolution (notably small ARM machines). This commit makes the TimeStamp to fallback to CLOCK_MONOTONIC to have at least some timestamps. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/input/GP_TimeStamp.c b/libs/input/GP_TimeStamp.c index c22b478..4c33b5e 100644 --- a/libs/input/GP_TimeStamp.c +++ b/libs/input/GP_TimeStamp.c @@ -57,6 +57,7 @@ static int choose_clock(clockid_t *clock) if (clock_getres(CLOCK_MONOTONIC, &ts)) { GP_DEBUG(1, "CLOCK_MONOTONIC: %s", strerror(errno)); + //TODO: Fallback to gettimeofday? return 1; } @@ -68,8 +69,15 @@ static int choose_clock(clockid_t *clock) return 0; } - GP_DEBUG(1, "No suitable clock id found."); - //TODO: Fallback to gettimeofday? + if (ts.tv_sec) { + GP_FATAL("No suitable clock found"); + return 1; + } + + GP_WARN("Timers running with %lims granularityn", + ts.tv_nsec/MS_IN_US); + + *clock = CLOCK_MONOTONIC; return 1; } ----------------------------------------------------------------------- Summary of changes: libs/input/GP_TimeStamp.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc0-308-g0d4b41e
by metan 11 Dec '13

11 Dec '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 0d4b41e7f7e0e3df0c3c05e5bdb4ef4aa7f1a678 (commit) via c5be07c4673b42da89470346a5db21e74897e2cf (commit) from c1a5214d616c7d155bd00f602c1b4f861b5ca7ef (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/0d4b41e7f7e0e3df0c3c05e5bdb4ef4aa7f1… commit 0d4b41e7f7e0e3df0c3c05e5bdb4ef4aa7f1a678 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Dec 11 22:47:46 2013 +0100 spiv: Fix image cache limits. The problem was that one part of the code was expecting the limits as kilo-bytes while the second as bytes. (I'm very ashamed that I have done such lousy mistake.) Resulting in excessively large image cache limit (larger than actual ram) which triggered swapping after large number of images was viewed. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/image_cache.c b/demos/spiv/image_cache.c index 509d507..c030405 100644 --- a/demos/spiv/image_cache.c +++ b/demos/spiv/image_cache.c @@ -66,7 +66,7 @@ size_t image_cache_get_ram_size(void) fclose(f); - return ret * 1024 / 10; + return ret; } /* @@ -83,7 +83,7 @@ static size_t image_size(struct image *img) return image_size2(img->ctx, img->path); } -struct image_cache *image_cache_create(unsigned int max_size_bytes) +struct image_cache *image_cache_create(unsigned int max_size_kbytes) { struct image_cache *self; @@ -92,13 +92,13 @@ struct image_cache *image_cache_create(unsigned int max_size_bytes) if (self == NULL) return NULL; - self->max_size = max_size_bytes; + self->max_size = max_size_kbytes * 1024; self->cur_size = sizeof(struct image_cache); self->root = NULL; self->end = NULL; - GP_DEBUG(1, "Created image cache size %u bytes", self->max_size); + GP_DEBUG(1, "Created image cache max size %ukB", max_size_kbytes); return self; } diff --git a/demos/spiv/image_cache.h b/demos/spiv/image_cache.h index 84cec1d..b08ed48 100644 --- a/demos/spiv/image_cache.h +++ b/demos/spiv/image_cache.h @@ -16,7 +16,7 @@ * 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> * * * *****************************************************************************/ @@ -37,9 +37,9 @@ struct image_cache; size_t image_cache_get_ram_size(void); /* - * Creates an image cache with maximal memory size. + * Creates an image cache with maximal memory size of max_size_kbytes. */ -struct image_cache *image_cache_create(unsigned int max_size_bytes); +struct image_cache *image_cache_create(unsigned int max_size_kbytes); /* * Returns cached image, or NULL. diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 74a45a4..b3139d9 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -651,6 +651,9 @@ static void init_backend(const char *backend_opts) } } +#define RESIZED_CACHE_MAX 400 * 1024 +#define ORIG_CACHE_MAX 80 * 1024 + /* * Figure out cache size depending on the size of RAM. * @@ -659,13 +662,17 @@ static void init_backend(const char *backend_opts) static int init_loader(struct loader_params *params, const char **argv) { size_t size = image_cache_get_ram_size(); - unsigned int resized_size = (1024 * size)/10; - unsigned int orig_size = (1024 * size)/50; + size_t resized_size = size/10; + size_t orig_size = size/50; + + if (resized_size > RESIZED_CACHE_MAX) + resized_size = RESIZED_CACHE_MAX; - if (resized_size > 100 * 1024 * 1024) - resized_size = 100 * 1024 * 1024; + if (orig_size > ORIG_CACHE_MAX) + orig_size = ORIG_CACHE_MAX; - GP_DEBUG(1, "Resized cache size = %u", resized_size); + GP_DEBUG(1, "Resized cache size = %zukB", resized_size); + GP_DEBUG(1, "Orig cache size = %zukB", orig_size); if (image_loader_init(argv, orig_size)) return 1; http://repo.or.cz/w/gfxprim.git/commit/c5be07c4673b42da89470346a5db21e74897… commit c5be07c4673b42da89470346a5db21e74897e2cf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Dec 11 21:52:01 2013 +0100 backends: X11: Fix window bitmap buffer init The w and h may be modified upon the window creation so we must use wreq.w and wreq.h instead of the user requested w and h. This fixes bug for X11 backend when root window is used and the image size was wrongly initialized to whatever user supplied instead of the root window size. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index bda3bac..14f6ec2 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -613,8 +613,8 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, backend->context = NULL; if ((flags & GP_X11_DISABLE_SHM || !x11_conn.local) - || create_shm_ximage(backend, w, h)) { - if (create_ximage(backend, w, h)) + || create_shm_ximage(backend, wreq.w, wreq.h)) { + if (create_ximage(backend, wreq.w, wreq.h)) goto err1; } ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_cache.c | 8 ++++---- demos/spiv/image_cache.h | 6 +++--- demos/spiv/spiv.c | 17 ++++++++++++----- libs/backends/GP_X11.c | 4 ++-- 4 files changed, 21 insertions(+), 14 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: 1.0.0-rc0-306-gc1a5214
by metan 09 Dec '13

09 Dec '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 c1a5214d616c7d155bd00f602c1b4f861b5ca7ef (commit) via 708072e9f8c3f55a169bef35c0c1bc5a4d2520df (commit) via bda544702c4243add82e9c381dc52fdf357f7311 (commit) via b9e27424029664cad37e8a09200c33a7db7f5b7b (commit) from 5152d5c9e93aeedb1b114de10e6e11392bc17bbc (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/c1a5214d616c7d155bd00f602c1b4f861b5c… commit c1a5214d616c7d155bd00f602c1b4f861b5ca7ef Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 9 01:07:36 2013 +0100 filters: Initial MultiTone and Sepia filters. Not finished yet. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/build/syms/Filters_symbols.txt b/build/syms/Filters_symbols.txt index 9b5b73b..d048bdc 100644 --- a/build/syms/Filters_symbols.txt +++ b/build/syms/Filters_symbols.txt @@ -143,6 +143,12 @@ GP_FilterVLinearConvolution_Raw GP_FilterWeightedMedianEx GP_FilterWeightedMedianExAlloc +GP_FilterMultiToneEx +GP_FilterMultiToneExAlloc + +GP_FilterSepiaEx +GP_FilterSepiaExAlloc + GP_InterpolationTypeName GP_NormInt diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Filters.h index 0a6b4d9..3fe7afb 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Filters.h @@ -83,4 +83,8 @@ /* Gaussian noise filter */ #include "filters/GP_GaussianNoise.h" +/* Multi tone point filters */ +#include "filters/GP_MultiTone.h" +#include "filters/GP_Sepia.h" + #endif /* FILTERS_GP_FILTERS_H */ diff --git a/include/filters/GP_MultiTone.h b/include/filters/GP_MultiTone.h new file mode 100644 index 0000000..9a33d46 --- /dev/null +++ b/include/filters/GP_MultiTone.h @@ -0,0 +1,63 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + +#ifndef FILTERS_GP_MULTI_TONE_H +#define FILTERS_GP_MULTI_TONE_H + +#include "GP_Filter.h" + +int GP_FilterMultiToneEx(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + GP_Pixel pixels[], GP_Size pixels_size, + GP_ProgressCallback *callback); + +static inline int GP_FilterMultiTone(const GP_Context *const src, + GP_Context *dst, + GP_Pixel pixels[], GP_Size pixels_size, + GP_ProgressCallback *callback) +{ + return GP_FilterMultiToneEx(src, 0, 0, src->w, src->h, dst, 0, 0, + pixels, pixels_size, callback); +} + +GP_Context *GP_FilterMultiToneExAlloc(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_PixelType dst_pixel_type, + GP_Pixel pixels[], GP_Size pixels_size, + GP_ProgressCallback *callback); + +static inline GP_Context *GP_FilterMultiToneAlloc(const GP_Context *const src, + GP_PixelType dst_pixel_type, + GP_Pixel pixels[], + GP_Size pixels_size, + GP_ProgressCallback *callback) +{ + return GP_FilterMultiToneExAlloc(src, 0, 0, src->w, src->h, + dst_pixel_type, + pixels, pixels_size, callback); +} + +#endif /* FILTERS_GP_MULTI_TONE_H */ diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Sepia.h similarity index 50% copy from include/filters/GP_Filters.h copy to include/filters/GP_Sepia.h index 0a6b4d9..2d41dd9 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Sepia.h @@ -16,71 +16,42 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -/* - - GP_Context filters. - - */ - -#ifndef FILTERS_GP_FILTERS_H -#define FILTERS_GP_FILTERS_H - -/* Filter per channel parameter passing interface */ -#include "filters/GP_FilterParam.h" - -/* Point filters, brightness, contrast ... */ -#include "filters/GP_Point.h" - -/* Addition, difference, min, max ... */ -#include "filters/GP_Arithmetic.h" - -/* Histograms, ... */ -#include "filters/GP_Stats.h" - -/* Image rotations (90 180 270 grads) and mirroring */ -#include "filters/GP_Rotate.h" - -/* Linear convolution Raw API */ -#include "filters/GP_Linear.h" - -/* Convolution filters */ -#include "filters/GP_Convolution.h" - -/* Blur filters */ -#include "filters/GP_Blur.h" - -/* Edge detection filters */ -#include "filters/GP_EdgeDetection.h" - -/* Image scaling (resampling) */ -#include "filters/GP_Resize.h" -#include "filters/GP_ResizeNN.h" -#include "filters/GP_ResizeLinear.h" -#include "filters/GP_ResizeCubic.h" - -/* Bitmap dithering */ -#include "filters/GP_Dither.h" - -/* Laplace based filters */ -#include "filters/GP_Laplace.h" - -/* Median filter */ -#include "filters/GP_Median.h" - -/* Weighted Median filter */ -#include "filters/GP_WeightedMedian.h" - -/* Sigma Mean filter */ -#include "filters/GP_Sigma.h" - -/* Gaussian noise filter */ -#include "filters/GP_GaussianNoise.h" - -#endif /* FILTERS_GP_FILTERS_H */ +#ifndef FILTERS_GP_SEPIA_H +#define FILTERS_GP_SEPIA_H + +#include "GP_Filter.h" + +int GP_FilterSepiaEx(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + GP_ProgressCallback *callback); + +static inline int GP_FilterSepia(const GP_Context *const src, + GP_Context *dst, + GP_ProgressCallback *callback) +{ + return GP_FilterSepiaEx(src, 0, 0, src->w, src->h, + dst, 0, 0, callback); +} + +GP_Context *GP_FilterSepiaExAlloc(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_PixelType dst_pixel_type, + GP_ProgressCallback *callback); + +static inline GP_Context *GP_FilterSepiaAlloc(const GP_Context *const src, + GP_PixelType dst_pixel_type, + GP_ProgressCallback *callback) +{ + return GP_FilterSepiaExAlloc(src, 0, 0, src->w, src->h, + dst_pixel_type, callback); +} + +#endif /* FILTERS_GP_SEPIA_H */ diff --git a/libs/filters/GP_MultiTone.gen.c.t b/libs/filters/GP_MultiTone.gen.c.t new file mode 100644 index 0000000..4329a3f --- /dev/null +++ b/libs/filters/GP_MultiTone.gen.c.t @@ -0,0 +1,201 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + +%% extends "filter.c.t" + +%% block descr +Generic Point filer +%% endblock + +%% block body + +#include <errno.h> + +#include "core/GP_Context.h" +#include "core/GP_GetPutPixel.h" +#include "core/GP_TempAlloc.h" +#include "core/GP_MixPixels.h" +#include "core/GP_Debug.h" + +#include "filters/GP_MultiTone.h" + +%% for pt in pixeltypes +%% if not pt.is_unknown() and not pt.is_palette() +static void init_table_{{ pt.name }}(GP_Pixel table[], + GP_Size table_size, + GP_Pixel pixels[], + GP_Size pixels_size) +{ + unsigned int i; + unsigned int p = 0; + float perc; + float step = 1.00 * table_size / (pixels_size - 1); + + GP_DEBUG(2, "Preparing pixel table %u steps %u pixels, step %.2f", + table_size, pixels_size, step); + + for (i = 0; i < table_size; i++) { + p = 1.00 * i / step; + perc = i+1; + + while (perc > step) + perc -= step; + + perc = perc / step; + + table[i] = GP_MIX_PIXELS_{{ pt.name }}(pixels[p+1], pixels[p], 255 * perc); +// printf("p = %u i = %u PERC %.2fn", p, i, perc); +// GP_PixelPrint(table[i], GP_PIXEL_{{ pt.name }}); + } +} +%% endif +%% endfor + +static void init_table(GP_PixelType type, + GP_Pixel table[], GP_Size table_size, + GP_Pixel pixels[], GP_Size pixels_size) +{ + switch (type) { +%% for pt in pixeltypes +%% if not pt.is_unknown() and not pt.is_palette() + case GP_PIXEL_{{ pt.name }}: + init_table_{{ pt.name }}(table, table_size, + pixels, pixels_size); + break; +%% endif +%% endfor + default: + GP_BUG("Should not be reached"); + break; + } +} + +#include <assert.h> + +%% for pt in pixeltypes +%% if pt.is_gray() +static int multitone_{{ pt.name }}(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + GP_Pixel pixels[], GP_Size pixels_size, + GP_ProgressCallback *callback) +{ +%% set size = pt.chanslist[0].max + 1 + GP_TempAllocCreate(tmp, {{ size }} * sizeof(GP_Pixel)); + GP_Pixel *table = GP_TempAllocGet(tmp, {{ size }} * sizeof(GP_Pixel)); + + GP_DEBUG(1, "Duotone filter %ux%u {{ pt.name }} -> %s", + w_src, h_src, GP_PixelTypeName(dst->pixel_type)); + + init_table(dst->pixel_type, table, {{ size }}, pixels, pixels_size); + + unsigned int x, y; + + for (y = 0; y < h_src; y++) { + for (x = 0; x < w_src; x++) { + unsigned int src_x = x_src + x; + unsigned int src_y = y_src + y; + unsigned int dst_x = x_dst + x; + unsigned int dst_y = y_dst + y; + + GP_Pixel pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}(src, src_x, src_y); + + pix = table[pix]; + + GP_PutPixel_Raw(dst, dst_x, dst_y, pix); + } + + if (GP_ProgressCallbackReport(callback, y, h_src, w_src)) { + GP_TempAllocFree(tmp); + errno = ECANCELED; + return 1; + } + } + + GP_TempAllocFree(tmp); + GP_ProgressCallbackDone(callback); + + return 0; +} + +%% endif +%% endfor + +int GP_FilterMultiToneEx(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + GP_Pixel pixels[], GP_Size pixels_size, + GP_ProgressCallback *callback) +{ + //CHECK DST IS NOT PALETTE PixelHasFlags + + switch (src->pixel_type) { +%% for pt in pixeltypes +%% if pt.is_gray() + case GP_PIXEL_{{ pt.name }}: + return multitone_{{ pt.name }}(src, x_src, y_src, + w_src, h_src, dst, + x_dst, y_dst, + pixels, pixels_size, + callback); + break; +%% endif +%% endfor + default: + errno = EINVAL; + return -1; + } +} + +GP_Context *GP_FilterMultiToneExAlloc(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_PixelType dst_pixel_type, + GP_Pixel pixels[], GP_Size pixels_size, + GP_ProgressCallback *callback) +{ + GP_Context *res; + int err; + + res = GP_ContextAlloc(w_src, h_src, dst_pixel_type); + + if (!res) { + GP_DEBUG(1, "Malloc failed :("); + return NULL; + } + + if (GP_FilterMultiToneEx(src, x_src, y_src, w_src, h_src, res, 0, 0, + pixels, pixels_size, callback)) { + err = errno; + GP_ContextFree(res); + errno = err; + return NULL; + } + + return res; +} + +%% endblock body diff --git a/include/filters/GP_Filters.h b/libs/filters/GP_Sepia.c similarity index 50% copy from include/filters/GP_Filters.h copy to libs/filters/GP_Sepia.c index 0a6b4d9..bfc2379 100644 --- a/include/filters/GP_Filters.h +++ b/libs/filters/GP_Sepia.c @@ -16,71 +16,51 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -/* - - GP_Context filters. - - */ - -#ifndef FILTERS_GP_FILTERS_H -#define FILTERS_GP_FILTERS_H - -/* Filter per channel parameter passing interface */ -#include "filters/GP_FilterParam.h" - -/* Point filters, brightness, contrast ... */ -#include "filters/GP_Point.h" - -/* Addition, difference, min, max ... */ -#include "filters/GP_Arithmetic.h" - -/* Histograms, ... */ -#include "filters/GP_Stats.h" - -/* Image rotations (90 180 270 grads) and mirroring */ -#include "filters/GP_Rotate.h" - -/* Linear convolution Raw API */ -#include "filters/GP_Linear.h" - -/* Convolution filters */ -#include "filters/GP_Convolution.h" - -/* Blur filters */ -#include "filters/GP_Blur.h" - -/* Edge detection filters */ -#include "filters/GP_EdgeDetection.h" - -/* Image scaling (resampling) */ -#include "filters/GP_Resize.h" -#include "filters/GP_ResizeNN.h" -#include "filters/GP_ResizeLinear.h" -#include "filters/GP_ResizeCubic.h" - -/* Bitmap dithering */ -#include "filters/GP_Dither.h" - -/* Laplace based filters */ -#include "filters/GP_Laplace.h" - -/* Median filter */ -#include "filters/GP_Median.h" - -/* Weighted Median filter */ -#include "filters/GP_WeightedMedian.h" - -/* Sigma Mean filter */ -#include "filters/GP_Sigma.h" - -/* Gaussian noise filter */ -#include "filters/GP_GaussianNoise.h" - -#endif /* FILTERS_GP_FILTERS_H */ +#include "core/GP_Convert.h" +#include "core/GP_Debug.h" + +#include "filters/GP_MultiTone.h" + +#define PIX 3 + +static void init_sepia_tones(GP_Pixel pixels[PIX], GP_PixelType pixel_type) +{ +// pixels[0] = GP_RGBToPixel(56, 33, 10, pixel_type); +// pixels[1] = GP_RGBToPixel(255, 255, 255, pixel_type); + pixels[0] = GP_RGBToPixel(0, 0, 0, pixel_type); + pixels[1] = GP_RGBToPixel(162, 116, 70, pixel_type); + pixels[2] = GP_RGBToPixel(230, 230, 230, pixel_type); +} + +int GP_FilterSepiaEx(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + GP_ProgressCallback *callback) +{ + GP_Pixel pixels[PIX]; + + init_sepia_tones(pixels, dst->pixel_type); + + return GP_FilterMultiToneEx(src, x_src, y_src, w_src, h_src, + dst, x_dst, y_dst, pixels, PIX, callback); +} + +GP_Context *GP_FilterSepiaExAlloc(const GP_Context *const src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_PixelType dst_pixel_type, + GP_ProgressCallback *callback) +{ + GP_Pixel pixels[PIX]; + + init_sepia_tones(pixels, dst_pixel_type); + + return GP_FilterMultiToneExAlloc(src, x_src, y_src, w_src, h_src, + dst_pixel_type, pixels, PIX, callback); +} diff --git a/libs/filters/Makefile b/libs/filters/Makefile index d1a909c..9c5f30f 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -5,7 +5,8 @@ STATS_FILTERS=GP_Histogram.gen.c POINT_FILTERS=GP_GaussianNoise.gen.c GP_ApplyTables.gen.c GP_Invert.gen.c GP_Brightness.gen.c GP_Contrast.gen.c- GP_BrightnessContrast.gen.c GP_Posterize.gen.c + GP_BrightnessContrast.gen.c GP_Posterize.gen.c+ GP_MultiTone.gen.c ARITHMETIC_FILTERS=GP_Difference.gen.c GP_Addition.gen.c GP_Min.gen.c GP_Max.gen.c GP_Multiply.gen.c diff --git a/pylib/gfxprim/filters/__init__.py b/pylib/gfxprim/filters/__init__.py index 9fd278c..fe82d01 100644 --- a/pylib/gfxprim/filters/__init__.py +++ b/pylib/gfxprim/filters/__init__.py @@ -41,7 +41,8 @@ def _init(module): 'Median', 'MedianAlloc', 'MedianEx', 'MedianExAlloc', 'Sigma', 'SigmaAlloc', 'SigmaEx', 'SigmaExAlloc', 'FloydSteinberg', 'FloydSteinbergAlloc', - 'HilbertPeano', 'HilbertPeanoAlloc']: + 'HilbertPeano', 'HilbertPeanoAlloc', + 'Sepia', 'SepiaAlloc', 'SepiaEx', 'SepiaExAlloc']: extend_submodule(FiltersSubmodule, name, c_filters.__getattribute__('GP_Filter' + name)) def array_to_kern(kernel, kernel_div): diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i index b0f7f1a..a504f76 100644 --- a/pylib/gfxprim/filters/filters.i +++ b/pylib/gfxprim/filters/filters.i @@ -138,11 +138,16 @@ FILTER_FUNC(WeightedMedian); %include "GP_WeightedMedian.h" /* Sigma filter */ -FILTER_FUNC(GP_FilterSigmaEx); -FILTER_FUNC(GP_FilterSigma); +FILTER_FUNC(FilterSigmaEx); +FILTER_FUNC(FilterSigma); %include "GP_Sigma.h" /* Gaussian Noise */ FILTER_FUNC(GaussianNoiseAddEx); FILTER_FUNC(GaussianNoiseAdd); %include "GP_GaussianNoise.h" + +/* Sepia */ +FILTER_FUNC(Sepia); +FILTER_FUNC(SepiaEx); +%include "GP_Sepia.h" http://repo.or.cz/w/gfxprim.git/commit/708072e9f8c3f55a169bef35c0c1bc5a4d25… commit 708072e9f8c3f55a169bef35c0c1bc5a4d2520df Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Dec 9 01:07:07 2013 +0100 doc: Fix typos in GP_TempAlloc() documentation. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/core_common.txt b/doc/core_common.txt index c7148fa..1f747b0 100644 --- a/doc/core_common.txt +++ b/doc/core_common.txt @@ -130,7 +130,7 @@ int foo(...) ... if (error) { - GP_TempAllocFree(self); + GP_TempAllocFree(tmp); return -1; } @@ -138,7 +138,7 @@ int foo(...) /* end of the code that uses the buffers */ - GP_TempAllocFree(self); + GP_TempAllocFree(tmp); return 0; } http://repo.or.cz/w/gfxprim.git/commit/bda544702c4243add82e9c381dc52fdf357f… commit bda544702c4243add82e9c381dc52fdf357f7311 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 8 23:46:27 2013 +0100 pywrap: Progress callback proxy check for Py_None. If a wrapped function is called with callback parameter set to None, i.e. callback = None loaders.Load("image_path/image", callback); The progress callback fails because Py_None is not executable. Fix this by checking for Py_None and skipping the callback if passed. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 0be27fe..7432e9e 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -70,27 +70,29 @@ int gp_proxy_callback(GP_ProgressCallback *self) %typemap(in) GP_ProgressCallback *callback (GP_ProgressCallback callback_proxy, struct gp_proxy_params proxy_params) { - if (PyTuple_Check($input) && PyTuple_GET_SIZE($input) > 0) { - if (!PyCallable_Check(PyTuple_GetItem($input, 0))) { - PyErr_SetString(PyExc_TypeError, - "first arg in tuple must be callable"); - return NULL; + if ($input != Py_None) { + if (PyTuple_Check($input) && PyTuple_GET_SIZE($input) > 0) { + if (!PyCallable_Check(PyTuple_GetItem($input, 0))) { + PyErr_SetString(PyExc_TypeError, + "first arg in tuple must be callable"); + return NULL; + } + proxy_params.callback = PyTuple_GetItem($input, 0); + proxy_params.args = $input; + + } else { + if (!PyCallable_Check($input)) { + PyErr_SetString(PyExc_TypeError, + "parameter must be callable"); + return NULL; + } + + proxy_params.callback = $input; + proxy_params.args = NULL; } - proxy_params.callback = PyTuple_GetItem($input, 0); - proxy_params.args = $input; - - } else { - if (!PyCallable_Check($input)) { - PyErr_SetString(PyExc_TypeError, - "parameter must be callable"); - return NULL; - } - - proxy_params.callback = $input; - proxy_params.args = NULL; } - if ($input) { + if ($input && $input != Py_None) { callback_proxy.callback = gp_proxy_callback; callback_proxy.priv = &proxy_params; $1 = &callback_proxy; http://repo.or.cz/w/gfxprim.git/commit/b9e27424029664cad37e8a09200c33a7db7f… commit b9e27424029664cad37e8a09200c33a7db7f5b7b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 8 23:28:56 2013 +0100 pywrap: Enable default NULL callback typemap. It was disabled by mistake while callback proxy was reimplemented. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 462e937..0be27fe 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -101,10 +101,10 @@ int gp_proxy_callback(GP_ProgressCallback *self) /* * All progress callbacks have default NULL value + */ %typemap(default) GP_ProgressCallback *callback { $1 = NULL; } - */ /* * Error handling declarations ----------------------------------------------------------------------- Summary of changes: build/syms/Filters_symbols.txt | 6 + doc/core_common.txt | 4 +- include/filters/GP_Filters.h | 4 + .../filters/{GP_ApplyTables.h => GP_MultiTone.h} | 78 ++++---- include/filters/{GP_Laplace.h => GP_Sepia.h} | 60 +++--- libs/filters/GP_MultiTone.gen.c.t | 201 ++++++++++++++++++++ libs/{input/GP_TimeStamp.c => filters/GP_Sepia.c} | 85 +++------ libs/filters/Makefile | 3 +- pylib/gfxprim/common.i | 40 ++-- pylib/gfxprim/filters/__init__.py | 3 +- pylib/gfxprim/filters/filters.i | 9 +- 11 files changed, 339 insertions(+), 154 deletions(-) copy include/filters/{GP_ApplyTables.h => GP_MultiTone.h} (51%) copy include/filters/{GP_Laplace.h => GP_Sepia.h} (57%) create mode 100644 libs/filters/GP_MultiTone.gen.c.t copy libs/{input/GP_TimeStamp.c => filters/GP_Sepia.c} (54%) 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: 1.0.0-rc0-302-g5152d5c
by metan 08 Dec '13

08 Dec '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 5152d5c9e93aeedb1b114de10e6e11392bc17bbc (commit) from d05bcd076fd9c8539d48030a2153444fb7602cb5 (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/5152d5c9e93aeedb1b114de10e6e11392bc1… commit 5152d5c9e93aeedb1b114de10e6e11392bc17bbc Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 8 20:39:43 2013 +0100 backends: X11: Don't use SHM for remote X11. Disable SHM if the DISPLAY points to remote machine. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index b938db4..bda3bac 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -612,9 +612,11 @@ GP_Backend *GP_BackendX11Init(const char *display, int x, int y, backend->context = NULL; - if ((flags & GP_X11_DISABLE_SHM) || create_shm_ximage(backend, w, h)) + if ((flags & GP_X11_DISABLE_SHM || !x11_conn.local) + || create_shm_ximage(backend, w, h)) { if (create_ximage(backend, w, h)) goto err1; + } XFlush(win->dpy); diff --git a/libs/backends/GP_X11_Conn.h b/libs/backends/GP_X11_Conn.h index 4c5d732..e9e3773 100644 --- a/libs/backends/GP_X11_Conn.h +++ b/libs/backends/GP_X11_Conn.h @@ -37,6 +37,9 @@ struct x11_conn { int S__NET_WM_STATE:1; int S__NET_WM_STATE_FULLSCREEN:1; + /* Is set to 1 if connection is local -> we can use SHM */ + int local:1; + /* reference counter, incremented on window creation */ unsigned int ref_cnt; }; @@ -98,11 +101,23 @@ static void x11_input_init(void); static unsigned int x11_open(const char *display) { + const char *disp; + if (x11_conn.ref_cnt != 0) return ++x11_conn.ref_cnt; GP_DEBUG(1, "Opening X11 display '%s'", display); + disp = XDisplayName(display); + + if (disp && disp[0] == ':') + x11_conn.local = 1; + else + x11_conn.local = 0; + + GP_DEBUG(1, "Connection is %s (%s)", + x11_conn.local ? "local" : "remote", disp); + if (!XInitThreads()) { GP_DEBUG(2, "XInitThreads failed"); return 0; ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_X11.c | 4 +++- libs/backends/GP_X11_Conn.h | 15 +++++++++++++++ 2 files changed, 18 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: 1.0.0-rc0-301-gd05bcd0
by metan 07 Dec '13

07 Dec '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 d05bcd076fd9c8539d48030a2153444fb7602cb5 (commit) via 1a247c93429de2f36141c09e0927f31ac7594f41 (commit) via 1f508b76b65df78df2c88ff026f4f42ec0fb8dd7 (commit) from 5b9a67f154c6251afb1203702830b837297a1030 (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/d05bcd076fd9c8539d48030a2153444fb760… commit d05bcd076fd9c8539d48030a2153444fb7602cb5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Dec 7 12:03:08 2013 +0100 doc: Add a better favicon and fix <title> Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index be8e2dd..1191a13 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -12,8 +12,7 @@ icons <meta name="description" content="{description}" /> <meta name="keywords" content="{keywords}" /> <link rel="icon" type="image/png" href="favicon.png"> -<title>{title}</title> -{title%}<title>{doctitle=}</title> +<title>GFXprim</title> <link rel="stylesheet" href="{stylesdir=.}/{theme=asciidoc}.css" type="text/css" /> {doctype-manpage}<link rel="stylesheet" href="{stylesdir=.}/{theme=asciidoc}-manpage.css" type="text/css" /> ifdef::quirks[] diff --git a/doc/favicon.png b/doc/favicon.png index e35dc42..39e3e53 100644 Binary files a/doc/favicon.png and b/doc/favicon.png differ http://repo.or.cz/w/gfxprim.git/commit/1a247c93429de2f36141c09e0927f31ac759… commit 1a247c93429de2f36141c09e0927f31ac7594f41 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 1 23:53:34 2013 +0100 pywrap: Add swig typemap for GP_ProgressCallback * Add typemap for GP_ProgressCallback - now a python function (or a touple of arguments) is converted to GP_ProgressCallback proxy transparently * Add python progress callback documentation Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/progress_callback.py b/demos/py_simple/progress_callback.py index b4b0b3e..17b1570 100755 --- a/demos/py_simple/progress_callback.py +++ b/demos/py_simple/progress_callback.py @@ -6,8 +6,13 @@ import gfxprim.core as core import gfxprim.loaders as loaders import gfxprim.filters as filters -def progress_callback(callback): - sys.stdout.write("rLoading %3.2f%%" % callback) +def progress_callback1(perc): + sys.stdout.write("rLoading %3.2f%%" % perc) + sys.stdout.flush() + return 0 + +def progress_callback2(perc, args): + sys.stdout.write("r%s %3.2f%%" % (args[1], perc)) sys.stdout.flush() return 0 @@ -16,16 +21,15 @@ def main(): print("Takes an image as an argument") sys.exit(1) - callback = core.c_core.GP_ProgressCallback(progress_callback) - try: - img = loaders.Load(sys.argv[1], callback) + img = loaders.Load(sys.argv[1], progress_callback1) print('') except OSError as detail: print("Failed to load image '%s': %s" % (sys.argv[1], detail)) exit(1) try: + callback = (progress_callback2, "Gaussian Blur") img = img.filters.GaussianBlurAlloc(50, 50, callback) print('') except OSError: diff --git a/doc/core_python.txt b/doc/core_python.txt index 033846d..6e48824 100644 --- a/doc/core_python.txt +++ b/doc/core_python.txt @@ -135,6 +135,20 @@ import gfxprim.core as core The PixelTypes array stores all supported pixel types +[[Progress_Callback]] +Progress Callback +~~~~~~~~~~~~~~~~~ + +Progress callback is a last parameter of link:loaders_python.html[loaders] and +link:filters_python.html[filters]. It can be either a python function or a +touple with a function at the first position. + +Progress callback must return an integer number. Returning non-zero will abort +the operation and the function, called with the callback as a parameter, will +return 'OSError' with errno set to 'ECANCELED'. + +TIP: See link:example_py_progress_callback.html[callback example]. + Debug Functions ~~~~~~~~~~~~~~~ diff --git a/doc/example_py_progress_callback.txt b/doc/example_py_progress_callback.txt new file mode 100644 index 0000000..4826759 --- /dev/null +++ b/doc/example_py_progress_callback.txt @@ -0,0 +1,9 @@ +Progress Callback +----------------- +A very simple program that shows +link:core_python.html#Progress_Callback[progress callback] usage. + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/progress_callback.py[] +------------------------------------------------------------------ diff --git a/doc/filters_python.txt b/doc/filters_python.txt index a1d260a..19d50cf 100644 --- a/doc/filters_python.txt +++ b/doc/filters_python.txt @@ -9,7 +9,8 @@ from submodule as +img.filters.Foo(..)+. Note that in the second case the image is passed automatically as a first parameter. If filter has been aborted from callback 'OSError' with 'errno' set to -'ECANCELED' is raised. +'ECANCELED' is raised, see progress callback +link:core_python.html#Progress_Callback[documentation] for more information. Point Filters ~~~~~~~~~~~~~ diff --git a/doc/loaders_python.txt b/doc/loaders_python.txt index 00c5cef..136b533 100644 --- a/doc/loaders_python.txt +++ b/doc/loaders_python.txt @@ -39,8 +39,9 @@ format. May raise 'OSError' with errno set to 'EIO' when file is damaged. -May raise 'OSError' with errno set to 'ECANCELED' when action was interrupted -by callback. +May raise 'OSError' with errno set to 'ECANCELED' when action was aborted from +callback. See progress callback +link:core_python.html#Progress_Callback[documentation] for more. [source,python] diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 47ae8f0..462e937 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -11,12 +11,100 @@ %nodefaultctor; + /* - * All progress callbacks have default NULL value + * Python callback proxy. Calls a python function passed via self->priv */ +%{ +#include <core/GP_ProgressCallback.h> +#include <core/GP_Debug.h> + +struct gp_proxy_params { + PyObject *callback; + PyObject *args; +}; + +int gp_proxy_callback(GP_ProgressCallback *self) +{ + struct gp_proxy_params *params = self->priv; + PyObject *res, *args; + int ret; + + GP_DEBUG(2, "[wrapper] Proxy Callback called"); + + if (params->args) + args = Py_BuildValue("(f, O)", self->percentage, params->args); + else + args = Py_BuildValue("(f)", self->percentage); + + res = PyEval_CallObject(params->callback, args); + + /* Parse Error, Interruption, etc. */ + if (res == NULL) { + PyErr_Print(); + GP_WARN("Error while calling callback, aborting"); + return 1; + } + + if (PyInt_Check(res)) { + ret = PyInt_AsLong(res); + } else { + GP_WARN("Wrong type returned from callback, aborting"); + return 1; + } + + Py_DECREF(res); + Py_DECREF(args); + + return ret; +} +%} + +/* + * Progress Callback typemap, package python function into proxy callback structure + * and passes it to the C function. + * + * The python callback object can either be a function or a tuple with a function + * as a first parameter + */ +%typemap(in) GP_ProgressCallback *callback (GP_ProgressCallback callback_proxy, + struct gp_proxy_params proxy_params) +{ + if (PyTuple_Check($input) && PyTuple_GET_SIZE($input) > 0) { + if (!PyCallable_Check(PyTuple_GetItem($input, 0))) { + PyErr_SetString(PyExc_TypeError, + "first arg in tuple must be callable"); + return NULL; + } + proxy_params.callback = PyTuple_GetItem($input, 0); + proxy_params.args = $input; + + } else { + if (!PyCallable_Check($input)) { + PyErr_SetString(PyExc_TypeError, + "parameter must be callable"); + return NULL; + } + + proxy_params.callback = $input; + proxy_params.args = NULL; + } + + if ($input) { + callback_proxy.callback = gp_proxy_callback; + callback_proxy.priv = &proxy_params; + $1 = &callback_proxy; + } else { + $1 = NULL; + } +} + +/* + * All progress callbacks have default NULL value %typemap(default) GP_ProgressCallback *callback { $1 = NULL; } + */ /* * Error handling declarations diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 8f578d2..88f9450 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -28,78 +28,6 @@ %include "GP_Debug.h" /* - * Callback proxy, calls the python callback from C source - */ -%{ -static int GP_ProgressCallbackProxy(GP_ProgressCallback *self) -{ - PyObject *obj = self->priv; - PyObject *res, *args; - int ret; - - GP_DEBUG(2, "[wrapper] Proxy Callback called"); - - args = Py_BuildValue("(f)", self->percentage); - - res = PyEval_CallObject(obj, args); - - /* Parse Error, Interruption, etc. */ - if (res == NULL) { - GP_WARN("Error while calling callback, aborting"); - return 1; - } - - if (PyInt_Check(res)) { - ret = PyInt_AsLong(res); - } else { - GP_WARN("Wrong type returned from callback, aborting"); - return 1; - } - - Py_DECREF(res); - - return ret; -} -%} - -%ignore GP_ProgressCallbackReport; -%ignore GP_ProgressCallbackDone; -%include "GP_ProgressCallback.h" - -/* - * Progress callback constructor, desctructor and proxy function. - */ -%extend GP_ProgressCallback { - ~GP_ProgressCallback() { - GP_DEBUG(2, "[wrapper] freeing Proxy Callback"); - free($self); - Py_XDECREF($self->priv); - } - GP_ProgressCallback(PyObject* obj) { - GP_ProgressCallback *res; - - if (!PyCallable_Check(obj)) { - GP_WARN("Callback must be callable python object"); - return NULL; - } - - Py_XINCREF(obj); - - res = malloc(sizeof(GP_ProgressCallback)); - - if (res == NULL) - return NULL; - - res->priv = obj; - res->callback = GP_ProgressCallbackProxy; - - GP_DEBUG(2, "[wrapper] creating Proxy Callback"); - - return res; - } -}; - -/* * Color and pixel types */ http://repo.or.cz/w/gfxprim.git/commit/1f508b76b65df78df2c88ff026f4f42ec0fb… commit 1f508b76b65df78df2c88ff026f4f42ec0fb8dd7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Dec 1 23:52:05 2013 +0100 doc: Remove generated file examples.txt from index Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/examples.txt b/doc/examples.txt deleted file mode 100644 index d96b7f8..0000000 --- a/doc/examples.txt +++ /dev/null @@ -1,38 +0,0 @@ -List of examples ----------------- -Following pages contains a list of all code examples, the source -files could be found and are compiled in the +demos/c_simple/+ and -+demos/py_simple+ directories in the source tree. - -.List C examples -[grid="rows"] -[options="autowidth,header",cols="<,<m"] -|=========================== -| Example | Source filename(s) -| link:example_SDL_glue.html[SDL Glue] | SDL_glue.c -| link:example_backend.html[Graphics Backend] | backend_example.c -| link:example_backend_timers.html[Backend Timers] | backend_timers_example.c -| link:example_debug_handler.html[Custom Debug Message Handler] | debug_handler.c -| link:example_fonts.html[Font and Text rendering] | fonttest.c -fileview.c -| link:example_gaussian_noise.html[Gaussian Additive Noise Filter] | gaussian_noise.c -| link:example_input.html[Input Events Handling] | input_example.c -| link:example_loader_registration.html[Image Loader Registration] | loaders_register.c -| link:example_loaders_progress_callback.html[Loaders with Progress Callback] | loaders.c -| link:example_v4l2.html[Grabbers (v4l2) Examples] | v4l2_grab.c -v4l2_show.c -| link:example_x11_windows.html[X11 Backend with multiple windows] | x11_windows.c -|=========================== -.List Python examples -[grid="rows"] -[options="autowidth,header",cols="<,<m"] -|=========================== -| Example | Source filename(s) -| link:example_py_backends.html[Backend Init] | backends.py -| link:example_py_blur.html[Gaussian Blur Filter] | blur.py -| link:example_py_convolution.html[Box Blur Convolution] | convolution.py -| link:example_py_dithering.html[Floyd-Steinberg Dithering] | dither.py -| link:example_py_gfx.html[GFX Primitives] | gfx.py -| link:example_py_showimage.html[Showimage] | showimage.py -| link:example_py_x11_windows.html[X11 backend with multiple windows] | x11_windows.py -|=========================== ----------------------------------------------------------------------- Summary of changes: demos/py_simple/progress_callback.py | 14 +++-- doc/asciidoc.conf | 3 +- doc/core_python.txt | 14 +++++ doc/example_py_progress_callback.txt | 9 +++ doc/examples.txt | 38 -------------- doc/favicon.png | Bin 609 -> 873 bytes doc/filters_python.txt | 3 +- doc/loaders_python.txt | 5 +- pylib/gfxprim/common.i | 90 +++++++++++++++++++++++++++++++++- pylib/gfxprim/core/core.i | 72 --------------------------- 10 files changed, 127 insertions(+), 121 deletions(-) create mode 100644 doc/example_py_progress_callback.txt delete mode 100644 doc/examples.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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim December 2013