April 2013 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 0e5b7fc4ac8116f1037a244c21159e5fd86f114f
by metan 24 Apr '13

24 Apr '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 0e5b7fc4ac8116f1037a244c21159e5fd86f114f (commit) via eb54a5c7b5cea2633200111f7fb63b2dcfbaaaa1 (commit) from 2671d7bde14699b65a50897b4c55d16bebe5ff4e (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/0e5b7fc4ac8116f1037a244c21159e5fd86f… commit 0e5b7fc4ac8116f1037a244c21159e5fd86f114f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Apr 24 21:59:18 2013 +0200 loaders: BMP: Fix leak. The Load() function was missing fclose(). Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index cb7a61b..29ee503 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -607,7 +607,6 @@ GP_Context *GP_ReadBMP(FILE *f, GP_ProgressCallback *callback) err2: GP_ContextFree(context); err1: - fclose(f); errno = err; return NULL; } @@ -615,11 +614,15 @@ err1: GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback) { FILE *f; + GP_Context *res; if (GP_OpenBMP(src_path, &f, NULL, NULL, NULL)) return NULL; - return GP_ReadBMP(f, callback); + res = GP_ReadBMP(f, callback); + fclose(f); + + return res; } /* http://repo.or.cz/w/gfxprim.git/commit/eb54a5c7b5cea2633200111f7fb63b2dcfba… commit eb54a5c7b5cea2633200111f7fb63b2dcfbaaaa1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Apr 24 21:57:26 2013 +0200 test: loaders: Add Write cases for BMP. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/loaders/loaders_suite.c b/tests/loaders/loaders_suite.c index 1de4fef..8b378dd 100644 --- a/tests/loaders/loaders_suite.c +++ b/tests/loaders/loaders_suite.c @@ -63,6 +63,8 @@ static int save_img(enum fmt fmt, const GP_Context *img, const char *name) return GP_SavePNG(img, buf, NULL); case JPG: return GP_SaveJPG(img, buf, NULL); + case BMP: + return GP_SaveBMP(img, buf, NULL); default: tst_err("Trying to save %s image", strfmt(fmt)); exit(TST_UNTESTED); @@ -148,6 +150,16 @@ static int test_JPG_stress(void) return save_load(JPG, 2000, 2000); } +static int test_BMP_Save_Load(void) +{ + return save_load(BMP, 100, 100); +} + +static int test_BMP_stress(void) +{ + return save_load(BMP, 2000, 2000); +} + static int load_enoent(enum fmt fmt) { GP_Context *img; @@ -689,12 +701,16 @@ const struct tst_suite tst_suite = { .flags = TST_TMPDIR | TST_CHECK_MALLOC}, {.name = "JPG Save Load", .tst_fn = test_JPG_Save_Load, .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + {.name = "BMP Save Load", .tst_fn = test_BMP_Save_Load, + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, /* Stress Save Load tests */ {.name = "PNG Stress", .tst_fn = test_PNG_stress, .flags = TST_TMPDIR | TST_CHECK_MALLOC}, {.name = "JPG Stress", .tst_fn = test_JPG_stress, .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + {.name = "BMP Stress", .tst_fn = test_BMP_stress, + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, /* BPM loader tests */ {.name = "BMP Load 1bpp 1x1", ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_BMP.c | 7 +++++-- tests/loaders/loaders_suite.c | 16 ++++++++++++++++ 2 files changed, 21 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: 2671d7bde14699b65a50897b4c55d16bebe5ff4e
by metan 24 Apr '13

