X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fdup-cmp.c;h=e16f0634c2b3ff82f6bbf4d9423bf0df6bfb0e84;hb=ec69802864ba3b2a3b22f12f29bb8fe867dd1a22;hp=9f98b1939dd145b1c7c209bfdb1fb4a45a15eae6;hpb=0bdd67d0699f51198d917be1ef64293e39f89199;p=libucw.git diff --git a/images/dup-cmp.c b/images/dup-cmp.c index 9f98b193..e16f0634 100644 --- a/images/dup-cmp.c +++ b/images/dup-cmp.c @@ -9,9 +9,9 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/mempool.h" -#include "lib/fastbuf.h" +#include "ucw/lib.h" +#include "ucw/mempool.h" +#include "ucw/fastbuf.h" #include "images/images.h" #include "images/duplicates.h" @@ -104,6 +104,7 @@ blocks_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct ima case 0: ; uns err = (err_sum(block1, block2, 1 << (tab_col + tab_row)) >> (tab_col + tab_row)); DBG("average error=%d", err); + ctx->error = err; return err <= ctx->error_threshold; case 1: col_step = -3; @@ -144,6 +145,7 @@ blocks_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct ima } uns err = (err_sum_transformed(block1, block2, (1 << tab_col), (1 << tab_row), (3 << tab_col), col_step, row_step) >> (tab_col + tab_row)); DBG("average error=%d", err); + ctx->error = err; return err <= ctx->error_threshold; } @@ -204,13 +206,14 @@ same_size_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct } uns err = (err_sum_transformed(block1, block2, img1->cols, img1->rows, img1->row_size, col_step, row_step) / ((u64)img1->cols * img1->rows)); DBG("average error=%d", err); + ctx->error = err; return err <= ctx->error_threshold; } uns image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2) { - DBG("image_dup_compare()"); + DBG("image_dup_compare(%p, %p)", dup1, dup2); if (!average_compare(ctx, dup1, dup2)) return 0; struct image *img1 = &dup1->image;