X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fsig-seg.c;h=8deeca91677d98ebec30b70ce48183885ba285e6;hb=7462f9e27978542b37e1745b9a8fa80fb07dab3d;hp=933a784b3a286ae07cd8e6db3630a98f68803599;hpb=bc64ab012833cd38592982444fd8c35b6e203250;p=libucw.git diff --git a/images/sig-seg.c b/images/sig-seg.c index 933a784b..8deeca91 100644 --- a/images/sig-seg.c +++ b/images/sig-seg.c @@ -9,7 +9,7 @@ #undef LOCAL_DEBUG -#include "sherlock/sherlock.h" +#include "lib/lib.h" #include "lib/conf.h" #include "lib/heap.h" #include "images/images.h" @@ -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;