X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fsig-seg.c;h=fae309ff11fece9c06429d20beac430b0a9343b3;hb=e5d79225e3eef5c39be7f8e5006e331ed0f76f2f;hp=8deeca91677d98ebec30b70ce48183885ba285e6;hpb=a59b1d81fd5fcb0efb02b9c50b24e88b43cac915;p=libucw.git

diff --git a/images/sig-seg.c b/images/sig-seg.c
index 8deeca91..fae309ff 100644
--- a/images/sig-seg.c
+++ b/images/sig-seg.c
@@ -9,12 +9,12 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/conf.h"
-#include "lib/heap.h"
-#include "images/images.h"
-#include "images/signature.h"
-#include "images/math.h"
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/heap.h>
+#include <images/images.h>
+#include <images/signature.h>
+#include <images/math.h>
 
 #include <string.h>
 
@@ -93,9 +93,7 @@ prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b)
 
 #define ASORT_PREFIX(x) prequant_##x
 #define ASORT_KEY_TYPE uns
-#define ASORT_ELT(i) val[i]
-#define ASORT_EXTRA_ARGS , uns *val
-#include "lib/arraysort.h"
+#include <ucw/sorter/array-simple.h>
 
 static uns
 prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_region *regions)
@@ -163,7 +161,7 @@ prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_regi
           block = region->blocks;
           for (uns i = 0; i < region->count; i++, block = block->next)
 	    val[i] = block->v[axis];
-	  prequant_sort(region->count, val);
+	  prequant_sort(val, region->count);
 	  cval = 1;
 	  cnt[0] = 1;
 	  for (uns i = 1; i < region->count; i++)