Small changes in XML parser:

[libucw.git] / images / sig-init.c

diff --git a/images/sig-init.c b/images/sig-init.c
index 8a3b5ea2ab924861b81142058042fbe0dc9800c7..60b53350548ee642554565df51f3521d475d33fa 100644 (file)
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -9,10 +9,9 @@
 
 #undef LOCAL_DEBUG
 
 
 #undef LOCAL_DEBUG
 

-#include "sherlock/sherlock.h"
+#include "lib/lib.h"

 #include "lib/fastbuf.h"
 #include "lib/conf.h"
 #include "lib/fastbuf.h"
 #include "lib/conf.h"

-#include "lib/math.h"

 #include "images/images.h"
 #include "images/math.h"
 #include "images/error.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 "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)
 
 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++)
                    {
                    }
                  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++;
                    }
                }
              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;
                    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;
   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;
   /* For each region */
   u64 w_total = 0;
   uns w_border = MIN(data->cols, data->rows) * image_sig_border_size;