24 Apr '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 2671d7bde14699b65a50897b4c55d16bebe5ff4e (commit) via dd486975a6c4d41191bed65d3d5d1488747d9817 (commit) from 29623bb8c09cbd6659a28bbe84f2a6cdf154c434 (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/2671d7bde14699b65a50897b4c55d16bebe5… commit 2671d7bde14699b65a50897b4c55d16bebe5ff4e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Apr 24 00:20:04 2013 +0200 spiv: image_list: Add more functionality. * Add lazy counters, so that we can tell total number of images in the arg list, including directories * Add functions to move to the start/end of directory and arg list * Add functions to return current position in list. * Make use of the functionality in spiv TODO: Fix help and write docs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/image_list.c b/demos/spiv/image_list.c index d015a21..042ef4b 100644 --- a/demos/spiv/image_list.c +++ b/demos/spiv/image_list.c @@ -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> * * * *****************************************************************************/ @@ -38,6 +38,8 @@ struct image_list { const char **args; unsigned int cur_arg; unsigned int max_arg; + /* counters for files in corresponding arg */ + int *arg_file_counts; /* path to the currently loaded image */ char path[1024]; @@ -85,8 +87,10 @@ static void try_load_dir(struct image_list *self) return; } - if (!(sb.st_mode & S_IFDIR)) + if (!(sb.st_mode & S_IFDIR)) { + self->arg_file_counts[self->cur_arg] = 1; return; + } GP_DEBUG(1, "Loading directory '%s' content.", path); @@ -96,6 +100,11 @@ static void try_load_dir(struct image_list *self) GP_WARN("Failed to scandir '%s': %s", path, strerror(errno)); return; } + + if (self->arg_file_counts[self->cur_arg] != ret) { + GP_DEBUG(1, "Updating arg counter to %i", ret); + self->arg_file_counts[self->cur_arg] = ret; + } if (ret == 0) { GP_DEBUG(1, "There are no files in '%s'", path); @@ -167,17 +176,81 @@ static void prev_img(struct image_list *self) self->path_loaded = 0; } +/* + * Sets current image, if we are in directory. + */ +static void set_dir_cur_img(struct image_list *self, int img) +{ + if (!self->in_dir) { + GP_BUG("Not in directory at %s", + self->args[self->cur_arg]); + return; + } + + if (img < 0 || img >= self->max_file) { + GP_BUG("Invalid image index %i", img); + return; + } + + /* allready there */ + if (self->cur_file == img) + return; + + self->cur_file = img; + self->path_loaded = 0; +} + +/* + * Returns current argument from arg list we are in. + * + * Either it's image file or directory. + */ +static const char *cur_arg(struct image_list *self) +{ + return self->args[self->cur_arg]; +} + +/* + * Sets current argument from arg list. + */ +static void set_cur_arg(struct image_list *self, int arg) +{ + if (arg < 0 || arg >= (int)self->max_arg) { + GP_BUG("Invalid argument index %i", arg); + return; + } + + if (self->in_dir) { + if ((int)self->cur_arg != arg) { + exit_dir(self); + self->cur_arg = arg; + self->path_loaded = 0; + try_load_dir(self); + } else { + set_dir_cur_img(self, 0); + } + return; + } + + if ((int)self->cur_arg == arg) + return; + + self->cur_arg = arg; + self->path_loaded = 0; + + try_load_dir(self); +} + static void load_path(struct image_list *self) { if (self->in_dir) { //TODO: eliminate double / snprintf(self->path, sizeof(self->path), "%s/%s", - self->args[self->cur_arg], - self->dir_files[self->cur_file]->d_name); + cur_arg(self), + self->dir_files[self->cur_file]->d_name); } else { - snprintf(self->path, sizeof(self->path), "%s", - self->args[self->cur_arg]); + snprintf(self->path, sizeof(self->path), "%s", cur_arg(self)); } self->path_loaded = 1; @@ -198,16 +271,128 @@ const char *image_list_move(struct image_list *self, int direction) return image_list_img_path(self); } +const char *image_list_dir_move(struct image_list *self, int direction) +{ + if (!self->in_dir) { + GP_DEBUG(2, "Not in directory"); + return image_list_move(self, direction); + } + + if (direction > 0) { + if (self->cur_file == self->max_file - 1) { + GP_DEBUG(2, "Moving after dir '%s'", cur_arg(self)); + next_img(self); + } else { + GP_DEBUG(2, "Moving to last image in dir '%s'", + cur_arg(self)); + set_dir_cur_img(self, self->max_file - 1); + } + } else { + if (self->cur_file == 0) { + GP_DEBUG(2, "Moving before dir '%s'", cur_arg(self)); + prev_img(self); + } else { + GP_DEBUG(2, "Moving to first image in dir '%s'", + cur_arg(self)); + set_dir_cur_img(self, 0); + } + } + + return image_list_img_path(self); +} + +const char *image_list_first(struct image_list *self) +{ + GP_DEBUG(2, "Moving to the first image in the list"); + + set_cur_arg(self, 0); + + if (self->in_dir) + set_dir_cur_img(self, 0); + + return image_list_img_path(self); +} + +const char *image_list_last(struct image_list *self) +{ + GP_DEBUG(2, "Moving to the last image in the list"); + + set_cur_arg(self, self->max_arg - 1); + + if (self->in_dir) + set_dir_cur_img(self, self->max_file - 1); + + return image_list_img_path(self); +} + +static unsigned int count_img_to(struct image_list *self, unsigned int arg_to) +{ + unsigned int cur_arg = self->cur_arg; + unsigned int cur_file = self->cur_file; + unsigned int count = 0, i; + + for (i = 0; i < arg_to; i++) { + /* cache number of images in arg */ + if (self->arg_file_counts[i] == -1) + set_cur_arg(self, i); + + /* + * if the counter is still at -1 + * directory couldn't be loaded + */ + if (self->arg_file_counts[i] != -1) + count += self->arg_file_counts[i]; + } + + /* restore the original position */ + set_cur_arg(self, cur_arg); + + if (self->in_dir) + set_dir_cur_img(self, cur_file); + + return count; +} + +unsigned int image_list_count(struct image_list *self) +{ + return count_img_to(self, self->max_arg); +} + +unsigned int image_list_pos(struct image_list *self) +{ + return count_img_to(self, self->cur_arg) + self->cur_file; +} + +unsigned int image_list_dir_count(struct image_list *self) +{ + if (!self->in_dir) + return 1; + + return self->max_file; +} + +unsigned int image_list_dir_pos(struct image_list *self) +{ + if (!self->in_dir) + return 1; + + return self->cur_file; +} + struct image_list *image_list_create(const char *args[]) { struct image_list *self; + size_t file_count_size; + unsigned int i; GP_DEBUG(1, "Creating image list"); self = malloc(sizeof(struct image_list)); - if (self == NULL) + if (self == NULL) { + GP_WARN("Malloc failed"); return NULL; + } self->args = args; self->cur_arg = 0; @@ -220,6 +405,18 @@ struct image_list *image_list_create(const char *args[]) self->max_arg = 0; while (args[++self->max_arg] != NULL); + file_count_size = self->max_arg * sizeof(int); + self->arg_file_counts = malloc(file_count_size); + + if (self->arg_file_counts == NULL) { + GP_WARN("Malloc failed"); + free(self); + return NULL; + } + + for (i = 0; i < self->max_arg; i++) + self->arg_file_counts[i] = -1; + try_load_dir(self); return self; diff --git a/demos/spiv/image_list.h b/demos/spiv/image_list.h index e7b299a..17f21d0 100644 --- a/demos/spiv/image_list.h +++ b/demos/spiv/image_list.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> * * * *****************************************************************************/ @@ -47,4 +47,43 @@ const char *image_list_img_path(struct image_list *self); */ const char *image_list_move(struct image_list *self, int direction); +/* + * If we are in directory: + * if direction > 0: move to its end and if allready there, to the next arg + * if direction < 0: move to its begining and if allready there, to the previous arg + * + * If we aren't in directory move by one in corresponding direction. + */ +const char *image_list_dir_move(struct image_list *self, int direction); + +/* + * Move to the first image in the list. + */ +const char *image_list_first(struct image_list *self); + +/* + * Move to the last image in the list. + */ +const char *image_list_last(struct image_list *self); + +/* + * Counts images int the list. + */ +unsigned int image_list_count(struct image_list *self); + +/* + * Returns current position in list, i.e. number between 0 and count - 1. + */ +unsigned int image_list_pos(struct image_list *self); + +/* + * Returns numbe of images in current dir or 1 if current arg is file. + */ +unsigned int image_list_dir_count(struct image_list *self); + +/* + * Returns current position in current dir or 1 if current arg is file. + */ +unsigned int image_list_dir_pos(struct image_list *self); + #endif /* __IMAGE_LIST_H__ */ diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index e08de82..8b94b99 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -100,6 +100,9 @@ struct loader_params { /* caches for loaded images */ struct image_cache *img_resized_cache; struct image_cache *img_orig_cache; + + /* image list structure */ + struct image_list *img_list; }; static int image_loader_callback(GP_ProgressCallback *self) @@ -361,6 +364,26 @@ static void update_display(struct loader_params *params, GP_Context *img) params->use_low_pass && params->rat < 1 ? "Gaussian LP + " : "", GP_InterpolationTypeName(params->resampling_method)); + unsigned int count = image_list_count(params->img_list); + unsigned int pos = image_list_pos(params->img_list) + 1; + + GP_Print(context, NULL, 11, 19 + 4 * th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + black_pixel, white_pixel, "%u of %u", pos, count); + + GP_Print(context, NULL, 10, 18 + 4 * th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white_pixel, black_pixel, "%u of %u", pos, count); + + unsigned int dir_count = image_list_dir_count(params->img_list); + unsigned int dir_pos = image_list_dir_pos(params->img_list) + 1; + + if (dir_count > 1 && dir_count != count) { + GP_Print(context, NULL, 11, 21 + 5 * th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + black_pixel, white_pixel, "%u of %u in directory", dir_pos, dir_count); + + GP_Print(context, NULL, 10, 20 + 5 * th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white_pixel, black_pixel, "%u of %u in directory", dir_pos, dir_count); + } + GP_BackendFlip(backend); } @@ -859,6 +882,7 @@ int main(int argc, char *argv[]) GP_BackendFlip(backend); struct image_list *list = image_list_create((const char**)argv + optind); + params.img_list = list; params.show_progress_once = 1; show_image(&params, image_list_img_path(list)); @@ -983,11 +1007,19 @@ int main(int argc, char *argv[]) break; case GP_KEY_PAGE_UP: params.show_progress_once = 1; - show_image(&params, image_list_move(list, 10)); + show_image(&params, image_list_dir_move(list, -1)); break; case GP_KEY_PAGE_DOWN: params.show_progress_once = 1; - show_image(&params, image_list_move(list, -10)); + show_image(&params, image_list_dir_move(list, 1)); + break; + case GP_KEY_HOME: + params.show_progress_once = 1; + show_image(&params, image_list_first(list)); + break; + case GP_KEY_END: + params.show_progress_once = 1; + show_image(&params, image_list_last(list)); break; case GP_KEY_RIGHT: if (shift_flag) @@ -1017,12 +1049,18 @@ int main(int argc, char *argv[]) next: case GP_KEY_SPACE: params.show_progress_once = 1; - show_image(&params, image_list_move(list, 1)); + if (shift_flag) + show_image(&params, image_list_move(list, 10)); + else + show_image(&params, image_list_move(list, 1)); break; prev: case GP_KEY_BACKSPACE: params.show_progress_once = 1; - show_image(&params, image_list_move(list, -1)); + if (shift_flag) + show_image(&params, image_list_move(list, -10)); + else + show_image(&params, image_list_move(list, -1)); break; case GP_KEY_1: resize_backend(&params, 1, shift_flag); http://repo.or.cz/w/gfxprim.git/commit/dd486975a6c4d41191bed65d3d5d1488747d… commit dd486975a6c4d41191bed65d3d5d1488747d9817 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 23 21:30:51 2013 +0200 tests: loaders: PNG: Return SKIPPED on ENOSYS. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/loaders/PNG.c b/tests/loaders/PNG.c index fce0193..d4901ca 100644 --- a/tests/loaders/PNG.c +++ b/tests/loaders/PNG.c @@ -83,7 +83,7 @@ static int test_save_PNG(GP_PixelType pixel_type) case ENOSYS: tst_msg("Not Implemented"); GP_ContextFree(ctx); - return TST_SUCCESS; + return TST_SKIPPED; default: tst_msg("Failed and errno is not ENOSYS (%i)", errno); GP_ContextFree(ctx); ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_list.c | 211 +++++++++++++++++++++++++++++++++++++++++++++-- demos/spiv/image_list.h | 41 +++++++++- demos/spiv/spiv.c | 46 +++++++++- tests/loaders/PNG.c | 2 +- 4 files changed, 287 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: 29623bb8c09cbd6659a28bbe84f2a6cdf154c434
by metan 23 Apr '13

23 Apr '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 29623bb8c09cbd6659a28bbe84f2a6cdf154c434 (commit) via eebc231f0d4ea12607c8c9bd6d906ff069114b55 (commit) via 89919678929f52f1507282364073cd4b24475d8c (commit) via 6e66ab22c6b2ee3f420920e62256fbbe76b3046f (commit) via bcc354f183de93310f42b9f5e32380bddb207128 (commit) via 799dac0a953bcba3bd8d7fc171597011320094a1 (commit) from c5d73272e61f6d7a05a971d02480660c388bfdd2 (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/29623bb8c09cbd6659a28bbe84f2a6cdf154… commit 29623bb8c09cbd6659a28bbe84f2a6cdf154c434 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 22 23:41:35 2013 +0200 tests: core: Unify test names. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/core/Makefile b/tests/core/Makefile index 757416b..8aa4196 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/pre.mk CSOURCES=Context.c Pixel.c -GENSOURCES+=WritePixel_testsuite.gen.c GetPutPixel.gen.c +GENSOURCES+=WritePixel.gen.c GetPutPixel.gen.c -APPS=WritePixel_testsuite.gen Pixel Context GetPutPixel.gen +APPS=WritePixel.gen Pixel Context GetPutPixel.gen include ../tests.mk diff --git a/tests/core/WritePixel_testsuite.gen.c.t b/tests/core/WritePixel.gen.c.t similarity index 100% rename from tests/core/WritePixel_testsuite.gen.c.t rename to tests/core/WritePixel.gen.c.t diff --git a/tests/core/test_list.txt b/tests/core/test_list.txt index c4f6bb7..89cbedd 100644 --- a/tests/core/test_list.txt +++ b/tests/core/test_list.txt @@ -1,5 +1,5 @@ # Core testsuite -WritePixel_testsuite.gen +WritePixel.gen Context Pixel GetPutPixel.gen http://repo.or.cz/w/gfxprim.git/commit/eebc231f0d4ea12607c8c9bd6d906ff06911… commit eebc231f0d4ea12607c8c9bd6d906ff069114b55 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 22 23:40:06 2013 +0200 tests: WritePixel add malloc allocated buffers. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/core/WritePixel_testsuite.gen.c.t b/tests/core/WritePixel_testsuite.gen.c.t index 859154d..c1aff24 100644 --- a/tests/core/WritePixel_testsuite.gen.c.t +++ b/tests/core/WritePixel_testsuite.gen.c.t @@ -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> * * * *****************************************************************************/ @@ -25,6 +25,8 @@ %% block body #include <stdio.h> +#include <string.h> +#include <stdlib.h> #include <core/GP_WritePixel.h> @@ -53,20 +55,15 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) * Compares two statically defined buffers */ #define COMPARE_BUFFERS(id, buf1, buf2) do { - unsigned int buf1_len = sizeof(buf1)/sizeof(*buf1); - unsigned int buf2_len = sizeof(buf2)/sizeof(*buf2); + unsigned int buf_len = sizeof(buf2)/sizeof(*buf2); unsigned int i; - if (buf1_len != buf2_len) { - tst_msg("Invalid buffers"); - return TST_FAILED; - } - for (i = 0; i < buf1_len; i++) + for (i = 0; i < buf_len; i++) if(buf1[i] != buf2[i]) { printf("%sn", id); - dump_buffer("wrote", buf1, buf1_len); - dump_buffer("gen", buf2, buf2_len); + dump_buffer("wrote", buf1, buf_len); + dump_buffer("gen", buf2, buf_len); tst_msg("Buffers are different"); return TST_FAILED; } @@ -80,7 +77,6 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) %% for aligment in [0, 4] %% if (pixelsize != 16 and pixelsize != 32) or aligment == 0 static int WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}(void) -//, {{ ""offset=%i, len=%i, aligment=%i,""|format(offset, len, aligment) }}) { char write_buf[{{ 25 * pixelsize//8 }}] = {}; char gen_buf[{{ 25 * pixelsize//8 }}] = {}; @@ -98,6 +94,32 @@ static int WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) COMPARE_BUFFERS({{""p=%i o=%i l=%i a=%i""|format(pixelsize, offset, len, aligment)}}, write_buf, gen_buf); } + +static int WritePixel{{ "_%i_%i_%i_%i_alloc"|format(pixelsize, offset, len, aligment) }}(void) +{ + char gen_buf[{{ 25 * pixelsize//8 }}] = {}; + char *write_buf = malloc({{ 25 * pixelsize//8 }}); + + /* + * Fill the compare buffer + */ +%% for i in range(0, len) +%% for j in range(0, pixelsize//8) + gen_buf[{{aligment + offset * pixelsize//8 + i * pixelsize//8 + j}}] = 0xff; +%% endfor +%% endfor + + if (gen_buf == NULL) { + tst_msg("Malloc failed :("); + return TST_UNTESTED; + } + + memset(write_buf, 0, {{ 25 * pixelsize//8 }}); + + GP_WritePixels_{{ pixelsize }}BPP(write_buf + {{aligment + offset * pixelsize//8}}, {{ len }}, 0xffffffff>>{{32 - pixelsize}}); + + COMPARE_BUFFERS({{""p=%i o=%i l=%i a=%i""|format(pixelsize, offset, len, aligment)}}, write_buf, gen_buf); +} %% endif %% endfor %% endfor @@ -112,8 +134,10 @@ const struct tst_suite tst_suite = { %% for len in range(0, 6) %% for aligment in [0, 4] %% if (pixelsize != 16 and pixelsize != 32) or aligment == 0 - {.name = "WritePixel {{ pixelsize }} {{ offset }} {{ len }} {{ aligment }}", + {.name = "WritePixel {{ pixelsize }} {{ offset }} {{ len }} {{ aligment }} stack", .tst_fn = WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}}, + {.name = "WritePixel {{ pixelsize }} {{ offset }} {{ len }} {{ aligment }} alloc", + .tst_fn = WritePixel{{ "_%i_%i_%i_%i_alloc"|format(pixelsize, offset, len, aligment) }}}, %% endif %% endfor %% endfor http://repo.or.cz/w/gfxprim.git/commit/89919678929f52f1507282364073cd4b2447… commit 89919678929f52f1507282364073cd4b24475d8c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 22 23:31:44 2013 +0200 core: WritePixel: Fix 24BPP write pixels. The problem is that the offset to 4 bytes was counted from address cast to the intptr_t which is signed type. So for big enough address it yields negative number that is unexpected value and breaks the rest of the code. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/core/GP_WritePixel.c b/libs/core/GP_WritePixel.c index e80d1e8..27b300b 100644 --- a/libs/core/GP_WritePixel.c +++ b/libs/core/GP_WritePixel.c @@ -19,7 +19,7 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -379,7 +379,7 @@ void GP_WritePixels_24BPP(void *start, size_t count, unsigned int value) return; /* How much bytes we are offset against the 32-bit boundary. */ - int shift = ((intptr_t) bytep) % 4; + int shift = ((uintptr_t) bytep) % 4; /* * Pixels remaining to draw (one less than pixelcount because http://repo.or.cz/w/gfxprim.git/commit/6e66ab22c6b2ee3f420920e62256fbbe76b3… commit 6e66ab22c6b2ee3f420920e62256fbbe76b3046f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 22 22:52:40 2013 +0200 spiv: Map arrow keys to offset by default. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index fcb7ed5..e08de82 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -673,15 +673,11 @@ static const char *keys_help[] = { "Enter", "Q - quit spiv", "", - "PgDown - move ten image forward", - "PgUp - move ten image backward", + "PgDown - move 10 images forward", + "PgUp - move 10 images backward", "", - "Right", - "Up", "Space - move to the next image", "", - "Left", - "Down", "BckSpc - move to the prev image", "", "1 - resize spiv window to the image size", @@ -993,32 +989,37 @@ int main(int argc, char *argv[]) params.show_progress_once = 1; show_image(&params, image_list_move(list, -10)); break; - next: case GP_KEY_RIGHT: - if (shift_flag) { + if (shift_flag) + set_zoom_offset(&params, 1, 0); + else set_zoom_offset(&params, 10, 0); - break; - } + + break; + case GP_KEY_LEFT: + if (shift_flag) + set_zoom_offset(&params, -1, 0); + else + set_zoom_offset(&params, -10, 0); + break; case GP_KEY_UP: - if (shift_flag) { + if (shift_flag) + set_zoom_offset(&params, 0, -1); + else set_zoom_offset(&params, 0, -10); - break; - } + break; + case GP_KEY_DOWN: + if (shift_flag) + set_zoom_offset(&params, 0, 1); + else + set_zoom_offset(&params, 0, 10); + break; + next: case GP_KEY_SPACE: params.show_progress_once = 1; show_image(&params, image_list_move(list, 1)); break; prev: - case GP_KEY_LEFT: - if (shift_flag) { - set_zoom_offset(&params, -10, 0); - break; - } - case GP_KEY_DOWN: - if (shift_flag) { - set_zoom_offset(&params, 0, 10); - break; - } case GP_KEY_BACKSPACE: params.show_progress_once = 1; show_image(&params, image_list_move(list, -1)); http://repo.or.cz/w/gfxprim.git/commit/bcc354f183de93310f42b9f5e32380bddb20… commit bcc354f183de93310f42b9f5e32380bddb207128 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 22 22:20:05 2013 +0200 tests: Add good old runtest.sh to run isolated tests. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/filters/runtest.sh b/tests/core/runtest.sh similarity index 74% copy from tests/filters/runtest.sh copy to tests/core/runtest.sh index 6b11a77..b3039a3 100755 --- a/tests/filters/runtest.sh +++ b/tests/core/runtest.sh @@ -9,5 +9,7 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FilterMirrorH "$@" -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./APICoverage.gen "$@" +TEST="$1" +shift + +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ "./$TEST" "$@" diff --git a/tests/filters/runtest.sh b/tests/filters/runtest.sh index 6b11a77..b3039a3 100755 --- a/tests/filters/runtest.sh +++ b/tests/filters/runtest.sh @@ -9,5 +9,7 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FilterMirrorH "$@" -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./APICoverage.gen "$@" +TEST="$1" +shift + +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ "./$TEST" "$@" diff --git a/tests/filters/runtest.sh b/tests/gfx/runtest.sh similarity index 74% copy from tests/filters/runtest.sh copy to tests/gfx/runtest.sh index 6b11a77..b3039a3 100755 --- a/tests/filters/runtest.sh +++ b/tests/gfx/runtest.sh @@ -9,5 +9,7 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FilterMirrorH "$@" -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./APICoverage.gen "$@" +TEST="$1" +shift + +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ "./$TEST" "$@" diff --git a/tests/filters/runtest.sh b/tests/loaders/runtest.sh similarity index 74% copy from tests/filters/runtest.sh copy to tests/loaders/runtest.sh index 6b11a77..b3039a3 100755 --- a/tests/filters/runtest.sh +++ b/tests/loaders/runtest.sh @@ -9,5 +9,7 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./FilterMirrorH "$@" -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./APICoverage.gen "$@" +TEST="$1" +shift + +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ "./$TEST" "$@" http://repo.or.cz/w/gfxprim.git/commit/799dac0a953bcba3bd8d7fc1715970113200… commit 799dac0a953bcba3bd8d7fc171597011320094a1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 22 22:15:40 2013 +0200 tests: core: WritePixel Testsuite The 16 and 32 bpp WritePixel rutines expects the buffer pointer to be aligned. There is no point in testing them with non zero aligment and moreover they fail on arch that doesn't support unaligned access. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/core/WritePixel_testsuite.gen.c.t b/tests/core/WritePixel_testsuite.gen.c.t index 0807e0f..859154d 100644 --- a/tests/core/WritePixel_testsuite.gen.c.t +++ b/tests/core/WritePixel_testsuite.gen.c.t @@ -77,7 +77,8 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) %% for pixelsize in [8, 16, 24, 32] %% for offset in range(0, 4) %% for len in range(0, 6) -%% for aligment in [0, 1] +%% for aligment in [0, 4] +%% if (pixelsize != 16 and pixelsize != 32) or aligment == 0 static int WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}(void) //, {{ ""offset=%i, len=%i, aligment=%i,""|format(offset, len, aligment) }}) { @@ -97,6 +98,7 @@ static int WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) COMPARE_BUFFERS({{""p=%i o=%i l=%i a=%i""|format(pixelsize, offset, len, aligment)}}, write_buf, gen_buf); } +%% endif %% endfor %% endfor %% endfor @@ -108,9 +110,11 @@ const struct tst_suite tst_suite = { %% for pixelsize in [8, 16, 24, 32] %% for offset in range(0, 4) %% for len in range(0, 6) -%% for aligment in [0, 1] +%% for aligment in [0, 4] +%% if (pixelsize != 16 and pixelsize != 32) or aligment == 0 {.name = "WritePixel {{ pixelsize }} {{ offset }} {{ len }} {{ aligment }}", .tst_fn = WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}}, +%% endif %% endfor %% endfor %% endfor ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 47 ++++++++-------- libs/core/GP_WritePixel.c | 4 +- tests/core/Makefile | 4 +- ...ePixel_testsuite.gen.c.t => WritePixel.gen.c.t} | 56 +++++++++++++++----- tests/{framework => core}/runtest.sh | 5 ++- tests/core/test_list.txt | 2 +- tests/filters/runtest.sh | 6 ++- tests/{framework => gfx}/runtest.sh | 5 ++- tests/{framework => loaders}/runtest.sh | 5 ++- 9 files changed, 87 insertions(+), 47 deletions(-) rename tests/core/{WritePixel_testsuite.gen.c.t => WritePixel.gen.c.t} (72%) copy tests/{framework => core}/runtest.sh (74%) copy tests/{framework => gfx}/runtest.sh (74%) copy tests/{framework => loaders}/runtest.sh (74%) 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: c5d73272e61f6d7a05a971d02480660c388bfdd2
by metan 22 Apr '13

