X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libmagick.c;h=3636163174a183cbf1400713c965ccad5e6b9068;hb=1481eca416a467e9952dbc5e4852afe66eaf1256;hp=7ec379309e7c1f3bde917f0b8d9f217e77382136;hpb=6a4b173e7d57907f20a4397e68d277d74a2bc840;p=libucw.git diff --git a/images/io-libmagick.c b/images/io-libmagick.c index 7ec37930..36361631 100644 --- a/images/io-libmagick.c +++ b/images/io-libmagick.c @@ -1,5 +1,5 @@ /* - * Image Library -- GraphicsMagick + * Image Library -- GraphicsMagick (slow fallback library) * * (c) 2006 Pavel Charvat * @@ -7,20 +7,31 @@ * of the GNU Lesser General Public License. */ -#define LOCAL_DEBUG +#undef LOCAL_DEBUG + +#include +#include +#include +#include +#include +#include +#include -#include "lib/lib.h" -#include "lib/mempool.h" -#include "lib/fastbuf.h" -#include "images/images.h" #include #include #include #include +#include #define MAX_FILE_SIZE (1 << 30) #define QUANTUM_SCALE (QuantumDepth - 8) -#define QUANTUM_TO_BYTE(x) ((uns)(x) >> QUANTUM_SCALE) +#define QUANTUM_TO_BYTE(x) ((uint)(x) >> QUANTUM_SCALE) +#define BYTE_TO_QUANTUM(x) ((uint)(x) << QUANTUM_SCALE) +#define ALPHA_TO_BYTE(x) (255 - QUANTUM_TO_BYTE(x)) +#define BYTE_TO_ALPHA(x) (BYTE_TO_QUANTUM(255 - (x))) + +static pthread_mutex_t libmagick_mutex = PTHREAD_MUTEX_INITIALIZER; +static uint libmagick_counter; struct magick_read_data { ExceptionInfo exception; @@ -28,14 +39,32 @@ struct magick_read_data { Image *image; }; -static inline void +int +libmagick_init(struct image_io *io UNUSED) +{ + pthread_mutex_lock(&libmagick_mutex); + if (!libmagick_counter++) + InitializeMagick(NULL); + pthread_mutex_unlock(&libmagick_mutex); + return 1; +} + +void +libmagick_cleanup(struct image_io *io UNUSED) +{ + pthread_mutex_lock(&libmagick_mutex); + if (!--libmagick_counter) + DestroyMagick(); + pthread_mutex_unlock(&libmagick_mutex); +} + +static void libmagick_destroy_read_data(struct magick_read_data *rd) { if (rd->image) DestroyImage(rd->image); DestroyImageInfo(rd->info); DestroyExceptionInfo(&rd->exception); - DestroyMagick(); } static void @@ -44,8 +73,6 @@ libmagick_read_cancel(struct image_io *io) DBG("libmagick_read_cancel()"); struct magick_read_data *rd = io->read_data; - - DestroyImage(rd->image); libmagick_destroy_read_data(rd); } @@ -55,21 +82,20 @@ libmagick_read_header(struct image_io *io) DBG("libmagick_read_header()"); /* Read entire stream */ - sh_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf); - if (file_size > MAX_FILE_SIZE) + ucw_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf); + if (unlikely(file_size > MAX_FILE_SIZE)) { - image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Too long stream."); + IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too long stream."); return 0; } - uns buf_size = file_size; + uint buf_size = file_size; byte *buf = xmalloc(buf_size); - bread(io->fastbuf, buf, buf_size); + breadb(io->fastbuf, buf, buf_size); /* Allocate read structure */ - struct magick_read_data *rd = io->read_data = mp_alloc(io->internal_pool, sizeof(*rd)); + struct magick_read_data *rd = io->read_data = mp_alloc_zero(io->internal_pool, sizeof(*rd)); /* Initialize GraphicsMagick */ - InitializeMagick(NULL); GetExceptionInfo(&rd->exception); rd->info = CloneImageInfo(NULL); rd->info->subrange = 1; @@ -77,34 +103,34 @@ libmagick_read_header(struct image_io *io) /* Read the image */ rd->image = BlobToImage(rd->info, buf, buf_size, &rd->exception); xfree(buf); - if (!rd->image) + if (unlikely(!rd->image)) { - image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "GraphicsMagick failed to read the image."); + IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "GraphicsMagick failed to read the image."); goto err; } - if (rd->image->columns > IMAGE_MAX_SIZE || rd->image->rows > IMAGE_MAX_SIZE) + if (unlikely(rd->image->columns > image_max_dim || rd->image->rows > image_max_dim)) { - image_thread_err(io->thread, IMAGE_ERR_INVALID_DIMENSIONS, "Image too large."); + IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_DIMENSIONS, "Image too large."); goto err; } /* Fill image parameters */ - if (!io->cols) - io->cols = rd->image->columns; - if (!io->rows) - io->rows = rd->image->rows; - if (!(io->flags & IMAGE_CHANNELS_FORMAT)) - { - switch (rd->image->colorspace) - { - case GRAYColorspace: - io->flags |= COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA; - break; - default: - io->flags |= COLOR_SPACE_RGB | IMAGE_ALPHA; - break; - } + io->cols = rd->image->columns; + io->rows = rd->image->rows; + switch (rd->image->colorspace) + { + case GRAYColorspace: + io->flags = COLOR_SPACE_GRAYSCALE; + break; + default: + io->flags = COLOR_SPACE_RGB; + break; } + if (rd->image->matte) + io->flags |= IMAGE_ALPHA; + io->number_of_colors = rd->image->colors; + if (rd->image->storage_class == PseudoClass && rd->image->compression != JPEGCompression) + io->flags |= IMAGE_IO_HAS_PALETTE; io->read_cancel = libmagick_read_cancel; return 1; @@ -117,7 +143,7 @@ err: static inline byte libmagick_pixel_to_gray(PixelPacket *pixel) { - return ((uns)pixel->red * 19660 + (uns)pixel->green * 38666 + (uns)pixel->blue * 7210) >> (16 + QUANTUM_SCALE); + return rgb_to_gray_func(pixel->red, pixel->green, pixel->blue) >> QUANTUM_SCALE; } int @@ -141,70 +167,85 @@ libmagick_read_data(struct image_io *io) break; } - /* Allocate image for conversion */ - int need_scale = io->cols != rd->image->columns || io->rows != rd->image->rows; - int need_destroy = need_scale || !io->pool; - struct image *img = need_scale ? - image_new(io->thread, rd->image->columns, rd->image->rows, io->flags & IMAGE_CHANNELS_FORMAT, NULL) : - image_new(io->thread, io->cols, io->rows, io->flags, io->pool); - if (!img) - goto err; + /* Prepare the image */ + struct image_io_read_data_internals rdi; + uint read_flags = io->flags; + uint cs = read_flags & IMAGE_COLOR_SPACE; + if (cs != COLOR_SPACE_GRAYSCALE && cs != COLOR_SPACE_RGB) + read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_PIXEL_FORMAT) | COLOR_SPACE_RGB; + if ((read_flags & IMAGE_IO_USE_BACKGROUND) && !(read_flags & IMAGE_ALPHA)) + read_flags = (read_flags & IMAGE_CHANNELS_FORMAT) | IMAGE_ALPHA; + if (unlikely(!image_io_read_data_prepare(&rdi, io, rd->image->columns, rd->image->rows, read_flags))) + { + libmagick_destroy_read_data(rd); + return 0; + } /* Acquire pixels */ PixelPacket *src = (PixelPacket *)AcquireImagePixels(rd->image, 0, 0, rd->image->columns, rd->image->rows, &rd->exception); - if (!src) + if (unlikely(!src)) { - image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Cannot acquire image pixels."); - goto err; + IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot acquire image pixels."); + libmagick_destroy_read_data(rd); + image_io_read_data_break(&rdi, io); + return 0; } /* Convert pixels */ - switch (img->pixel_size) + switch (rdi.image->pixel_size) { case 1: +# define IMAGE_WALK_PREFIX(x) walk_##x # define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE (rdi.image) # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_COL_STEP 1 # define IMAGE_WALK_DO_STEP do{ \ - pos[0] = libmagick_pixel_to_gray(src); \ + walk_pos[0] = libmagick_pixel_to_gray(src); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 2: +# define IMAGE_WALK_PREFIX(x) walk_##x # define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE (rdi.image) # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_DO_STEP do{ \ - pos[0] = libmagick_pixel_to_gray(src); \ - pos[1] = QUANTUM_TO_BYTE(src->opacity); \ + walk_pos[0] = libmagick_pixel_to_gray(src); \ + walk_pos[1] = ALPHA_TO_BYTE(src->opacity); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 3: +# define IMAGE_WALK_PREFIX(x) walk_##x # define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE (rdi.image) # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_COL_STEP 3 # define IMAGE_WALK_DO_STEP do{ \ - pos[0] = QUANTUM_TO_BYTE(src->red); \ - pos[1] = QUANTUM_TO_BYTE(src->green); \ - pos[2] = QUANTUM_TO_BYTE(src->blue); \ + walk_pos[0] = QUANTUM_TO_BYTE(src->red); \ + walk_pos[1] = QUANTUM_TO_BYTE(src->green); \ + walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 4: +# define IMAGE_WALK_PREFIX(x) walk_##x # define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE (rdi.image) # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_COL_STEP 4 # define IMAGE_WALK_DO_STEP do{ \ - pos[0] = QUANTUM_TO_BYTE(src->red); \ - pos[1] = QUANTUM_TO_BYTE(src->green); \ - pos[2] = QUANTUM_TO_BYTE(src->blue); \ - pos[3] = QUANTUM_TO_BYTE(src->opacity); \ + walk_pos[0] = QUANTUM_TO_BYTE(src->red); \ + walk_pos[1] = QUANTUM_TO_BYTE(src->green); \ + walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \ + walk_pos[3] = ALPHA_TO_BYTE(src->opacity); \ src++; }while(0) -# include "images/image-walk.h" +# include break; default: @@ -214,37 +255,167 @@ libmagick_read_data(struct image_io *io) /* Free GraphicsMagick structures */ libmagick_destroy_read_data(rd); - /* Scale image */ - if (need_scale) + /* Finish the image */ + return image_io_read_data_finish(&rdi, io); +} + +int +libmagick_write(struct image_io *io) +{ + DBG("libmagick_write()"); + + /* Initialize GraphicsMagick */ + int result = 0; + ExceptionInfo exception; + ImageInfo *info; + GetExceptionInfo(&exception); + info = CloneImageInfo(NULL); + + /* Setup image parameters and allocate the image*/ + struct image *img = io->image; + switch (img->flags & IMAGE_COLOR_SPACE) + { + case COLOR_SPACE_GRAYSCALE: + info->colorspace = GRAYColorspace; + break; + case COLOR_SPACE_RGB: + info->colorspace = RGBColorspace; + break; + default: + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Unsupported color space."); + goto err; + } + switch (io->format) + { + case IMAGE_FORMAT_JPEG: + strcpy(info->magick, "JPEG"); + if (io->jpeg_quality) + info->quality = MIN(io->jpeg_quality, 100); + break; + case IMAGE_FORMAT_PNG: + strcpy(info->magick, "PNG"); + break; + case IMAGE_FORMAT_GIF: + strcpy(info->magick, "GIF"); + break; + default: + ASSERT(0); + } + Image *image = AllocateImage(info); + if (unlikely(!image)) + { + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "GraphicsMagick failed to allocate the image."); + goto err; + } + image->columns = img->cols; + image->rows = img->rows; + + /* Get pixels */ + PixelPacket *pixels = SetImagePixels(image, 0, 0, img->cols, img->rows), *dest = pixels; + if (unlikely(!pixels)) + { + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot get GraphicsMagick pixels."); + goto err2; + } + + /* Convert pixels */ + switch (img->pixel_size) + { + case 1: +# define IMAGE_WALK_PREFIX(x) walk_##x +# define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE img +# define IMAGE_WALK_UNROLL 4 +# define IMAGE_WALK_COL_STEP 1 +# define IMAGE_WALK_DO_STEP do{ \ + dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->opacity = 0; \ + dest++; }while(0) +# include + break; + + case 2: +# define IMAGE_WALK_PREFIX(x) walk_##x +# define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE img +# define IMAGE_WALK_UNROLL 4 +# define IMAGE_WALK_COL_STEP 2 +# define IMAGE_WALK_DO_STEP do{ \ + dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->opacity = BYTE_TO_ALPHA(walk_pos[1]); \ + dest++; }while(0) +# include + break; + + case 3: +# define IMAGE_WALK_PREFIX(x) walk_##x +# define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE img +# define IMAGE_WALK_UNROLL 4 +# define IMAGE_WALK_COL_STEP 3 +# define IMAGE_WALK_DO_STEP do{ \ + dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \ + dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \ + dest->opacity = 0; \ + dest++; }while(0) +# include + break; + + case 4: +# define IMAGE_WALK_PREFIX(x) walk_##x +# define IMAGE_WALK_INLINE +# define IMAGE_WALK_IMAGE img +# define IMAGE_WALK_UNROLL 4 +# define IMAGE_WALK_COL_STEP 4 +# define IMAGE_WALK_DO_STEP do{ \ + dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \ + dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \ + dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \ + dest->opacity = BYTE_TO_ALPHA(walk_pos[3]); \ + dest++; }while(0) +# include + break; + + default: + ASSERT(0); + } + + /* Store pixels */ + if (unlikely(!SyncImagePixels(image))) + { + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot sync GraphicsMagick pixels."); + goto err2; + } + + /* Write image */ + size_t buf_len = 0; + void *buf = ImageToBlob(info, image, &buf_len, &exception); + if (unlikely(!buf)) + { + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "GraphicsMagick failed to compress the image."); + goto err2; + } + if (unlikely(buf_len > MAX_FILE_SIZE)) { - struct image *img2 = image_new(io->thread, io->cols, io->rows, io->flags, io->pool); - if (!img2) - goto err2; - int result = image_scale(io->thread, img2, img); - image_destroy(io->thread, img); - img = img2; - need_destroy = !io->pool; - if (!result) - goto err2; + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Image too large."); + goto err2; } + /* Write to stream */ + bwrite(io->fastbuf, buf, buf_len); + /* Success */ - io->image = img; - io->image_destroy = need_destroy; - return 1; + result = 1; - /* Free structures */ -err: - libmagick_destroy_read_data(rd); err2: - if (need_destroy) - image_destroy(io->thread, img); - return 0; -} - -int -libmagick_write(struct image_io *io) -{ - image_thread_err(io->thread, IMAGE_ERR_NOT_IMPLEMENTED, "GraphicsMagick write not implemented."); - return 0; + DestroyImage(image); +err: + DestroyImageInfo(info); + DestroyExceptionInfo(&exception); + return result; }