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 6cc8cbbe7416776f1349a808a7c12fde991a49aa (commit) via 0adeef8600221b641cdc7dcb94b8a78f8d7b17de (commit) from 19c17eca8a9cfe5e86527548a50512d43ff26cf0 (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/6cc8cbbe7416776f1349a808a7c12fde991a4... commit 6cc8cbbe7416776f1349a808a7c12fde991a49aa Merge: 0adeef8 19c17ec Author: Cyril Hrubis <metan@ucw.cz> Date: Tue Jan 1 21:37:32 2013 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/0adeef8600221b641cdc7dcb94b8a78f8d7b1... commit 0adeef8600221b641cdc7dcb94b8a78f8d7b17de Author: Cyril Hrubis <metan@ucw.cz> Date: Tue Jan 1 21:36:06 2013 +0100 core: Comment out broken blit optimalization. The optimalization code for not byte aligned pixels is wrong and triggers asserts. Comment it out and make use of the naive implementation for now. diff --git a/libs/core/GP_Blit.gen.c.t b/libs/core/GP_Blit.gen.c.t index 07a153c..0c482af 100644 --- a/libs/core/GP_Blit.gen.c.t +++ b/libs/core/GP_Blit.gen.c.t @@ -64,7 +64,7 @@ static void blitXYXY_Raw_{{ ps.suffix }}(const GP_Context *src, GP_PIXEL_ADDR_{{ ps.suffix }}(src, x0, y0 + y), {{ int(ps.size/8) }} * (x1 - x0 + 1)); %% else - /* Rectangles may not be bit-aligned in the same way! */ +{# /* Rectangles may not be bit-aligned in the same way! */ /* Alignment (index) of first bits in the first byte */ //TODO: This is wrong for subcontexts where the offset // needs to be summed with context->offset and moduled @@ -96,6 +96,7 @@ static void blitXYXY_Raw_{{ ps.suffix }}(const GP_Context *src, end_p2 += dst->bytes_per_row; } } else /* Different bit-alignment, can't use memcpy() */ +#} blitXYXY_Naive_Raw(src, x0, y0, x1, y1, dst, x2, y2); %% endif } ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Blit.gen.c.t | 3 ++- 1 files changed, 2 insertions(+), 1 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.")