22 Apr '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 c5d73272e61f6d7a05a971d02480660c388bfdd2 (commit) from bf32d686502d8dbe4dd7474250de61aca595cb4a (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/c5d73272e61f6d7a05a971d02480660c388b… commit c5d73272e61f6d7a05a971d02480660c388bfdd2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 23:56:39 2013 +0200 spiv: image_list: Fix order on img_prev() Now we go backwards in directories too. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/image_list.c b/demos/spiv/image_list.c index fd35669..d015a21 100644 --- a/demos/spiv/image_list.c +++ b/demos/spiv/image_list.c @@ -152,6 +152,7 @@ static void prev_img(struct image_list *self) } } + /* If we are at first image -> wrap around argv */ if (self->cur_arg == 0) self->cur_arg = self->max_arg - 1; else @@ -159,6 +160,10 @@ static void prev_img(struct image_list *self) try_load_dir(self); + /* if in directory, select last image in it */ + if (self->in_dir) + self->cur_file = self->max_file - 1; + self->path_loaded = 0; } ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_list.c | 5 +++++ 1 files changed, 5 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: bf32d686502d8dbe4dd7474250de61aca595cb4a
by gavento 21 Apr '13

21 Apr '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 bf32d686502d8dbe4dd7474250de61aca595cb4a (commit) from 36897a7fd85040415ebeeb0123e13bf9017bd86c (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/bf32d686502d8dbe4dd7474250de61aca595… commit bf32d686502d8dbe4dd7474250de61aca595cb4a Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Apr 21 19:33:25 2013 +0200 tests: fix HTML-gen sh script (dash compatibility) diff --git a/tests/framework/res2html.sh b/tests/framework/res2html.sh index 2c10a29..7141919 100755 --- a/tests/framework/res2html.sh +++ b/tests/framework/res2html.sh @@ -6,7 +6,7 @@ resdir=$1 -function die() +die() { echo "" echo "* ERROR * ERROR * ERROR * ERROR * ERROR * ERROR *" ----------------------------------------------------------------------- Summary of changes: tests/framework/res2html.sh | 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: 36897a7fd85040415ebeeb0123e13bf9017bd86c
by metan 21 Apr '13

