X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimages.h;h=f59b82588bb3d606c108704d6d5208d84b2c740e;hb=d9e2a686f0f9200d07c7ff6c65ec40bd7a7b876c;hp=d555ce529f3b48094b92dcd18f981f1b35c87716;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

diff --git a/images/images.h b/images/images.h
index d555ce52..f59b8258 100644
--- a/images/images.h
+++ b/images/images.h
@@ -10,7 +10,38 @@
 #ifndef _IMAGES_IMAGES_H
 #define _IMAGES_IMAGES_H
 
-#include "ucw/bbuf.h"
+#include <ucw/bbuf.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_channels_format_to_name ucw_image_channels_format_to_name
+#define image_clear ucw_image_clear
+#define image_clone ucw_image_clone
+#define image_context_cleanup ucw_image_context_cleanup
+#define image_context_init ucw_image_context_init
+#define image_context_msg ucw_image_context_msg
+#define image_context_msg_default ucw_image_context_msg_default
+#define image_context_msg_silent ucw_image_context_msg_silent
+#define image_context_vmsg ucw_image_context_vmsg
+#define image_destroy ucw_image_destroy
+#define image_dimensions_fit_to_box ucw_image_dimensions_fit_to_box
+#define image_extension_to_format ucw_image_extension_to_format
+#define image_file_name_to_format ucw_image_file_name_to_format
+#define image_format_to_extension ucw_image_format_to_extension
+#define image_init_matrix ucw_image_init_matrix
+#define image_init_subimage ucw_image_init_subimage
+#define image_io_cleanup ucw_image_io_cleanup
+#define image_io_init ucw_image_io_init
+#define image_io_read ucw_image_io_read
+#define image_io_read_data ucw_image_io_read_data
+#define image_io_read_header ucw_image_io_read_header
+#define image_io_reset ucw_image_io_reset
+#define image_io_write ucw_image_io_write
+#define image_max_bytes ucw_image_max_bytes
+#define image_max_dim ucw_image_max_dim
+#define image_name_to_channels_format ucw_image_name_to_channels_format
+#define image_new ucw_image_new
+#define image_scale ucw_image_scale
+#endif
 
 struct mempool;
 struct fastbuf;
@@ -22,10 +53,10 @@ struct fastbuf;
 
 struct image_context {
   byte *msg;				/* last message */
-  uns msg_code;				/* last message code (see images/error.h for details) */
+  uint msg_code;			/* last message code (see images/error.h for details) */
   bb_t msg_buf;				/* message buffer */
   void (*msg_callback)(struct image_context *ctx); /* called for each message (in msg_{str,code}) */
-  uns tracing_level;			/* tracing level (zero to disable) */
+  uint tracing_level;			/* tracing level (zero to disable) */
 };
 
 /* initialization/cleanup */
@@ -33,8 +64,8 @@ void image_context_init(struct image_context *ctx);
 void image_context_cleanup(struct image_context *ctx);
 
 /* message handling, see images/error.h for useful macros */
-void image_context_msg(struct image_context *ctx, uns code, char *msg, ...);
-void image_context_vmsg(struct image_context *ctx, uns code, char *msg, va_list args);
+void image_context_msg(struct image_context *ctx, uint code, char *msg, ...);
+void image_context_vmsg(struct image_context *ctx, uint code, char *msg, va_list args);
 
 /* default callback, displays messages with standard libucw's log() routine */
 void image_context_msg_default(struct image_context *ctx);
@@ -48,8 +79,8 @@ void image_context_msg_silent(struct image_context *ctx);
  * - image structure is not directly connected to a single context
  *   but manipulation routines are (user must synchronize the access himself)! */
 
-extern uns image_max_dim;		/* ImageLib.ImageMaxDim */
-extern uns image_max_bytes;		/* ImageLib.ImageMaxBytes */
+extern uint image_max_dim;		/* ImageLib.ImageMaxDim */
+extern uint image_max_bytes;		/* ImageLib.ImageMaxBytes */
 
 /* SSE aligning size, see IMAGE_SSE_ALIGNED */
 #define IMAGE_SSE_ALIGN_SIZE 16
