bugfix

diff --git a/images/image-sig.c b/images/image-sig.c
index ebce51972a24f61b0e7e42784c2b36d9f25aad93..a32b8016f2ed770a50c623e4959e84d15f8ae4ad 100644 (file)
--- 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 6ea0e2367415581e51923631e44c1ea318a7c86d..979a6a098ff966738f2347cd53520c6fbfe2bb68 100644 (file)
--- 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 <fcntl.h>
 #include <stdio.h>