21 Apr '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 36897a7fd85040415ebeeb0123e13bf9017bd86c (commit) via e0a8717efbbbc254122dd2336533715212206b77 (commit) via 8717d3ad7ed614d6df54b33bf70597d4976adf09 (commit) from 0825f7c5af179314d44a5ce71e5928cff7d5209b (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/36897a7fd85040415ebeeb0123e13bf9017b… commit 36897a7fd85040415ebeeb0123e13bf9017bd86c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 18:31:52 2013 +0200 tests: Hack res2html.sh Now we can convert directory of json logs into browsable and linked html pages. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/framework/log2html.py b/tests/framework/log2html.py index c417daa..2263373 100755 --- a/tests/framework/log2html.py +++ b/tests/framework/log2html.py @@ -3,7 +3,7 @@ # # Script to convert testsuite JSON log into html page # - +from sys import argv import json # @@ -274,16 +274,77 @@ class TestSuite: print(' </body>') print('</html>') + def results(self): + res_dict = {} + + for i in html_colors: + res_dict[i] = 0 + + for tst in self.test_results: + res_dict[tst.result] = res_dict[tst.result] + 1; + + return res_dict + + # Creates table row with a link to results page + def html_summary(self, link): + print(' <tr>') + + res_dict = self.results() + + test_ok = res_dict['Success'] + test_ok += res_dict['Skipped'] + test_ok += res_dict['Untested'] + + test_all = len(self.test_results) + + if (test_ok < test_all): + bg_color = html_colors['Failed'] + else: + bg_color = '#ccccee' + + + + print(' <td bgcolor="#ccccee">%s</td>' % (self.suite_name)) + print(' <td bgcolor="%s">%i</td>' % (bg_color, test_all - test_ok)) + + test_skipped = res_dict['Skipped'] + + if (test_skipped > 0): + bg_color = html_colors['Skipped'] + else: + bg_color = '#ccccee' + + print(' <td bgcolor="%s">%i</td>' % (bg_color, test_skipped)) + print(' <td bgcolor="#ccccee">%i</td>' % (test_all)) + print(' <td bgcolor="#ccccee"><small><a href="%s">Details</a></small></td>' % (link)) + print(' </tr>') + def main(): + filename = 'log.json' + summary = False + pars = 1 + link = '' + + if (len(argv) > 1 and argv[1] == '-s'): + link = argv[2] + pars = 3 + summary = True + + if (len(argv) > pars): + filename = argv[pars] + # parse JSON - f = open('log.json') + f = open(filename) data = json.load(f) f.close() # convert to python objects test_suite = TestSuite(data) - - test_suite.html() + + if (summary): + test_suite.html_summary(link) + else: + test_suite.html() if __name__ == '__main__': main() diff --git a/tests/framework/res2html.sh b/tests/framework/res2html.sh new file mode 100755 index 0000000..2c10a29 --- /dev/null +++ b/tests/framework/res2html.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +# +# Quick hack to generate html from result directory +# + +resdir=$1 + +function die() +{ + echo "" + echo "* ERROR * ERROR * ERROR * ERROR * ERROR * ERROR *" + echo "" + echo "$1" + echo "" + echo "* ERROR * ERROR * ERROR * ERROR * ERROR * ERROR *" + echo "" + exit 1 +} + +BINDIR=$(pwd) + +echo "Running in resdir $resdir" + +cd "$resdir" || die "Failed to cd into $resdir" + +echo "<html>" > index.html +echo " <head>" >> index.html +echo " </head>" >> index.html +echo " <body>" >> index.html +echo " <h1>Test Results</h1>" >> index.html +echo " <table bgcolor="#99a">" >> index.html +echo " <tr bgcolor="#bbbbff">" >> index.html +echo " <td><b>Suite</b></td>" >> index.html +echo " <td><b>Fail</b></td>" >> index.html +echo " <td><b>Skip</b></td>" >> index.html +echo " <td><b>All</b></td>" >> index.html +echo " <td><b>Link</b></td>" >> index.html +echo " </tr>" >> index.html + +for i in *; do + if ! [ -d "$i" ]; then + continue + fi + + echo " <tr><td colspan="6" bgcolor="#bbf"> $i</td></tr>" >> index.html + + for j in "$i/"*.json; do + ts_name=$(basename "$j" ".json") + echo "$j -> $i/$ts_name.html" + $BINDIR/log2html.py -s "$i/$ts_name.html" "$j" >> index.html + $BINDIR/log2html.py "$j" > "$i/$ts_name.html" + done +done + +echo " </table>" >> index.html +echo " </body>" >> index.html +echo "</html>" >> index.html http://repo.or.cz/w/gfxprim.git/commit/e0a8717efbbbc254122dd233653371521220… commit e0a8717efbbbc254122dd2336533715212206b77 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 16:13:50 2013 +0200 build: configure: Fix python version detection bug. If there is no python-config we can't run the version detection code. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/configure b/configure index af9f8fc..9deeb6c 100755 --- a/configure +++ b/configure @@ -40,7 +40,11 @@ def c_compiler_exists(cfg): def python_version(cfg): sys.stderr.write("Cddhecking for python-config Python version ... ") - + + if (cfg['PYTHON_CONFIG'][0] is ''): + sys.stderr.write('NAn') + return '' + res = str(check_output("%s --ldflags" % cfg['PYTHON_CONFIG'][0], shell=True)) res = res[res.find('-lpython')+8:] res = res[:3] http://repo.or.cz/w/gfxprim.git/commit/8717d3ad7ed614d6df54b33bf70597d4976a… commit 8717d3ad7ed614d6df54b33bf70597d4976adf09 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 16:11:18 2013 +0200 pywrap: gfx: Remove references to removed Symbol() Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/gfx/__init__.py b/pylib/gfxprim/gfx/__init__.py index 2b8d310..dc2e9a9 100644 --- a/pylib/gfxprim/gfx/__init__.py +++ b/pylib/gfxprim/gfx/__init__.py @@ -37,9 +37,9 @@ def _init(module): for name in [ 'ArcSegment', 'Circle', 'Ellipse', 'Fill', 'FillCircle', 'FillEllipse', - 'FillRect', 'FillRect_AA', 'FillRing', 'FillSymbol', + 'FillRect', 'FillRect_AA', 'FillRing', 'FillTetragon', 'FillTriangle', 'HLine', 'HLineAA', 'Line', 'LineAA', - 'PutPixelAA', 'Rect', 'Ring', 'Symbol', 'Tetragon', + 'PutPixelAA', 'Rect', 'Ring', 'Tetragon', 'Triangle', 'VLine', 'VLineAA']: extend_submodule(GfxSubmodule, name, c_gfx.__getattribute__('GP_' + name)) diff --git a/tests/pylib/test_gfx.py b/tests/pylib/test_gfx.py index ac5ec2c..292202a 100644 --- a/tests/pylib/test_gfx.py +++ b/tests/pylib/test_gfx.py @@ -32,7 +32,6 @@ gfx_params = { 'FillRect': 'IIIIP', 'FillRect_AA': 'IIIIP', # Fixpoint, originally 'FFFFP' 'FillRing': 'IIIIP', - 'FillSymbol': '0IIIIP', 'FillTetragon': 'IIIIIIIIP', 'FillTriangle': 'IIIIIIP', 'HLine': 'IIIP', @@ -43,7 +42,6 @@ gfx_params = { 'PutPixelAA': 'IIP', # Fixpoint, originally 'FFP' 'Rect': 'IIIIP', 'Ring': 'IIIIP', - 'Symbol': '0IIIIP', 'Tetragon': 'IIIIIIIIP', 'Triangle': 'IIIIIIP', 'VLine': 'IIIP', ----------------------------------------------------------------------- Summary of changes: configure | 6 +++- pylib/gfxprim/gfx/__init__.py | 4 +- tests/framework/log2html.py | 69 ++++++++++++++++++++++++++++++++++++++-- tests/framework/res2html.sh | 58 ++++++++++++++++++++++++++++++++++ tests/pylib/test_gfx.py | 2 - 5 files changed, 130 insertions(+), 9 deletions(-) create mode 100755 tests/framework/res2html.sh 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: 0825f7c5af179314d44a5ce71e5928cff7d5209b
by metan 21 Apr '13

