added support for libungif

diff --git a/images/io-libmagick.c b/images/io-libmagick.c
index aa426872920d17941ea0ee0141e89ca255b14e5f..ee0480d1b5371c7606eb051088d5b67468d0dce4 100644 (file)
--- a/images/io-libmagick.c
+++ b/images/io-libmagick.c
@@ -65,7 +65,7 @@ libmagick_read_header(struct image_io *io)
     }
   uns buf_size = file_size;
   byte *buf = xmalloc(buf_size);
-  bread(io->fastbuf, buf, buf_size);
+  breadb(io->fastbuf, buf, buf_size);
 
   /* Allocate read structure */
   struct magick_read_data *rd = io->read_data = mp_alloc(io->internal_pool, sizeof(*rd));

diff --git a/images/io-libungif.c b/images/io-libungif.c
index 0cc2622d2ffc96e48938d74cd120daa64feab41a..c047fc537aa1ee92a5e920b4f64571aabe929229 100644 (file)
--- a/images/io-libungif.c
+++ b/images/io-libungif.c
@@ -7,20 +7,255 @@
  *     of the GNU Lesser General Public License.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "lib/lib.h"
+#include "lib/mempool.h"
+#include "lib/fastbuf.h"
 #include "images/images.h"
+#include <gif_lib.h>
+
+static int
+libungif_read_func(GifFileType *gif, GifByteType *ptr, int len)
+{
+  DBG("libungif_read_func(len=%d)", len);
+  return bread((struct fastbuf *)gif->UserData, (byte *)ptr, len);
+}
+
+static void
+libungif_read_cancel(struct image_io *io)
+{
+  DBG("libungif_read_cancel()");
+
+  DGifCloseFile(io->read_data);
+}
 
 int
 libungif_read_header(struct image_io *io)
 {
-  image_thread_err(io->thread, IMAGE_ERR_NOT_IMPLEMENTED, "Libungif read not implemented.");
-  return 0;
+  DBG("libungif_read_header()");
+
+  /* Create libungif structure */
+  GifFileType *gif;
+  if (unlikely(!(gif = io->read_data = DGifOpen(io->fastbuf, libungif_read_func))))
+    {
+      image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Cannot create libungif structure.");
+      return 0;
+    }
+
+  if (unlikely(DGifSlurp(gif) != GIF_OK))
+    {
+      image_thread_err(io->thread, IMAGE_ERR_READ_FAILED, "Gif read failed.");
+      DGifCloseFile(gif);
+      return 0;
+    }
+
+  if (unlikely(!gif->ImageCount))
+    {
+      image_thread_err(io->thread, IMAGE_ERR_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_thread_err(io->thread, IMAGE_ERR_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.");
+      DGifCloseFile(gif);
+      return 0;
+    }
+  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;
+
+  /* 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 UNUSED)
+libungif_read_data(struct image_io *io)
 {
-  ASSERT(0);
+  DBG("libungif_read_data()");
+
+  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;
+
+  /* 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;
+
+  /* Handle deinterlacing */
+  uns dein_step, dein_next;
+  if (image->ImageDesc.Interlace)
+    dein_step = dein_next = img->row_size << 3;
+  else
+    dein_step = dein_next = img->row_size;
+
+  /* Convert pixels */
+  switch (img->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);
+         if (pal_pos != pal_end)
+           bzero(pal_pos, pal_end - pal_pos);
+#        define IMAGE_WALK_INLINE
+#        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)
+#        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++)
+           {
+             pal_pos[0] = libungif_pixel_to_gray(palette);
+             pal_pos[1] = 255;
+           }
+         if (pal_pos != pal_end)
+           bzero(pal_pos, pal_end - pal_pos);
+         if (background < 256)
+           pal[background * 2 + 1] = 0;
+#        define IMAGE_WALK_INLINE
+#        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)
+#        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++)
+           {
+             pal_pos[0] = palette->Red;
+             pal_pos[1] = palette->Green;
+             pal_pos[2] = palette->Blue;
+           }
+         if (pal_pos != pal_end)
+           bzero(pal_pos, pal_end - pal_pos);
+#        define IMAGE_WALK_INLINE
+#        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)
+#        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++)
+           {
+             pal_pos[0] = palette->Red;
+             pal_pos[1] = palette->Green;
+             pal_pos[2] = palette->Blue;
+             pal_pos[3] = 255;
+           }
+         if (pal_pos != pal_end)
+           bzero(pal_pos, pal_end - pal_pos);
+         if (background < 256)
+           pal[background * 4 + 3] = 0;
+#        define IMAGE_WALK_INLINE
+#        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)
+#        include "images/image-walk.h"
+         break;
+       }
+      default:
+        ASSERT(0);
+    }
+
+  /* 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;
 }

diff --git a/images/io-main.c b/images/io-main.c
index 65f61782c3665b548d6976e891649c698f3aede0..ef18e6606b2457865c2a1986f46a6e46cb737f6c 100644 (file)
--- a/images/io-main.c
+++ b/images/io-main.c
@@ -88,7 +88,7 @@ image_io_read_header(struct image_io *io)
       break;
 
     case IMAGE_FORMAT_GIF:
-#if defined(CONFIG_LIBUNGIG)
+#if defined(CONFIG_LIBUNGIF)
       return libungif_read_header(io);
 #elif defined(CONFIG_LIBMAGICK)
       return libmagick_read_header(io);
@@ -136,6 +136,8 @@ image_io_read_data(struct image_io *io, int ref)
 
     case IMAGE_FORMAT_GIF:
 #if defined(CONFIG_LIBMAGICK)
+      result = libungif_read_data(io);
+#elif defined(CONFIG_LIBMAGICK)
       result = libmagick_read_data(io);
 #else
       ASSERT(0);