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 adef520463dc58869ba1570a8d5cd05b7691091a (commit) from f278f7d7683d97876757877353550e431700d180 (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/adef520463dc58869ba1570a8d5cd05b76910... commit adef520463dc58869ba1570a8d5cd05b7691091a Author: Cyril Hrubis <metan@ucw.cz> Date: Sun May 27 14:40:52 2012 +0200 spiv: Move the resampling workaround to a correct place. diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 77c3bc4..91b9f35 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -152,6 +152,14 @@ int load_image(struct loader_params *params) GP_BackendFlip(backend); return 1; } + + /* Workaround */ + if (img->pixel_type != GP_PIXEL_RGB888) { + GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); + GP_ContextFree(img); + img = tmp; + } + cpu_timer_stop(&timer); params->img = img; @@ -221,13 +229,6 @@ static void *image_loader(void *ptr) w = img->w; h = img->h; - /* Workaround */ - if (img->pixel_type != GP_PIXEL_RGB888) { - GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); - GP_ContextFree(img); - img = tmp; - } - GP_Context *ret; /* Do low pass filter */ ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")