X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=images%2Fduplicates.h;h=d824c8c81988d600fec5efb8588aa155fb48644c;hb=bc2bbfcbe76e78db9cde27455ddbcfe1ddcc61d6;hp=ddeddd5c65f8e317ce402b15c976f15ef1792908;hpb=91c499892f07ad6494351a1c1985a0d3e2600a25;p=libucw.git

diff --git a/images/duplicates.h b/images/duplicates.h
index ddeddd5c..d824c8c8 100644
--- a/images/duplicates.h
+++ b/images/duplicates.h
@@ -1,6 +1,14 @@
 #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,
@@ -17,13 +25,13 @@ enum image_dup_flags {
 
 struct image_dup_context {
   struct image_context *ic;
-  uns flags;
-  uns ratio_threshold;
-  uns error_threshold;
-  uns qtree_limit;
+  uint flags;
+  uint ratio_threshold;
+  uint error_threshold;
+  uint qtree_limit;
   u64 sum_depth;
   u64 sum_pixels;
-  uns error;
+  uint error;
 };
 
 struct image_dup {
@@ -40,20 +48,18 @@ 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);
 
-uns image_dup_estimate_size(uns cols, uns rows, uns same_size_compare, uns qtree_limit);
-uns image_dup_new(struct image_dup_context *ctx, struct image *image, void *buffer, uns same_size_compare);
+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 */
 
-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 */
 
-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));
 }
 
-
 #endif