xtypes: bugfixes in printf format and incorrect use of errno

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

diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index af4ebaf2442bdc05d045bbe9500078ae3ccc2155..e7ed0dfa70ecd9e53a26a84789d57a4b560a45b1 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>
  *
@@ -9,53 +9,17 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/math.h"
-#include "images/math.h"
-#include "images/images.h"
-#include "images/signature.h"
+#include <ucw/lib.h>
+#include <images/math.h>
+#include <images/images.h>
+#include <images/signature.h>
 
 #include <stdio.h>
 
 #define ASORT_PREFIX(x) image_signatures_dist_integrated_##x
-#define ASORT_KEY_TYPE uns
-#define ASORT_ELT(i) items[i]
-#define ASORT_EXTRA_ARGS , uns *items
-#include "lib/arraysort.h"
+#define ASORT_KEY_TYPE uint
+#include <ucw/sorter/array-simple.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);
-    }
-}
-
+#include <images/sig-cmp-gen.h>
+#include <images/sig-cmp-gen.h>