Opt: Documented opt and its interaction with conf

[libucw.git] / images / object.h

diff --git a/images/object.h b/images/object.h
index 2f2bc0b1aa64d49f325fd87d3d21d318a0870978..26d850ba43ca39057ae4c40d4118c8f0492d543b 100644 (file)
--- a/images/object.h
+++ b/images/object.h
@@ -1,7 +1,15 @@
 #ifndef _IMAGES_OBJECT_H
 #define _IMAGES_OBJECT_H
 
 #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;
 
 struct image_obj_info {
   uns cols;


@@ -21,9 +29,7 @@ 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);
 struct image *read_image_obj_thumb(struct image_obj_info *ioi, struct fastbuf *fb, struct image_io *io, struct mempool *pool);
 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);
 struct image *read_image_obj_thumb(struct image_obj_info *ioi, struct fastbuf *fb, struct image_io *io, struct mempool *pool);

-uns encode_image_obj_signature(byte *buf, struct image_signature *sig);
-uns decode_image_obj_signature(byte *buf, struct image_signature *sig);

 void put_image_obj_signature(struct odes *o, struct image_signature *sig);
 void put_image_obj_signature(struct odes *o, struct image_signature *sig);

-uns get_image_obj_signature(struct odes *o, struct image_signature *sig);
+uns get_image_obj_signature(struct image_signature *sig, struct odes *o);

 
 #endif
 
 #endif