X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimages.h;h=460f5881c9fa4e5f698fa927a044af6bd9d723f9;hb=e84a71ed09f0a2cf91da650b2a85378e8bdf8b8f;hp=763006d9d4cc200158d192a6810f82bfda412480;hpb=cf1fb1b7fa95f06ff3f3d6017506d5ec4f53f470;p=libucw.git

diff --git a/images/images.h b/images/images.h
index 763006d9..460f5881 100644
--- a/images/images.h
+++ b/images/images.h
@@ -1,73 +1,186 @@
 #ifndef _IMAGES_IMAGES_H
 #define _IMAGES_IMAGES_H
 
-#include <alloca.h>
-#include <stdio.h>
-
-#define IMAGE_VEC_K	6
-#define IMAGE_REG_K	9
-#define IMAGE_REG_MAX	4
-
-typedef u16 image_feature_t;	/* 8 or 16 bits precision */
+#include "lib/mempool.h"
+
+/* image.c */
+
+/* error handling */
+
+enum image_error {
+  IMAGE_ERR_OK = 0,
+  IMAGE_ERR_UNSPECIFIED,
+  IMAGE_ERR_NOT_IMPLEMENTED,
+  IMAGE_ERR_INVALID_DIMENSIONS,
+  IMAGE_ERR_INVALID_FILE_FORMAT,
+  IMAGE_ERR_INVALID_PIXEL_FORMAT,
+  IMAGE_ERR_READ_FAILED,
+  IMAGE_ERR_WRITE_FAILED,
+  IMAGE_ERR_MAX
+};
 