@@ -70,8 +101,8 @@ enum image_flag {
 
 #define IMAGE_MAX_CHANNELS 4
 #define IMAGE_CHANNELS_FORMAT_MAX_SIZE 128
-byte *image_channels_format_to_name(uns format, byte *buf);
-uns image_name_to_channels_format(byte *name);
+byte *image_channels_format_to_name(uint format, byte *buf);
+uint image_name_to_channels_format(byte *name);
 
 struct color {
   byte c[IMAGE_MAX_CHANNELS];
@@ -79,34 +110,33 @@ struct color {
 };
 
 struct image {
-  byte *pixels;			/* aligned top left pixel, there are at least sizeof(uns)
+  byte *pixels;			/* aligned top left pixel, there are at least sizeof(uint)
 				   unused bytes after the buffer (possible optimizations) */
-  uns cols;			/* number of columns */
-  uns rows;			/* number of rows */
-  uns channels;			/* number of color channels including the alpha channel */
-  uns pixel_size;		/* size of pixel in bytes (1, 2, 3 or 4) */
-  uns row_size;			/* scanline size in bytes */
-  uns row_pixels_size;		/* scanline size in bytes excluding rows gaps */
-  uns image_size;		/* rows * row_size */
-  uns flags;			/* enum image_flag */
+  uint cols;			/* number of columns */
+  uint rows;			/* number of rows */
+  uint channels;		/* number of color channels including the alpha channel */
+  uint pixel_size;		/* size of pixel in bytes (1, 2, 3 or 4) */
+  uint row_size;		/* scanline size in bytes */
+  uint row_pixels_size;		/* scanline size in bytes excluding rows gaps */
+  uint image_size;		/* rows * row_size */
+  uint flags;			/* enum image_flag */
 };
 
-struct image *image_new(struct image_context *ctx, uns cols, uns rows, uns flags, struct mempool *pool);
-struct image *image_clone(struct image_context *ctx, struct image *src, uns flags, struct mempool *pool);
+struct image *image_new(struct image_context *ctx, uint cols, uint rows, uint flags, struct mempool *pool);
+struct image *image_clone(struct image_context *ctx, struct image *src, uint flags, struct mempool *pool);
 void image_destroy(struct image *img);
 void image_clear(struct image_context *ctx, struct image *img);
-struct image *image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uns cols, uns rows, uns row_size, uns flags);
-struct image *image_init_subimage(struct image_context *ctx, struct image *img, struct image *src, uns left, uns top, uns cols, uns rows);
+struct image *image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uint cols, uint rows, uint row_size, uint flags);
+struct image *image_init_subimage(struct image_context *ctx, struct image *img, struct image *src, uint left, uint top, uint cols, uint rows);
 
-static inline int
-image_dimensions_valid(uns cols, uns rows)
+static inline int image_dimensions_valid(uint cols, uint rows)
 {
   return cols && rows && cols <= image_max_dim && rows <= image_max_dim;
 }
 /* scale.c */
 
 int image_scale(struct image_context *ctx, struct image *dest, struct image *src);
-void image_dimensions_fit_to_box(uns *cols, uns *rows, uns max_cols, uns max_rows, uns upsample);
+void image_dimensions_fit_to_box(uint *cols, uint *rows, uint max_cols, uint max_rows, uint upsample);
 
 /* image-io.c */
 
@@ -129,13 +159,13 @@ struct image_io {
   enum image_format format;		/* [R   W] - file format (IMAGE_FORMAT_x) */
   struct fastbuf *fastbuf;		/* [R   W] - source/destination stream */
   struct mempool *pool;			/* [  I  ] - parameter to image_new */
-  uns cols;				/* [ HI  ] - number of columns, parameter to image_new */
-  uns rows;				/* [ HI  ] - number of rows, parameter to image_new */
-  uns flags;				/* [ HI  ] - see enum image_io_flags */
-  uns jpeg_quality;			/* [    W] - JPEG compression quality (1..100) */
-  uns number_of_colors;			/* [ H   ] - number of image colors */
+  uint cols;				/* [ HI  ] - number of columns, parameter to image_new */
+  uint rows;				/* [ HI  ] - number of rows, parameter to image_new */
+  uint flags;				/* [ HI  ] - see enum image_io_flags */
+  uint jpeg_quality;			/* [    W] - JPEG compression quality (1..100) */
+  uint number_of_colors;		/* [ H   ] - number of image colors */
   struct color background_color;	/* [ HI  ] - background color, zero if undefined */
-  uns exif_size;			/* [ H  W] - EXIF size in bytes (zero if not present) */
+  uint exif_size;			/* [ H  W] - EXIF size in bytes (zero if not present) */
   byte *exif_data;			/* [ H  W] - EXIF data */
 
   /* internals */