Renamed uns -> uint

[libucw.git] / images / object.h

diff --git a/images/object.h b/images/object.h
index 189b3c0b2de7f9b3add91d2e7f6c116c9e38b7b3..4f03166d485c508348bc247fe18e8fa01b648b0e 100644 (file)
--- a/images/object.h
+++ b/images/object.h
@@ -1,16 +1,24 @@
 #ifndef _IMAGES_OBJECT_H
 #define _IMAGES_OBJECT_H
 
-#include "images/images.h"
+#include <images/images.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define get_image_obj_info ucw_get_image_obj_info
+#define get_image_obj_signature ucw_get_image_obj_signature
+#define get_image_obj_thumb ucw_get_image_obj_thumb
+#define put_image_obj_signature ucw_put_image_obj_signature
+#define read_image_obj_thumb ucw_read_image_obj_thumb
+#endif
 
 struct image_obj_info {
-  uns cols;
-  uns rows;
-  uns colors;
+  uint cols;
+  uint rows;
+  uint colors;
   enum image_format thumb_format;
-  uns thumb_cols;
-  uns thumb_rows;
-  uns thumb_size;
+  uint thumb_cols;
+  uint thumb_rows;
+  uint thumb_size;
   byte *thumb_data;
 };
 
@@ -18,10 +26,10 @@ struct odes;
 struct mempool;
 struct image_signature;
 
-uns get_image_obj_info(struct image_obj_info *ioi, struct odes *o);
-uns get_image_obj_thumb(struct image_obj_info *ioi, struct odes *o, struct mempool *pool);
+uint get_image_obj_info(struct image_obj_info *ioi, struct odes *o);
+uint get_image_obj_thumb(struct image_obj_info *ioi, struct odes *o, struct mempool *pool);
 struct image *read_image_obj_thumb(struct image_obj_info *ioi, struct fastbuf *fb, struct image_io *io, struct mempool *pool);
 void put_image_obj_signature(struct odes *o, struct image_signature *sig);
-uns get_image_obj_signature(struct image_signature *sig, struct odes *o);
+uint get_image_obj_signature(struct image_signature *sig, struct odes *o);
 
 #endif