#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"
+
#include <gif_lib.h>
struct libungif_read_data {
{
DBG("libungif_read_cancel()");
- DGifCloseFile(io->read_data);
+ struct libungif_read_data *rd = io->read_data;
+ DGifCloseFile(rd->gif);
}
int
GifFileType *gif;
if (unlikely(!(gif = DGifOpen(io->fastbuf, libungif_read_func))))
{
- image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Cannot create libungif structure.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot create libungif structure.");
return 0;
}
DBG("executing DGifSlurp()");
if (unlikely(DGifSlurp(gif) != GIF_OK))
{
- image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Gif read failed.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Gif read failed.");
DGifCloseFile(gif);
return 0;
}
DBG("ImageCount=%d ColorResolution=%d SBackGroundColor=%d SColorMap=%p", gif->ImageCount, gif->SColorResolution, gif->SBackGroundColor, gif->SColorMap);
if (unlikely(!gif->ImageCount))
{
- image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "There are no images in gif file.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "There are no images in gif file.");
DGifCloseFile(gif);
return 0;
}
/* Read image parameters */
SavedImage *image = gif->SavedImages;
if (unlikely(image->ImageDesc.Width <= 0 || image->ImageDesc.Height <= 0 ||
- image->ImageDesc.Width > (int)IMAGE_MAX_SIZE || image->ImageDesc.Height > (int)IMAGE_MAX_SIZE))
+ image->ImageDesc.Width > (int)image_max_dim || image->ImageDesc.Height > (int)image_max_dim))
{
- image_thread_err(io->thread, IMAGE_ERR_INVALID_DIMENSIONS, "Invalid gif dimensions.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_DIMENSIONS, "Invalid gif dimensions.");
DGifCloseFile(gif);
return 0;
}
ColorMapObject *color_map = image->ImageDesc.ColorMap ? : gif->SColorMap;
if (unlikely(!color_map))
{
- image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Missing palette.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Missing palette.");
DGifCloseFile(gif);
return 0;
}
io->rows = image->ImageDesc.Height;
if (unlikely((io->number_of_colors = color_map->ColorCount) > 256))
{
- image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Too many gif colors.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too many gif colors.");
DGifCloseFile(gif);
return 0;
}
DBG("Found graphics control extension");
if (unlikely(e->ByteCount != 4))
{
- image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Invalid graphics control extension.");
+ IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Invalid graphics control extension.");
DGifCloseFile(gif);
return 0;
}
/* Prepare image */
struct image_io_read_data_internals rdi;
- if (unlikely(!image_io_read_data_prepare(&rdi, io, image->ImageDesc.Width, image->ImageDesc.Height, io->flags)))
+ 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_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+ if (unlikely(!image_io_read_data_prepare(&rdi, io, image->ImageDesc.Width, image->ImageDesc.Height, read_flags)))
{
DGifCloseFile(gif);
return 0;
if (pal_pos != pal_end)
bzero(pal_pos, pal_end - pal_pos);
if (rd->transparent_index >= 0 && (io->flags & IMAGE_IO_USE_BACKGROUND))
- color_put_grayscale(pal + rd->transparent_index, &io->background_color);
+ if (!color_put(io->context, &io->background_color, pal + rd->transparent_index, COLOR_SPACE_GRAYSCALE))
+ {
+ DGifCloseFile(gif);
+ return 0;
+ }
# define DO_ROW_END do{ \
- walk_row_start += dein_step; \
- if (walk_row_start >= img_end) \
+ walk_row_start += dein_step; \
+ while (walk_row_start >= img_end) \
{ uns n = dein_next >> 1; walk_row_start = rdi.image->pixels + n, dein_step = dein_next; dein_next = n; } \
}while(0)
# define IMAGE_WALK_PREFIX(x) walk_##x
if (pal_pos != pal_end)
bzero(pal_pos, pal_end - pal_pos);
if (rd->transparent_index >= 0 && (io->flags & IMAGE_IO_USE_BACKGROUND))
- color_put_rgb(pal + 4 * rd->transparent_index, &io->background_color);
+ if (!color_put(io->context, &io->background_color, pal + 4 * rd->transparent_index, COLOR_SPACE_RGB))
+ {
+ DGifCloseFile(gif);
+ return 0;
+ }
# define IMAGE_WALK_PREFIX(x) walk_##x
# define IMAGE_WALK_INLINE
# define IMAGE_WALK_IMAGE (rdi.image)