align signature size

[libucw.git] / images / image-sim-test.c

diff --git a/images/image-sim-test.c b/images/image-sim-test.c
index 8116206fe8461c9ecb6dbad5f5e2d98d8cb58558..bac384ec28a673113effe453b46621e08fda9664 100644 (file)
--- a/images/image-sim-test.c
+++ b/images/image-sim-test.c
@@ -62,6 +62,12 @@ static byte *segmentation_name_2;
 #define MSG(x...) do{ if (verbose) log(L_INFO, ##x); }while(0)
 #define TRY(x) do{ if (!(x)) die("Error: %s", it.err_msg); }while(0)
 
+static void
+msg_str(byte *s, void *param UNUSED)
+{
+  MSG("%s", s);
+}
+
 static void
 dump_signature(struct image_signature *sig)
 {
@@ -235,7 +241,10 @@ main(int argc, char **argv)
       TRY(image_sig_init(&it, &data, img1));
       image_sig_preprocess(&data);
       if (data.valid)
-       image_sig_segmentation(&data);
+        {
+         image_sig_segmentation(&data);
+         image_sig_detect_textured(&data);
+       }
       if (segmentation_name_1)
        write_segmentation(&data, segmentation_name_1);
       image_sig_finish(&data, &sig1);
@@ -248,7 +257,10 @@ main(int argc, char **argv)
       TRY(image_sig_init(&it, &data, img2));
       image_sig_preprocess(&data);
       if (data.valid)
-       image_sig_segmentation(&data);
+        {
+         image_sig_segmentation(&data);
+         image_sig_detect_textured(&data);
+       }
       if (segmentation_name_2)
        write_segmentation(&data, segmentation_name_2);
       image_sig_finish(&data, &sig2);
@@ -258,8 +270,16 @@ main(int argc, char **argv)
 
   if (img1 && img2)
     {
-      uns dist = image_signatures_dist(&sig1, &sig2);
-      MSG("dist=%.6f", dist / (double)(1 << IMAGE_SIG_DIST_SCALE));
+      uns dist;
+      if (verbose)
+        {
+          struct fastbuf *fb = bfdopen(0, 4096);
+          dist = image_signatures_dist_explain(&sig1, &sig2, msg_str, NULL);
+          bclose(fb);
+       }
+      else
+       dist = image_signatures_dist(&sig1, &sig2);
+      MSG("dist=%u", dist);
     }
 
   if (img1)