21 Apr '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 0825f7c5af179314d44a5ce71e5928cff7d5209b (commit) from bb4ceb0a3292d5eebec518820141e1690142585d (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/0825f7c5af179314d44a5ce71e5928cff7d5… commit 0825f7c5af179314d44a5ce71e5928cff7d5209b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 13:00:23 2013 +0200 doc: Update and reformat implemented filters tables Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/general.txt b/doc/general.txt index 260e186..a8b6438 100644 --- a/doc/general.txt +++ b/doc/general.txt @@ -129,12 +129,12 @@ image filters. .Currently Implemented Linear Filters [width="100%",options="header"] |============================================================================= -| Filter Name | Supported Pixel Type | Mutithreaded -| Convolution | RGB888 | Yes -| Separable Convolution | RGB888 | Yes -| Gaussian Blur | RGB888 | Yes -| Sobel Edge Detection | RGB888 | Yes -| Prewitt Edge Detection | RGB888 | Yes +| Filter Name | Supported Pixel Type | Mutithreaded +| Convolution | RGB888 | Yes +| Separable Convolution | RGB888 | Yes +| Gaussian Blur | RGB888 | Yes +| Sobel Edge Detection | RGB888 | Yes +| Prewitt Edge Detection | RGB888 | Yes |============================================================================= NOTE: Linear filters are implemented using generic convolution filters, once @@ -155,41 +155,41 @@ NOTE: Linear filters are implemented using generic convolution filters, once .Currently Implemented Ditherings [width="100%",options="header"] |============================================================================= -| Filter Name | Supported Pixel Type | Multithreaded -| Floyd Steinberg | RGB888 -> Any | No -| Hilbert Peano | RGB888 -> Any | No +| Filter Name | Supported Pixel Type | Multithreaded + | Floyd Steinberg | RGB888 -> Any | No +| Hilbert Peano | RGB888 -> Any | No |============================================================================= .Currently Implemented Resamplings [width="100%",options="header"] |============================================================================= -| Filter Name | Supported Pixel Type | Multithreaded -| Nearest Neighbour | All | No -| Bilinear (Integer Arithmetics) | RGB888 | No -| Bicubic (Integer Arithmetics) | All | No -| Bicubic (Float Arithmetics) | RGB888 | No +| Filter Name | Supported Pixel Type | Multithreaded +| Nearest Neighbour | All | No +| Bilinear (Integer Arithmetics) | All | No +| Bicubic (Integer Arithmetics) | All | No +| Bicubic (Float Arithmetics) | RGB888 | No |============================================================================= .Rotation and mirroring [width="100%",options="header"] |============================================================================= -| Filter Name | Supported Pixel Type | Multithreaded -| Rotate 90 | All | No -| Rotate 180 | All | No -| Rotate 270 | All | No -| Mirror Vertically | All | No -| Mirror Horizontally | All | No +| Filter Name | Supported Pixel Type | Multithreaded +| Rotate 90 | All | No +| Rotate 180 | All | No +| Rotate 270 | All | No +| Mirror Vertically | All | No +| Mirror Horizontally | All | No |============================================================================= .Misc filters [width="100%",options="header"] |============================================================================= -| Filter Name | Supported Pixel Type | Multithreaded -| Histogram | All | No -| Additive Gaussian Noise | All | No -| Median | RGB888 | No -| Weighted Median | RGB888 | No -| Sigma Lee | RGB888 | No +| Filter Name | Supported Pixel Type | Multithreaded +| Histogram | All | No +| Additive Gaussian Noise | All | No +| Median | RGB888 | No +| Weighted Median | RGB888 | No +| Sigma Lee | RGB888 | No |============================================================================= Backends ----------------------------------------------------------------------- Summary of changes: doc/general.txt | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 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: bb4ceb0a3292d5eebec518820141e1690142585d
by metan 21 Apr '13

