From 98345a78f334571fdce2b171c330c494e274376f Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 3 Nov 2008 23:39:46 +0100 Subject: [PATCH] Simplified calls of sorter/array-simple.h. Use the two-argument form instead of ASORT_EXTRA_ARGS where convenient. --- images/sig-cmp-gen.h | 2 +- images/sig-cmp.c | 2 -- images/sig-seg.c | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/images/sig-cmp-gen.h b/images/sig-cmp-gen.h index 0c88768e..d316cb2f 100644 --- a/images/sig-cmp-gen.h +++ b/images/sig-cmp-gen.h @@ -163,7 +163,7 @@ image_signatures_dist_integrated_explain(struct image_signature *sig1, struct im q[i] = reg2->wb; /* Sort entries in distance matrix */ - image_signatures_dist_integrated_sort(n, dist); + image_signatures_dist_integrated_sort(dist, n); /* Compute significance matrix and resulting distance */ uns sum = 0; diff --git a/images/sig-cmp.c b/images/sig-cmp.c index 93e10210..71beecf2 100644 --- a/images/sig-cmp.c +++ b/images/sig-cmp.c @@ -18,8 +18,6 @@ #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 "ucw/sorter/array-simple.h" #define EXPLAIN diff --git a/images/sig-seg.c b/images/sig-seg.c index 7705656e..082a1c8e 100644 --- a/images/sig-seg.c +++ b/images/sig-seg.c @@ -93,8 +93,6 @@ 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" static uns @@ -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++) -- 2.39.2