X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fsig-init.c;h=34089216881b9df21dda913d211bc891ab49c087;hb=d5fdccbecd2acde9a6e067b54fcd69b02f31a820;hp=8a3b5ea2ab924861b81142058042fbe0dc9800c7;hpb=72b8acb9dee50bf94aac3288eade0e91381cb082;p=libucw.git

diff --git a/images/sig-init.c b/images/sig-init.c
index 8a3b5ea2..34089216 100644
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -9,10 +9,9 @@
 
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
-#include "lib/fastbuf.h"
-#include "lib/conf.h"
-#include "lib/math.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"
+#include "ucw/conf.h"
 #include "images/images.h"
 #include "images/math.h"
 #include "images/error.h"
@@ -20,6 +19,7 @@
 #include "images/signature.h"
 
 #include <alloca.h>
+#include <math.h>
 
 int
 image_sig_init(struct image_context *ctx, struct image_sig_data *data, struct image *image)
@@ -104,14 +104,14 @@ image_sig_preprocess(struct image_sig_data *data)
 		    }
 		  for (; x < 4; x++)
 		    {
-		      *tp = tp[-square_cols];
+		      *tp = tp[-(int)square_cols];
 		      tp++;
 		    }
 	        }
 	      for (; y < 4; y++)
 	        for (x = 0; x < 4; x++)
 	          {
-	            *tp = tp[-square_rows * 4];
+	            *tp = tp[-(int)square_rows * 4];
 		    tp++;
 		  }
 	      block->area = square_cols * square_rows;
@@ -188,7 +188,7 @@ image_sig_finish(struct image_sig_data *data, struct image_signature *sig)
   sig->flags = data->flags;
   if (!sig->len)
     return;
-  
+
   /* For each region */
   u64 w_total = 0;
   uns w_border = MIN(data->cols, data->rows) * image_sig_border_size;