X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimages.h;h=460f5881c9fa4e5f698fa927a044af6bd9d723f9;hb=e84a71ed09f0a2cf91da650b2a85378e8bdf8b8f;hp=31c25dc89344c5b8b6c86b85afff903aad701356;hpb=e4dd255c7797e331c82a7eedc0d6c751dcf82461;p=libucw.git diff --git a/images/images.h b/images/images.h index 31c25dc8..460f5881 100644 --- a/images/images.h +++ b/images/images.h @@ -69,9 +69,13 @@ enum image_flag { 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, }; struct image { @@ -81,24 +85,41 @@ struct image { 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; /* size of pixels buffer (rows * rows_size) */ + u32 image_size; /* rows * row_size */ u32 flags; /* enum image_flag */ }; 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); /* only with NULL mempool */ +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 { @@ -110,32 +131,45 @@ enum image_format { }; 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 ] - parameter to image new, read_header fills IMAGE_CHANNELS_FORMAT */ - u32 jpeg_quality; /* [ W] - JPEG compression quality (1..100) */ - u32 number_of_colors; /* [ H ] - number of image colors */ - u32 has_palette; /* [ H ] - true for image with indexed colors */ + /* 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; - int image_destroy; void *read_data; void (*read_cancel)(struct image_io *io); }; -void image_io_init(struct image_thread *it, struct image_io *io); +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 +}; + +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); @@ -149,29 +183,4 @@ 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); -/* internals */ - -#ifdef CONFIG_LIBJPEG -int libjpeg_read_header(struct image_io *io); -int libjpeg_read_data(struct image_io *io); -int libjpeg_write(struct image_io *io); -#endif - -#ifdef CONFIG_LIBPNG -int libpng_read_header(struct image_io *io); -int libpng_read_data(struct image_io *io); -int libpng_write(struct image_io *io); -#endif - -#ifdef CONFIG_LIBUNGIF -int libungif_read_header(struct image_io *io); -int libungif_read_data(struct image_io *io); -#endif - -#ifdef CONFIG_LIBMAGICK -int libmagick_read_header(struct image_io *io); -int libmagick_read_data(struct image_io *io); -int libmagick_write(struct image_io *io); -#endif - #endif