Table: renamed table_col_order[_by_name] -> table_set_col_order[_by_name]

[libucw.git] / images / duplicates.h

diff --git a/images/duplicates.h b/images/duplicates.h
index ac86472bfbda6232f93aa883ec23abca9916590e..d824c8c81988d600fec5efb8588aa155fb48644c 100644 (file)
--- a/images/duplicates.h
+++ b/images/duplicates.h
@@ -1,6 +1,14 @@
 #ifndef _IMAGES_DUPLICATES_H
 #define _IMAGES_DUPLICATES_H
 
 #ifndef _IMAGES_DUPLICATES_H
 #define _IMAGES_DUPLICATES_H
 

+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_dup_compare ucw_image_dup_compare
+#define image_dup_context_cleanup ucw_image_dup_context_cleanup
+#define image_dup_context_init ucw_image_dup_context_init
+#define image_dup_estimate_size ucw_image_dup_estimate_size
+#define image_dup_new ucw_image_dup_new
+#endif
+

 enum image_dup_flags {
   IMAGE_DUP_TRANS_ID =         0x0001,
   IMAGE_DUP_FLIP_X =           0x0002,
 enum image_dup_flags {
   IMAGE_DUP_TRANS_ID =         0x0001,
   IMAGE_DUP_FLIP_X =           0x0002,


@@ -17,11 +25,13 @@ enum image_dup_flags {
 
 struct image_dup_context {
   struct image_context *ic;
 
 struct image_dup_context {
   struct image_context *ic;

-  uns flags;
-  uns ratio_threshold;
-  uns error_threshold;
+  uint flags;
+  uint ratio_threshold;
+  uint error_threshold;
+  uint qtree_limit;

   u64 sum_depth;
   u64 sum_pixels;
   u64 sum_depth;
   u64 sum_pixels;

+  uint error;

 };
 
 struct image_dup {
 };
 
 struct image_dup {


@@ -37,20 +47,19 @@ struct image_dup {
 
 void image_dup_context_init(struct image_context *ic, struct image_dup_context *ctx);
 void image_dup_context_cleanup(struct image_dup_context *ctx);
 
 void image_dup_context_init(struct image_context *ic, struct image_dup_context *ctx);
 void image_dup_context_cleanup(struct image_dup_context *ctx);

-uns image_dup_estimate_size(uns cols, uns rows);
-uns image_dup_new(struct image_context *ctx, struct image *image, void *buffer);
+
+uint image_dup_estimate_size(uint cols, uint rows, uint same_size_compare, uint qtree_limit);
+uint image_dup_new(struct image_dup_context *ctx, struct image *image, void *buffer, uint same_size_compare);

 
 /* dup-cmp.c */
 
 
 /* dup-cmp.c */
 

-uns image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2);
+uint image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2);

 
 /* internals */
 
 
 /* internals */
 

-static inline byte *
-image_dup_block(struct image_dup *dup, uns tab_col, uns tab_row)
+static inline byte *image_dup_block(struct image_dup *dup, uint tab_col, uint tab_row)

 {
   return dup->tab_pixels + (dup->tab_row_size << tab_row) + (3 << (tab_row + tab_col));
 }
 
 {
   return dup->tab_pixels + (dup->tab_row_size << tab_row) + (3 << (tab_row + tab_col));
 }
 

-

 #endif
 #endif