X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fio-libmagick.c;h=3636163174a183cbf1400713c965ccad5e6b9068;hb=1481eca416a467e9952dbc5e4852afe66eaf1256;hp=d75f0a8938e7168856a5a73721ba507cf404a696;hpb=cc158370cbaee83cafb5965f20dc2df848a4faef;p=libucw.git diff --git a/images/io-libmagick.c b/images/io-libmagick.c index d75f0a89..36361631 100644 --- a/images/io-libmagick.c +++ b/images/io-libmagick.c @@ -9,24 +9,29 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/mempool.h" -#include "lib/fastbuf.h" -#include "images/images.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include + #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 BYTE_TO_QUANTUM(x) ((uns)(x) << QUANTUM_SCALE) -#define OPACITY_MAX ((1 << QuantumDepth) - 1) +#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 uns libmagick_counter; +static pthread_mutex_t libmagick_mutex = PTHREAD_MUTEX_INITIALIZER; +static uint libmagick_counter; struct magick_read_data { ExceptionInfo exception; @@ -37,18 +42,20 @@ struct magick_read_data { int libmagick_init(struct image_io *io UNUSED) { - // FIXME: lock + 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) { - // FIXME: lock + pthread_mutex_lock(&libmagick_mutex); if (!--libmagick_counter) DestroyMagick(); + pthread_mutex_unlock(&libmagick_mutex); } static void @@ -75,13 +82,13 @@ 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); + 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); breadb(io->fastbuf, buf, buf_size); @@ -98,12 +105,12 @@ libmagick_read_header(struct image_io *io) xfree(buf); 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 (unlikely(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; } @@ -162,9 +169,12 @@ libmagick_read_data(struct image_io *io) /* Prepare the image */ struct image_io_read_data_internals rdi; - uns read_flags = io->flags; + 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_ALPHA) & IMAGE_CHANNELS_FORMAT; + 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); @@ -175,7 +185,7 @@ libmagick_read_data(struct image_io *io) PixelPacket *src = (PixelPacket *)AcquireImagePixels(rd->image, 0, 0, rd->image->columns, rd->image->rows, &rd->exception); if (unlikely(!src)) { - image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Cannot acquire image pixels."); + 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; @@ -193,7 +203,7 @@ libmagick_read_data(struct image_io *io) # define IMAGE_WALK_DO_STEP do{ \ walk_pos[0] = libmagick_pixel_to_gray(src); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 2: @@ -204,9 +214,9 @@ libmagick_read_data(struct image_io *io) # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_DO_STEP do{ \ walk_pos[0] = libmagick_pixel_to_gray(src); \ - walk_pos[1] = QUANTUM_TO_BYTE(src->opacity); \ + walk_pos[1] = ALPHA_TO_BYTE(src->opacity); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 3: @@ -220,7 +230,7 @@ libmagick_read_data(struct image_io *io) 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: @@ -233,9 +243,9 @@ libmagick_read_data(struct image_io *io) 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] = QUANTUM_TO_BYTE(src->opacity); \ + walk_pos[3] = ALPHA_TO_BYTE(src->opacity); \ src++; }while(0) -# include "images/image-walk.h" +# include break; default: @@ -272,7 +282,8 @@ libmagick_write(struct image_io *io) info->colorspace = RGBColorspace; break; default: - ASSERT(0); + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Unsupported color space."); + goto err; } switch (io->format) { @@ -293,7 +304,7 @@ libmagick_write(struct image_io *io) Image *image = AllocateImage(info); if (unlikely(!image)) { - image_thread_err(io->thread, IMAGE_ERR_WRITE_FAILED, "GraphicsMagick failed to allocate the image."); + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "GraphicsMagick failed to allocate the image."); goto err; } image->columns = img->cols; @@ -303,7 +314,7 @@ libmagick_write(struct image_io *io) PixelPacket *pixels = SetImagePixels(image, 0, 0, img->cols, img->rows), *dest = pixels; if (unlikely(!pixels)) { - image_thread_err(io->thread, IMAGE_ERR_WRITE_FAILED, "Cannot get GraphicsMagick pixels."); + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot get GraphicsMagick pixels."); goto err2; } @@ -320,9 +331,9 @@ libmagick_write(struct image_io *io) 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 = OPACITY_MAX; \ + dest->opacity = 0; \ dest++; }while(0) -# include "images/image-walk.h" +# include break; case 2: @@ -335,9 +346,9 @@ libmagick_write(struct image_io *io) 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_QUANTUM(walk_pos[1]); \ + dest->opacity = BYTE_TO_ALPHA(walk_pos[1]); \ dest++; }while(0) -# include "images/image-walk.h" +# include break; case 3: @@ -350,9 +361,9 @@ libmagick_write(struct image_io *io) 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 = OPACITY_MAX; \ + dest->opacity = 0; \ dest++; }while(0) -# include "images/image-walk.h" +# include break; case 4: @@ -365,9 +376,9 @@ libmagick_write(struct image_io *io) 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_QUANTUM(walk_pos[3]); \ + dest->opacity = BYTE_TO_ALPHA(walk_pos[3]); \ dest++; }while(0) -# include "images/image-walk.h" +# include break; default: @@ -377,7 +388,7 @@ libmagick_write(struct image_io *io) /* Store pixels */ if (unlikely(!SyncImagePixels(image))) { - image_thread_err(io->thread, IMAGE_ERR_WRITE_FAILED, "Cannot sync GraphicsMagick pixels."); + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot sync GraphicsMagick pixels."); goto err2; } @@ -386,12 +397,12 @@ libmagick_write(struct image_io *io) void *buf = ImageToBlob(info, image, &buf_len, &exception); if (unlikely(!buf)) { - image_thread_err(io->thread, IMAGE_ERR_WRITE_FAILED, "GraphicsMagick failed to compress the image."); + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "GraphicsMagick failed to compress the image."); goto err2; } if (unlikely(buf_len > MAX_FILE_SIZE)) { - image_thread_err(io->thread, IMAGE_ERR_WRITE_FAILED, "Image too large."); + IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Image too large."); goto err2; }