X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fsig-seg.c;h=fae309ff11fece9c06429d20beac430b0a9343b3;hb=eec6d2c37cbcbf9c350aa4ca80e5a316e5144087;hp=7705656ee18819dafd148973e438e8ea91c819c0;hpb=3366235d970c8516d4e1bc8be66c522ab106801b;p=libucw.git diff --git a/images/sig-seg.c b/images/sig-seg.c index 7705656e..fae309ff 100644 --- a/images/sig-seg.c +++ b/images/sig-seg.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#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 +#include +#include +#include +#include +#include #include @@ -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 "ucw/sorter/array-simple.h" +#include 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++)