Libucw: Be able to use public tmp directory.

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

diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index af4ebaf2442bdc05d045bbe9500078ae3ccc2155..028e1b6ac56288cfeb7b3d2e06548e1381094a6e 100644 (file)
--- a/images/sig-cmp.c
+++ b/images/sig-cmp.c
@@ -1,5 +1,5 @@
 /*
 /*

- *     Image Library -- Comparitions of image signatures
+ *     Image Library -- Comparisions of image signatures

  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *
  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *


@@ -9,8 +9,7 @@
 
 #undef LOCAL_DEBUG
 
 
 #undef LOCAL_DEBUG
 

-#include "lib/lib.h"
-#include "lib/math.h"
+#include "ucw/lib.h"

 #include "images/math.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include "images/math.h"
 #include "images/images.h"
 #include "images/signature.h"


@@ -21,41 +20,8 @@
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) items[i]
 #define ASORT_EXTRA_ARGS , uns *items
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) items[i]
 #define ASORT_EXTRA_ARGS , uns *items

-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"

 
 #define EXPLAIN
 #include "images/sig-cmp-gen.h"
 #include "images/sig-cmp-gen.h"
 
 #define EXPLAIN
 #include "images/sig-cmp-gen.h"
 #include "images/sig-cmp-gen.h"

-
-uns
-image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2)
-{
-  switch (image_sig_compare_method)
-    {
-      case 0:
-       return image_signatures_dist_integrated(sig1, sig2);
-      case 1:
-       return image_signatures_dist_fuzzy(sig1, sig2);
-      case 2:
-       return image_signatures_dist_average(sig1, sig2);
-      default:
-       ASSERT(0);
-    }
-}
-
-uns
-image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
-{
-  switch (image_sig_compare_method)
-    {
-      case 0:
-       return image_signatures_dist_integrated_explain(sig1, sig2, msg, param);
-      case 1:
-       return image_signatures_dist_fuzzy_explain(sig1, sig2, msg, param);
-      case 2:
-       return image_signatures_dist_average_explain(sig1, sig2, msg, param);
-      default:
-       ASSERT(0);
-    }
-}
-