From: Pavel Charvat Date: Wed, 12 Apr 2006 16:25:35 +0000 (+0200) Subject: bugfix X-Git-Tag: holmes-import~654 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=246b575a99b2bba95669d6d2c7ea811246a2fd09;p=libucw.git bugfix --- diff --git a/images/image-sig.c b/images/image-sig.c index ebce5197..a32b8016 100644 --- a/images/image-sig.c +++ b/images/image-sig.c @@ -72,11 +72,11 @@ compute_image_area_signature(PixelPacket *pixels, uns width, uns height, struct /* Every 4x4 block (FIXME: deal with smaller blocks near the edges) */ PixelPacket *p = pixels; - for (uns block_y = 0; block_y < h; block_y++, p += width & 3 + width * 3) + for (uns block_y = 0; block_y < h; block_y++, p += (width & 3) + width * 3) for (uns block_x = 0; block_x < w; block_x++, p -= 4 * width - 4, block++) { int t[16], s[16], *tp = t; - + /* Convert pixels to Luv color space and compute average coefficients * FIXME: * - could be MUCH faster with precomputed tables and integer arithmetic... @@ -101,7 +101,7 @@ compute_image_area_signature(PixelPacket *pixels, uns width, uns height, struct block->l = l_sum; block->u = u_sum; block->v = v_sum; - + /* Apply Daubechies wavelet transformation * FIXME: * - MMX/SSE instructions or tables could be faster diff --git a/images/image-test.c b/images/image-test.c index 6ea0e236..979a6a09 100644 --- a/images/image-test.c +++ b/images/image-test.c @@ -8,7 +8,6 @@ #include "lib/mempool.h" #include "sherlock/object.h" #include "sherlock/lizard-fb.h" -#include "sherlock/lizard-fb.h" #include #include