X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libungif.c;h=3a2af11c386de65ec6209b3d3e7ff41f8ab70b7e;hb=7ae5e8180b1211be9a9ba3328115990982204a6a;hp=c047fc537aa1ee92a5e920b4f64571aabe929229;hpb=50fb30847e2256c1454b108dd458203a15bfb791;p=libucw.git diff --git a/images/io-libungif.c b/images/io-libungif.c index c047fc53..3a2af11c 100644 --- a/images/io-libungif.c +++ b/images/io-libungif.c @@ -13,6 +13,7 @@ #include "lib/mempool.h" #include "lib/fastbuf.h" #include "images/images.h" +#include "images/io-main.h" #include static int @@ -75,9 +76,8 @@ libungif_read_header(struct image_io *io) } 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; + io->flags = COLOR_SPACE_RGB | IMAGE_IO_HAS_PALETTE; if ((uns)gif->SBackGroundColor < (uns)color_map->ColorCount) io->flags |= IMAGE_ALPHA; @@ -100,57 +100,58 @@ libungif_read_data(struct image_io *io) GifFileType *gif = io->read_data; 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))) + { + 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; + 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++) + for (uns i = 0; i < (uns)color_map->ColorCount; i++, pal_pos++, palette++) *pal_pos = libungif_pixel_to_gray(palette); if (pal_pos != pal_end) bzero(pal_pos, pal_end - pal_pos); +# 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[1] = 255; @@ -159,24 +160,21 @@ libungif_read_data(struct image_io *io) bzero(pal_pos, pal_end - pal_pos); if (background < 256) pal[background * 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; @@ -184,24 +182,21 @@ libungif_read_data(struct image_io *io) } if (pal_pos != pal_end) bzero(pal_pos, pal_end - pal_pos); +# 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; @@ -212,16 +207,14 @@ libungif_read_data(struct image_io *io) bzero(pal_pos, pal_end - pal_pos); if (background < 256) pal[background * 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; } @@ -232,30 +225,6 @@ libungif_read_data(struct image_io *io) /* 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); }