From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 8 Aug 2006 17:58:54 +0000 (+0200)
Subject: fixed bugfix in io-main and one more bug in signatures :)
X-Git-Tag: holmes-import~605
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=7bd1b500f539c168df536dccf41fa810eaa10cb4;p=libucw.git

fixed bugfix in io-main and one more bug in signatures :)
---

diff --git a/images/io-main.c b/images/io-main.c
index c0907841..441f6696 100644
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -284,7 +284,7 @@ image_io_read_data_finish(struct image_io_read_data_internals *rdi, struct image
         {
 	  DBG("Aplying background");
 	  uns flags = rdi->image->flags & ~IMAGE_ALPHA;
-	  if (!(rdi->need_transformations = (flags & io->flags) & (IMAGE_NEW_FLAGS & ~IMAGE_PIXELS_ALIGNED)))
+	  if (!(rdi->need_transformations = (flags ^ io->flags) & (IMAGE_NEW_FLAGS & ~IMAGE_PIXELS_ALIGNED)))
 	    flags = io->flags;
 	  struct image *img = image_new(io->thread, io->cols, io->rows, flags, rdi->need_transformations ? NULL : io->pool);
 	  if (unlikely(!img))
diff --git a/images/sig-init.c b/images/sig-init.c
index 2dba481c..9c9db6c3 100644
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -154,7 +154,7 @@ compute_image_signature(struct image_thread *thread, struct image_signature *sig
   uns rows = image->rows;
 
   /* FIXME: deal with smaller images */
-  if (cols < 4 || cols < 4)
+  if (cols < 4 || rows < 4)
     {
       image_thread_err_format(thread, IMAGE_ERR_INVALID_DIMENSIONS, "Image too small... %ux%u", cols, rows);
       return 0;
@@ -324,22 +324,31 @@ compute_image_signature(struct image_thread *thread, struct image_signature *sig
 
   /* Compute average differences */
   u64 df = 0, dh = 0;
-  uns cnt = 0;
-  for (uns i = 0; i < sig->len; i++)
-    for (uns j = i + 1; j < sig->len; j++)
-      {
-	uns d = 0;
-	for (uns k = 0; k < IMAGE_REG_F; k++)
-	  d += dist(sig->reg[i].f[k], sig->reg[j].f[k]);
-	df += sqrt(d);
-	d = 0;
-	for (uns k = 0; k < IMAGE_REG_H; k++)
-	  d += dist(sig->reg[i].h[k], sig->reg[j].h[k]);
-	dh += sqrt(d);
-	cnt++;
-      }
-  sig->df = df / cnt;
-  sig->dh = dh / cnt;
+  
+  if (sig->len < 2)
+    {
+      sig->df = 1;
+      sig->dh = 1;
+    }
+  else
+    {
+      uns cnt = 0;
+      for (uns i = 0; i < sig->len; i++)
+        for (uns j = i + 1; j < sig->len; j++)
+          {
+	    uns d = 0;
+	    for (uns k = 0; k < IMAGE_REG_F; k++)
+	      d += dist(sig->reg[i].f[k], sig->reg[j].f[k]);
+	    df += sqrt(d);
+	    d = 0;
+	    for (uns k = 0; k < IMAGE_REG_H; k++)
+	      d += dist(sig->reg[i].h[k], sig->reg[j].h[k]);
+	    dh += sqrt(d);
+	    cnt++;
+          }
+      sig->df = CLAMP(df / cnt, 1, 255);
+      sig->dh = CLAMP(dh / cnt, 1, 65535);
+    }
   DBG("Average regions difs: df=%u dh=%u", sig->df, sig->dh);
 
   /* Compute normalized weights */