-/* K-dimensional feature vector */
-struct image_vector {
-  image_feature_t f[IMAGE_VEC_K];
+struct image_thread {
+  byte *err_msg;
+  enum image_error err_code;
+  struct mempool *pool;
 };
 
-/* K-dimensional interval */
-struct image_bbox {
-  struct image_vector vec[2];
+void image_thread_init(struct image_thread *thread);
+void image_thread_cleanup(struct image_thread *thread);
+
+static inline void
+image_thread_flush(struct image_thread *thread)
+{
+  thread->err_code = 0;
+  thread->err_msg = NULL;
+  mp_flush(thread->pool);
+}
+
+static inline void
+image_thread_err(struct image_thread *thread, uns code, char *msg)
+{
+  thread->err_code = code;
+  thread->err_msg = (byte *)msg;
+}
+
+static inline void
+image_thread_err_dup(struct image_thread *thread, uns code, char *msg)
+{
+  thread->err_code = code;
+  thread->err_msg = mp_strdup(thread->pool, msg);
+}
+
+void image_thread_err_format(struct image_thread *thread, uns code, char *msg, ...);
+
+/* basic image manupulation */
+
+#define IMAGE_MAX_SIZE		0xffffU	/* maximum number of cols/rows, must be <(1<<16) */
+#define IMAGE_SSE_ALIGN_SIZE	(MAX(16, sizeof(uns)))
+
+enum color_space {
+  COLOR_SPACE_UNKNOWN,
+  COLOR_SPACE_GRAYSCALE,
+  COLOR_SPACE_RGB,
+  COLOR_SPACE_MAX
 };
 
-/* Fetures for image regions */
-struct image_region {
-  image_feature_t f[IMAGE_REG_K];
+enum image_flag {
+  IMAGE_COLOR_SPACE = 0x7,	/* mask for enum color_space */
+  IMAGE_ALPHA = 0x8,		/* alpha channel */
+  IMAGE_PIXELS_ALIGNED = 0x10,	/* align pixel size to the nearest power of two  */
+  IMAGE_SSE_ALIGNED = 0x20,	/* align scanlines to multiples of 16 bytes (both start and size) */
+  IMAGE_NEED_DESTROY = 0x40,	/* image is allocated with xmalloc */
+  IMAGE_GAPS_PROTECTED = 0x80,	/* cannot access gaps between rows */
+  IMAGE_CHANNELS_FORMAT = IMAGE_COLOR_SPACE | IMAGE_ALPHA,
+  IMAGE_PIXEL_FORMAT = IMAGE_CHANNELS_FORMAT | IMAGE_PIXELS_ALIGNED,
+  IMAGE_ALIGNED = IMAGE_PIXELS_ALIGNED | IMAGE_SSE_ALIGNED,
+  IMAGE_NEW_FLAGS = IMAGE_PIXEL_FORMAT | IMAGE_SSE_ALIGNED,
+  IMAGE_INTERNAL_FLAGS = IMAGE_NEED_DESTROY | IMAGE_GAPS_PROTECTED,
 };
 
-/* Image signature */
-struct image_signature {
-  struct image_vector vec;	/* Combination of all regions... simplier signature */
-  image_feature_t len;		/* Number of regions */
-  struct image_region reg[IMAGE_REG_MAX];/* Feature vector for every region */
+struct image {
+  byte *pixels;			/* left top pixel, there are at least sizeof(uns)
+				   unsed bytes after the buffer (possible optimizations) */
+  u32 cols;			/* number of columns */
+  u32 rows;			/* number of rows */
+  u32 pixel_size;		/* size of pixel (1, 2, 3 or 4) */
+  u32 row_size;			/* scanline size in bytes */
+  u32 image_size;		/* rows * row_size */
+  u32 flags;			/* enum image_flag */
 };
 
-/* Similarity search tree... will be changed */
-struct image_tree {
-  uns count;			/* Number of images in the tree */
-  uns depth;			/* Tree depth */
-  struct image_bbox bbox;	/* Bounding box containing all the */
-  struct image_node *nodes;	/* Internal nodes */
-  struct image_leaf *leaves;	/* Leaves */
+struct image *image_new(struct image_thread *it, uns cols, uns rows, uns flags, struct mempool *pool);
+struct image *image_clone(struct image_thread *it, struct image *src, uns flags, struct mempool *pool);
+void image_destroy(struct image *img);
+void image_clear(struct image_thread *it, struct image *img);
+struct image *image_init_matrix(struct image_thread *it, struct image *img, byte *pixels, uns cols, uns rows, uns row_size, uns flags);
+struct image *image_init_subimage(struct image_thread *it, struct image *img, struct image *src, uns left, uns top, uns cols, uns rows);
+
+static inline int
+image_dimensions_valid(uns cols, uns rows)
+{
+  return cols && rows && cols <= IMAGE_MAX_SIZE && rows <= IMAGE_MAX_SIZE;
+}
+
+byte *color_space_to_name(enum color_space cs);
+byte *image_channels_format_to_name(uns format);
+uns image_name_to_channels_format(byte *name);
+
+struct color {
+  byte c[3];
+  byte color_space;
+} PACKED;
+
+/* scale.c */
+
+int image_scale(struct image_thread *thread, struct image *dest, struct image *src);
+void image_dimensions_fit_to_box(u32 *cols, u32 *rows, u32 max_cols, u32 max_rows, uns upsample);
+
+/* alpha.c */
+
+int image_apply_background(struct image_thread *thread, struct image *dest, struct image *src, struct color *background);
+
+/* image-io.c */
+
+enum image_format {
+  IMAGE_FORMAT_UNDEFINED,
+  IMAGE_FORMAT_JPEG,
+  IMAGE_FORMAT_PNG,
+  IMAGE_FORMAT_GIF,
+  IMAGE_FORMAT_MAX
 };
 
-/* Internal node in the search tree */
-#define IMAGE_NODE_LEAF		0x80000000		/* Node contains pointer to leaves array */
-#define IMAGE_NODE_DIM		0xff			/* Split dimension */
-struct image_node {
-  u32 val;
+struct image_io {
+  					/*  R - read_header input */
+  					/*   H - read_header output */
+  					/*    I - read_data input */
+  					/*     O - read_data output */
+  					/*      W - write input */
+
+  struct image *image;			/* [   OW] - image data */
+  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 */
+  u32 cols;				/* [ HI  ] - number of columns, parameter to image_new */
+  u32 rows;				/* [ HI  ] - number of rows, parameter to image_new */
+  u32 flags;				/* [ HI  ] - see enum image_io_flags */
+  u32 jpeg_quality;			/* [    W] - JPEG compression quality (1..100) */
+  u32 number_of_colors;			/* [ H   ] - number of image colors */
+  struct color background_color;	/* [ HI  ] - background color, zero if undefined */
+#ifdef CONFIG_IMAGES_EXIF
+  u32 exif_size;			/* [ H  W] - EXIF size in bytes (zero if not present) */
+  byte *exif_data;			/* [ H  W] - EXIF data */
+#endif
+
+  /* internals */
+  struct image_thread *thread;
+  struct mempool *internal_pool;
+  void *read_data;
+  void (*read_cancel)(struct image_io *io);
 };
 
-/* Leaves in the search tree */
-#define IMAGE_LEAF_LAST		0x80000000		/* Last entry in the list */
-#define IMAGE_LEAF_BITS(i)	(31 / IMAGE_VEC_K)	/* Number of bits for relative position in i-th dimension */
-struct image_leaf {
-  u32 flags;		/* Relative position in bbox and last node flag */ 
-  oid_t oid;
+enum image_io_flags {
+  IMAGE_IO_IMAGE_FLAGS = 0xffff,	/* [ HI  ] - mask of parameters to image new, read_header fills IMAGE_CHANNELS_FORMAT */
+  IMAGE_IO_NEED_DESTROY = 0x10000,	/* [   O ] - enables automatic call of image_destroy */
+  IMAGE_IO_HAS_PALETTE = 0x20000,	/* [ H   ] - true for image with indexed colors */
+  IMAGE_IO_USE_BACKGROUND = 0x40000,	/* [  I  ] - merge transparent pixels with background_color */
+#ifdef CONFIG_IMAGES_EXIF
+  IMAGE_IO_WANT_EXIF = 0x80000,		/* [R    ] - read EXIF data if present */
+#endif
 };
 
-#define stk_print_image_vector(v) ({ struct image_vector *_v = v; \
-    byte *_s = (byte *) alloca(IMAGE_VEC_K * 6), *_p = _s + sprintf(_s, "%d", _v->f[0]); \
-    for (uns _i = 1; _i < IMAGE_VEC_K; _i++) _p += sprintf(_p, " %d", _v->f[_i]); _s; })
+int image_io_init(struct image_thread *it, struct image_io *io);
+void image_io_cleanup(struct image_io *io);
+void image_io_reset(struct image_io *io);
 
-extern struct image_tree image_tree;
+int image_io_read_header(struct image_io *io);
+struct image *image_io_read_data(struct image_io *io, int ref);
+struct image *image_io_read(struct image_io *io, int ref);
 
-void image_tree_init(void);
-void image_tree_done(void);
+int image_io_write(struct image_io *io);
 
-void compute_image_signature_prepare(void);
-void compute_image_signature_finish(void);
-int compute_image_signature(void *data, uns len, struct image_signature *sig);
+byte *image_format_to_extension(enum image_format format);
+enum image_format image_extension_to_format(byte *extension);
+enum image_format image_file_name_to_format(byte *file_name);
 
 #endif
-