#include "lib/mempool.h"
#include "lib/fastbuf.h"
#include "images/images.h"
+#include "images/color.h"
+#include "images/io-main.h"
#include <gif_lib.h>
+struct libungif_read_data {
+ GifFileType *gif;
+ int transparent_index;
+};
+
static int
libungif_read_func(GifFileType *gif, GifByteType *ptr, int len)
{
{
DBG("libungif_read_cancel()");
- DGifCloseFile(io->read_data);
+ struct libungif_read_data *rd = io->read_data;
+ DGifCloseFile(rd->gif);
}
int
/* Create libungif structure */
GifFileType *gif;
- if (unlikely(!(gif = io->read_data = DGifOpen(io->fastbuf, libungif_read_func))))
+ if (unlikely(!(gif = DGifOpen(io->fastbuf, libungif_read_func))))
{
image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Cannot create libungif structure.");
return 0;
}
+ struct libungif_read_data *rd = io->read_data = mp_alloc(io->internal_pool, sizeof(*rd));
+ rd->gif = gif;
+
+ DBG("executing DGifSlurp()");
if (unlikely(DGifSlurp(gif) != GIF_OK))
{
image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Gif read failed.");
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.");
}
io->cols = image->ImageDesc.Width;
io->rows = image->ImageDesc.Height;
- io->has_palette = 1;
- io->number_of_colors = color_map->ColorCount;
- io->flags = COLOR_SPACE_RGB;
- if ((uns)gif->SBackGroundColor < (uns)color_map->ColorCount)
- io->flags |= IMAGE_ALPHA;
+ if (unlikely((io->number_of_colors = color_map->ColorCount) > 256))
+ {
+ image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Too many gif colors.");
+ DGifCloseFile(gif);
+ return 0;
+ }
+ io->flags = COLOR_SPACE_RGB | IMAGE_IO_HAS_PALETTE;
+
+ /* Search extension blocks */
+ rd->transparent_index = -1;
+ for (int i = 0; i < image->ExtensionBlockCount; i++)
+ {
+ ExtensionBlock *e = image->ExtensionBlocks + i;
+ if (e->Function == 0xF9)
+ {
+ DBG("Found graphics control extension");
+ if (unlikely(e->ByteCount != 4))
+ {
+ image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Invalid graphics control extension.");
+ DGifCloseFile(gif);
+ return 0;
+ }
+ byte *b = e->Bytes;
+ /* transparent color present */
+ if (b[0] & 1)
+ {
+ rd->transparent_index = b[3];
+ io->flags |= IMAGE_ALPHA;
+ if (gif->SColorMap)
+ {
+ GifColorType *background = color_map->Colors + gif->SBackGroundColor;
+ color_make_rgb(&io->background_color, background->Red, background->Green, background->Blue);
+ }
+ }
+ /* We've got everything we need :-) */
+ break;
+ }
+ else
+ DBG("Found unknown extension: type=%d size=%d", e->Function, e->ByteCount);
+ }
/* Success */
io->read_cancel = libungif_read_cancel;
return 1;
}
-static inline byte
-libungif_pixel_to_gray(GifColorType *pixel)
-{
- return ((uns)pixel->Red * 19660 + (uns)pixel->Green * 38666 + (uns)pixel->Blue * 7210) >> 16;
-}
-
int
libungif_read_data(struct image_io *io)
{
DBG("libungif_read_data()");
- GifFileType *gif = io->read_data;
+ struct libungif_read_data *rd = io->read_data;
+ GifFileType *gif = rd->gif;
SavedImage *image = gif->SavedImages;
- /* Allocate image */
- int need_scale = io->cols != (uns)image->ImageDesc.Width || io->rows != (uns)image->ImageDesc.Height;
- int need_destroy = need_scale || !io->pool;
- struct image *img = need_scale ?
- image_new(io->thread, image->ImageDesc.Width, image->ImageDesc.Height, io->flags & IMAGE_CHANNELS_FORMAT, NULL) :
- image_new(io->thread, io->cols, io->rows, io->flags, io->pool);
- if (unlikely(!img))
- goto err;
+ /* 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)))
+ {
+ DGifCloseFile(gif);
+ return 0;
+ }
/* Get pixels and palette */
byte *pixels = (byte *)image->RasterBits;
ColorMapObject *color_map = image->ImageDesc.ColorMap ? : gif->SColorMap;
GifColorType *palette = color_map->Colors;
- uns background = gif->SBackGroundColor;
+ byte *img_end = rdi.image->pixels + rdi.image->image_size;
/* Handle deinterlacing */
uns dein_step, dein_next;
if (image->ImageDesc.Interlace)
- dein_step = dein_next = img->row_size << 3;
+ {
+ DBG("Deinterlaced image");
+ dein_step = dein_next = rdi.image->row_size << 3;
+ }
else
- dein_step = dein_next = img->row_size;
+ dein_step = dein_next = rdi.image->row_size;
/* Convert pixels */
- switch (img->pixel_size)
+ switch (rdi.image->pixel_size)
{
case 1:
{
- uns i;
byte pal[256], *pal_pos = pal, *pal_end = pal + 256;
- for (i = 0; i < (uns)color_map->ColorCount; i++, pal_pos++, palette++)
- *pal_pos = libungif_pixel_to_gray(palette);
+ for (uns i = 0; i < (uns)color_map->ColorCount; i++, pal_pos++, palette++)
+ *pal_pos = rgb_to_gray_func(palette->Red, palette->Green, palette->Blue);
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);
+# define DO_ROW_END do{ \
+ walk_row_start += dein_step; \
+ if (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
# define IMAGE_WALK_INLINE
+# define IMAGE_WALK_IMAGE (rdi.image)
# define IMAGE_WALK_UNROLL 4
# define IMAGE_WALK_COL_STEP 1
# define IMAGE_WALK_ROW_STEP 0
-# define IMAGE_WALK_DO_STEP do{ *pos = pal[*pixels++]; }while(0)
-# define IMAGE_WALK_DO_ROW_END do{ \
- row_start += dein_step; \
- if (row_start > img->pixels + img->image_size) \
- row_start = img->pixels + (dein_next >>= 1), dein_step = dein_next << 1; \
- }while(0)
+# define IMAGE_WALK_DO_STEP do{ *walk_pos = pal[*pixels++]; }while(0)
+# define IMAGE_WALK_DO_ROW_END DO_ROW_END
# include "images/image-walk.h"
break;
}
case 2:
{
- uns i;
byte pal[256 * 2], *pal_pos = pal, *pal_end = pal + 256 * 2;
- for (i = 0; i < (uns)color_map->ColorCount; i++, pal_pos += 2, palette++)
+ for (uns i = 0; i < (uns)color_map->ColorCount; i++, pal_pos += 2, palette++)
{
- pal_pos[0] = libungif_pixel_to_gray(palette);
+ pal_pos[0] = rgb_to_gray_func(palette->Red, palette->Green, palette->Blue);
pal_pos[1] = 255;
}
if (pal_pos != pal_end)
bzero(pal_pos, pal_end - pal_pos);
- if (background < 256)
- pal[background * 2 + 1] = 0;
+ if (rd->transparent_index >= 0)
+ pal[rd->transparent_index * 2 + 1] = 0;
+# 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_ROW_STEP 0
-# define IMAGE_WALK_DO_STEP do{ *(u16 *)pos = ((u16 *)pal)[*pixels++]; }while(0)
-# define IMAGE_WALK_DO_ROW_END do{ \
- row_start += dein_step; \
- if (row_start > img->pixels + img->image_size) \
- row_start = img->pixels + (dein_next >>= 1), dein_step = dein_next << 1; \
- }while(0)
+# define IMAGE_WALK_DO_STEP do{ *(u16 *)walk_pos = ((u16 *)pal)[*pixels++]; }while(0)
+# define IMAGE_WALK_DO_ROW_END DO_ROW_END
# include "images/image-walk.h"
break;
}
case 3:
{
- uns i;
byte pal[256 * 4], *pal_pos = pal, *pal_end = pal + 256 * 4;
- for (i = 0; i < (uns)color_map->ColorCount; i++, pal_pos += 4, palette++)
+ for (uns i = 0; i < (uns)color_map->ColorCount; i++, pal_pos += 4, palette++)
{
pal_pos[0] = palette->Red;
pal_pos[1] = palette->Green;
}
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);
+# 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_ROW_STEP 0
-# define IMAGE_WALK_DO_STEP do{ byte *p = pal + 4 * (*pixels++); pos[0] = p[0]; pos[1] = p[1]; pos[2] = p[2]; }while(0)
-# define IMAGE_WALK_DO_ROW_END do{ \
- row_start += dein_step; \
- if (row_start > img->pixels + img->image_size) \
- row_start = img->pixels + (dein_next >>= 1), dein_step = dein_next << 1; \
- }while(0)
+# define IMAGE_WALK_DO_STEP do{ byte *p = pal + 4 * (*pixels++); walk_pos[0] = p[0]; walk_pos[1] = p[1]; walk_pos[2] = p[2]; }while(0)
+# define IMAGE_WALK_DO_ROW_END DO_ROW_END
# include "images/image-walk.h"
break;
}
case 4:
{
- uns i;
byte pal[256 * 4], *pal_pos = pal, *pal_end = pal + 256 * 4;
- for (i = 0; i < (uns)color_map->ColorCount; i++, pal_pos += 4, palette++)
+ for (uns i = 0; i < (uns)color_map->ColorCount; i++, pal_pos += 4, palette++)
{
pal_pos[0] = palette->Red;
pal_pos[1] = palette->Green;
}
if (pal_pos != pal_end)
bzero(pal_pos, pal_end - pal_pos);
- if (background < 256)
- pal[background * 4 + 3] = 0;
+ if (rd->transparent_index >= 0)
+ pal[rd->transparent_index * 4 + 3] = 0;
+# 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_ROW_STEP 0
-# define IMAGE_WALK_DO_STEP do{ *(u32 *)pos = ((u32 *)pal)[*pixels++]; }while(0)
-# define IMAGE_WALK_DO_ROW_END do{ \
- row_start += dein_step; \
- if (row_start > img->pixels + img->image_size) \
- row_start = img->pixels + (dein_next >>= 1), dein_step = dein_next << 1; \
- }while(0)
+# define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = ((u32 *)pal)[*pixels++]; }while(0)
+# define IMAGE_WALK_DO_ROW_END DO_ROW_END
# include "images/image-walk.h"
break;
}
/* Destroy libungif structure */
DGifCloseFile(gif);
- /* Scale image */
- if (need_scale)
- {
- struct image *img2 = image_new(io->thread, io->cols, io->rows, io->flags, io->pool);
- if (unlikely(!img2))
- goto err2;
- int result = image_scale(io->thread, img2, img);
- image_destroy(img);
- img = img2;
- need_destroy = !io->pool;
- if (unlikely(!result))
- goto err2;
- }
-
- /* Success */
- io->image = img;
- io->image_destroy = need_destroy;
- return 1;
-
- /* Free structures */
-err:
- DGifCloseFile(gif);
-err2:
- if (need_destroy)
- image_destroy(img);
- return 0;
+ /* Finish image */
+ return image_io_read_data_finish(&rdi, io);
}
projects / libucw.git / blobdiff