X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fsig-seg.c;h=b82c6ccd232173e701dd359f1719856a14c22f8b;hb=45476e823b3a4cfd9be6c457c0f1949e863ddefc;hp=74798f47fe178f8eae98802cf032ddc98ea43b66;hpb=d60ede19ab84382101d313e3185b1a0ef6714088;p=libucw.git diff --git a/images/sig-seg.c b/images/sig-seg.c index 74798f47..b82c6ccd 100644 --- a/images/sig-seg.c +++ b/images/sig-seg.c @@ -9,9 +9,9 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/conf.h" -#include "lib/heap.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" @@ -95,7 +95,7 @@ prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b) #define ASORT_KEY_TYPE uns #define ASORT_ELT(i) val[i] #define ASORT_EXTRA_ARGS , uns *val -#include "lib/arraysort.h" +#include "ucw/arraysort.h" static uns prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_region *regions) @@ -176,7 +176,7 @@ prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_regi cval++; } } - + /* Select split value - to minimize error */ uns b1 = val[0] * cnt[0]; uns c1 = isqr(val[0]) * cnt[0]; @@ -195,7 +195,7 @@ prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_regi c2 -= c0; i += cnt[k]; j -= cnt[k]; - u64 err = (u64)c1 - (u64)b1 * b1 / i + (u64)c2 - (u64)b2 * b2 / j; + u64 err = (u64)c1 - (u64)b1 * b1 / i + (u64)c2 - (u64)b2 * b2 / j; if (err < best_err) { best_err = err;