21 Apr '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 bb4ceb0a3292d5eebec518820141e1690142585d (commit) via 5c4d958af36978c2a964dfd3d3988eee1faf53c8 (commit) from d20e72b9039d42747114efd7fa188d9ae416ab4a (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/bb4ceb0a3292d5eebec518820141e1690142… commit bb4ceb0a3292d5eebec518820141e1690142585d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 11:47:09 2013 +0200 gfx: Remove unused and broken GP_Symbol(). Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/include/gfx/GP_Gfx.h b/include/gfx/GP_Gfx.h index df86280..f2a1b77 100644 --- a/include/gfx/GP_Gfx.h +++ b/include/gfx/GP_Gfx.h @@ -50,7 +50,6 @@ #include "GP_Ellipse.h" #include "GP_Arc.h" #include "GP_Polygon.h" -#include "GP_Symbol.h" #include "GP_PutPixelAA.h" #include "GP_VLineAA.h" diff --git a/include/gfx/GP_Symbol.h b/include/gfx/GP_Symbol.h deleted file mode 100644 index 8a9f2df..0000000 --- a/include/gfx/GP_Symbol.h +++ /dev/null @@ -1,63 +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-2011 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - - /* - * Draws a symbol into rectangle. - */ - -#ifndef GP_SYMBOL_H -#define GP_SYMBOL_H - -#include "core/GP_Types.h" - -typedef enum GP_SymbolType { - GP_SYM_TRIANGLE_UP, - GP_SYM_TRIANGLE_DOWN, - GP_SYM_TRIANGLE_LEFT, - GP_SYM_TRIANGLE_RIGHT, - GP_SYM_MAX, -} GP_SymbolType; - -/* Symbol */ - -void GP_Symbol(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Pixel pixel); - -void GP_Symbol_Raw(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Pixel pixel); - -/* Filled Symbol */ - -void GP_FillSymbol(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Pixel pixel); - -void GP_FillSymbol_Raw(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Pixel pixel); - -#endif /* GP_SYMBOL_H */ diff --git a/libs/gfx/GP_Symbol.c b/libs/gfx/GP_Symbol.c deleted file mode 100644 index fcf61c7..0000000 --- a/libs/gfx/GP_Symbol.c +++ /dev/null @@ -1,193 +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-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include "GP_Gfx.h" - -#define DO_TRIANGLE_UP(x, y, w, h) - x, y + h, x + w, y + h, x + w/2, y - -#define DO_TRIANGLE_DOWN(x, y, w, h) - x, y, x + w, y, x + w/2, y + h - - -#define DO_TRIANGLE_LEFT(x, y, w, h) - x + w, y, x + w, y + h, x, y + h/2 - - -#define DO_TRIANGLE_RIGHT(x, y, w, h) - x, y, x, y + h, x + w, y + h/2 - -#define DO_TETRAGON_UP(x, y, w, h) - DO_TRIANGLE_UP(x, y, w, h), x + w/2 + 1, y - -#define DO_TETRAGON_DOWN(x, y, w, h) - DO_TRIANGLE_DOWN(x, y, w, h), x + w/2 + 1, y + h - -#define DO_TETRAGON_LEFT(x, y, w, h) - DO_TRIANGLE_LEFT(x, y, w, h), x , y + h/2 + 1 - -#define DO_TETRAGON_RIGHT(x, y, w, h) - DO_TRIANGLE_RIGHT(x, y, w, h), x + w , y + h/2 + 1 - -#define DO_DECREMENT(a) do { - if ((a) == 0) - return; - (a)--; -} while (0) - -/* - * Generate code for triangle - */ -#define TRIANGLE(context, base, x, y, w, h, fn_pref, - TRIANGLE_PARAMS, TETRAGON_PARAMS, pixel) do { - if (base % 2) - fn_pref##Tetragon(context, TETRAGON_PARAMS(x, y, w, h), pixel);- else - fn_pref##Triangle(context, TRIANGLE_PARAMS(x, y, w, h), pixel);-} while (0) - -#define TRIANGLE_RAW(context, base, x, y, w, h, fn_pref, - TRIANGLE_PARAMS, TETRAGON_PARAMS, pixel) do { - if (base % 2) - fn_pref##Tetragon_Raw(context, TETRAGON_PARAMS(x, y, w, h), pixel);- else - fn_pref##Triangle_Raw(context, TRIANGLE_PARAMS(x, y, w, h), pixel);-} while (0) - -void GP_Symbol_Raw(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - GP_Pixel pixel) -{ - DO_DECREMENT(w); - DO_DECREMENT(h); - - switch (sym) { - case GP_SYM_TRIANGLE_UP: - TRIANGLE_RAW(context, w, x, y, w, h, GP_, - DO_TRIANGLE_UP, DO_TETRAGON_UP, pixel); - break; - case GP_SYM_TRIANGLE_DOWN: - TRIANGLE_RAW(context, w, x, y, w, h, GP_, - DO_TRIANGLE_DOWN, DO_TETRAGON_DOWN, pixel); - break; - case GP_SYM_TRIANGLE_LEFT: - TRIANGLE_RAW(context, h, x, y, w, h, GP_, - DO_TRIANGLE_LEFT, DO_TETRAGON_LEFT, pixel); - break; - case GP_SYM_TRIANGLE_RIGHT: - TRIANGLE_RAW(context, h, x, y, w, h, GP_, - DO_TRIANGLE_RIGHT, DO_TETRAGON_RIGHT, pixel); - break; - default: - break; - } -} - -void GP_FillSymbol_Raw(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - GP_Pixel pixel) -{ - DO_DECREMENT(w); - DO_DECREMENT(h); - - switch (sym) { - case GP_SYM_TRIANGLE_UP: - TRIANGLE_RAW(context, w, x, y, w, h, GP_Fill, - DO_TRIANGLE_UP, DO_TETRAGON_UP, pixel); - break; - case GP_SYM_TRIANGLE_DOWN: - TRIANGLE_RAW(context, w, x, y, w, h, GP_Fill, - DO_TRIANGLE_DOWN, DO_TETRAGON_DOWN, pixel); - break; - case GP_SYM_TRIANGLE_LEFT: - TRIANGLE_RAW(context, h, x, y, w, h, GP_Fill, - DO_TRIANGLE_LEFT, DO_TETRAGON_LEFT, pixel); - break; - case GP_SYM_TRIANGLE_RIGHT: - TRIANGLE_RAW(context, h, x, y, w, h, GP_Fill, - DO_TRIANGLE_RIGHT, DO_TETRAGON_RIGHT, pixel); - break; - default: - break; - } -} - -void GP_Symbol(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - GP_Pixel pixel) -{ - DO_DECREMENT(w); - DO_DECREMENT(h); - - switch (sym) { - case GP_SYM_TRIANGLE_UP: - TRIANGLE(context, w, x, y, w, h, GP_, - DO_TRIANGLE_UP, DO_TETRAGON_UP, pixel); - break; - case GP_SYM_TRIANGLE_DOWN: - TRIANGLE(context, w, x, y, w, h, GP_, - DO_TRIANGLE_DOWN, DO_TETRAGON_DOWN, pixel); - break; - case GP_SYM_TRIANGLE_LEFT: - TRIANGLE(context, h, x, y, w, h, GP_, - DO_TRIANGLE_LEFT, DO_TETRAGON_LEFT, pixel); - break; - case GP_SYM_TRIANGLE_RIGHT: - TRIANGLE(context, h, x, y, w, h, GP_, - DO_TRIANGLE_RIGHT, DO_TETRAGON_RIGHT, pixel); - break; - default: - break; - } -} - -void GP_FillSymbol(GP_Context *context, GP_SymbolType sym, - GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Pixel pixel) -{ - DO_DECREMENT(w); - DO_DECREMENT(h); - - switch (sym) { - case GP_SYM_TRIANGLE_UP: - TRIANGLE(context, w, x, y, w, h, GP_Fill, - DO_TRIANGLE_UP, DO_TETRAGON_UP, pixel); - break; - case GP_SYM_TRIANGLE_DOWN: - TRIANGLE(context, w, x, y, w, h, GP_Fill, - DO_TRIANGLE_DOWN, DO_TETRAGON_DOWN, pixel); - break; - case GP_SYM_TRIANGLE_LEFT: - TRIANGLE(context, h, x, y, w, h, GP_Fill, - DO_TRIANGLE_LEFT, DO_TETRAGON_LEFT, pixel); - break; - case GP_SYM_TRIANGLE_RIGHT: - TRIANGLE(context, h, x, y, w, h, GP_Fill, - DO_TRIANGLE_RIGHT, DO_TETRAGON_RIGHT, pixel); - break; - default: - break; - } -} diff --git a/pylib/gfxprim/gfx/gfx.i b/pylib/gfxprim/gfx/gfx.i index 9d3b0c4..e09e633 100644 --- a/pylib/gfxprim/gfx/gfx.i +++ b/pylib/gfxprim/gfx/gfx.i @@ -22,7 +22,6 @@ %include "GP_Ellipse.h" %include "GP_Arc.h" %include "GP_Polygon.h" -%include "GP_Symbol.h" %include "GP_PutPixelAA.h" %include "GP_VLineAA.h" http://repo.or.cz/w/gfxprim.git/commit/5c4d958af36978c2a964dfd3d3988eee1faf… commit 5c4d958af36978c2a964dfd3d3988eee1faf53c8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Apr 21 11:39:41 2013 +0200 filters: Write correct template for rotate by 180. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/filters/GP_Rotate.c b/libs/filters/GP_Rotate.c index 99fac5b..4adb911 100644 --- a/libs/filters/GP_Rotate.c +++ b/libs/filters/GP_Rotate.c @@ -139,17 +139,6 @@ GP_Context *GP_FilterMirrorVAlloc(const GP_Context *src, return res; } -int GP_FilterRotate180_Raw(const GP_Context *src, GP_Context *dst, - GP_ProgressCallback *callback) -{ - #warning FIXME: Callbacks, faster algorighm? - - GP_FilterMirrorV_Raw(src, dst, NULL); - GP_FilterMirrorH_Raw(dst, dst, callback); - - return 0; -} - int GP_FilterRotate90(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { diff --git a/libs/filters/GP_Rotate.gen.c.t b/libs/filters/GP_Rotate.gen.c.t index 709a60d..391d04f 100644 --- a/libs/filters/GP_Rotate.gen.c.t +++ b/libs/filters/GP_Rotate.gen.c.t @@ -61,6 +61,46 @@ int GP_FilterRotate90_Raw(const GP_Context *src, GP_Context *dst, return 1; } +%% macro swap_pixels(ps, src, dst, x0, y0, x1, y1) + GP_Pixel pix0 = GP_GetPixel_Raw_{{ ps.suffix }}({{ src }}, {{ x0 }}, {{ y0 }}); + GP_Pixel pix1 = GP_GetPixel_Raw_{{ ps.suffix }}({{ src }}, {{ x1 }}, {{ y1 }}); + GP_PutPixel_Raw_{{ ps.suffix }}({{ dst }}, {{ x0 }}, {{ y0 }}, pix1); + GP_PutPixel_Raw_{{ ps.suffix }}({{ dst }}, {{ x1 }}, {{ y1 }}, pix0); +%% endmacro + +%% for ps in pixelsizes +static int GP_FilterRotate180_Raw_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + uint32_t x, y; + + GP_DEBUG(1, "Rotating image by 180 %ux%u", src->w, src->h); + + for (x = 0; x < src->w; x++) { + for (y = 0; y < src->h; y++) { + uint32_t xr = src->w - x - 1; + uint32_t yr = src->h - y - 1; + + {{ swap_pixels(ps, 'src', 'dst', 'x', 'y', 'xr', 'yr') }} + } + + if (GP_ProgressCallbackReport(callback, x, src->w, src->h)) + return 1; + } + + GP_ProgressCallbackDone(callback); + return 0; +} + +%% endfor + +int GP_FilterRotate180_Raw(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + GP_FN_RET_PER_BPP_CONTEXT(GP_FilterRotate180_Raw, src, src, dst, callback); + return 1; +} + %% for ps in pixelsizes static int GP_FilterRotate270_Raw_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) ----------------------------------------------------------------------- Summary of changes: include/gfx/GP_Gfx.h | 1 - include/gfx/GP_Symbol.h | 63 ------------- libs/filters/GP_Rotate.c | 11 --- libs/filters/GP_Rotate.gen.c.t | 40 ++++++++ libs/gfx/GP_Symbol.c | 193 ---------------------------------------- pylib/gfxprim/gfx/gfx.i | 1 - 6 files changed, 40 insertions(+), 269 deletions(-) delete mode 100644 include/gfx/GP_Symbol.h delete mode 100644 libs/gfx/GP_Symbol.c 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: d20e72b9039d42747114efd7fa188d9ae416ab4a
by gavento 20 Apr '13

