#undef LOCAL_DEBUG
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
#include "images/images.h"
+#include "images/error.h"
#include "images/color.h"
#include "images/io-main.h"
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;
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;
}
/* Prepare the image */
struct image_io_read_data_internals rdi;
uns read_flags = io->flags;
+ uns 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);
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;
info->colorspace = RGBColorspace;
break;
default:
- ASSERT(0);
+ IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Unsupported color space.");
+ goto err;
}
switch (io->format)
{
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;
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;
}
/* 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;
}
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;
}