20 Apr '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 d20e72b9039d42747114efd7fa188d9ae416ab4a (commit) via a7351900dbacf08c27745b443dbac747f82112fd (commit) from 3b3c1affc1f82aacdad1116ab6838aea6dd18a7a (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/d20e72b9039d42747114efd7fa188d9ae416… commit d20e72b9039d42747114efd7fa188d9ae416ab4a Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Apr 20 01:05:01 2013 +0200 pytest: fix AA test parameters (float->fixpoint) diff --git a/tests/pylib/test_gfx.py b/tests/pylib/test_gfx.py index 9b854cb..ac5ec2c 100644 --- a/tests/pylib/test_gfx.py +++ b/tests/pylib/test_gfx.py @@ -30,24 +30,24 @@ gfx_params = { 'FillEllipse': 'IIIIP', 'FillPolygon': ([(0,0),(1,1),(1,0)], 0, {}), 'FillRect': 'IIIIP', - 'FillRect_AA': 'FFFFP', + 'FillRect_AA': 'IIIIP', # Fixpoint, originally 'FFFFP' 'FillRing': 'IIIIP', 'FillSymbol': '0IIIIP', 'FillTetragon': 'IIIIIIIIP', 'FillTriangle': 'IIIIIIP', 'HLine': 'IIIP', - 'HLineAA': 'FFFP', + 'HLineAA': 'IIIP', # Fixpoint, originally 'FFFP' 'Line': 'IIIIP', - 'LineAA': 'FFFFP', + 'LineAA': 'IIIIP', # Fixpoint, originally 'FFFFP' 'Polygon': ([(0,0),(1,1),(1,0)], 0, {}), - 'PutPixelAA': 'FFP', + 'PutPixelAA': 'IIP', # Fixpoint, originally 'FFP' 'Rect': 'IIIIP', 'Ring': 'IIIIP', 'Symbol': '0IIIIP', 'Tetragon': 'IIIIIIIIP', 'Triangle': 'IIIIIIP', 'VLine': 'IIIP', - 'VLineAA': 'FFFP', + 'VLineAA': 'IIIP', # Fixpoint, originally 'FFFP' } http://repo.or.cz/w/gfxprim.git/commit/a7351900dbacf08c27745b443dbac747f821… commit a7351900dbacf08c27745b443dbac747f82112fd Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Apr 20 01:04:11 2013 +0200 pytest: Fix Blit with alpha channel test diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index 80d0408..894695a 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -104,6 +104,12 @@ def test_blit_vs_convert_to_RGB888(t): raise SkipTest("Palette conversions are TODO") c = ContextRand(42, 43, t, seed=0) c2a = ContextRand(c.w, c.h, core.C.PIXEL_RGB888, seed=42) + if 'A' in t.name: + try: + import gfxprim.gfx + except ImportError: + raise SkipTest("Could not import gfx for core test") + c2a.gfx.Fill(0) c2b = c.Convert(core.C.PIXEL_RGB888) c.Blit(0, 0, c2a, 0, 0, w=c.w, h=c.h) assert c2a == c2b ----------------------------------------------------------------------- Summary of changes: tests/pylib/test_core.py | 6 ++++++ tests/pylib/test_gfx.py | 10 +++++----- 2 files changed, 11 insertions(+), 5 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: 3b3c1affc1f82aacdad1116ab6838aea6dd18a7a
by metan 20 Apr '13

20 Apr '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 3b3c1affc1f82aacdad1116ab6838aea6dd18a7a (commit) from 93fe2dde68b7eb9a2d22c4006e5c9d03c4e2485c (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/3b3c1affc1f82aacdad1116ab6838aea6dd1… commit 3b3c1affc1f82aacdad1116ab6838aea6dd18a7a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 20 00:48:35 2013 +0200 build: Revert the python suffix back to .so Fixes build for python2.7 Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pywrap.mk b/pywrap.mk index 1cd89e5..9b4fcba 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -6,7 +6,8 @@ ifdef SWIG ifdef PYTHON_CONFIG INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE)) -PY_SUFFIX=$(shell $(PYTHON_CONFIG) --extension-suffix) +#PY_SUFFIX=$(shell $(PYTHON_CONFIG) --extension-suffix) +PY_SUFFIX=.so SWIG_SRC=$(LIBNAME).i SWIG_C=$(LIBNAME)_wrap.c ----------------------------------------------------------------------- Summary of changes: pywrap.mk | 3 ++- 1 files changed, 2 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