XTypes: Added support to configuration and option parser.

[libucw.git] / images / io-libmagick.c

diff --git a/images/io-libmagick.c b/images/io-libmagick.c
index bd503e792a72b0dbb1fbfe906547e474dd73a144..3636163174a183cbf1400713c965ccad5e6b9068 100644 (file)
--- a/images/io-libmagick.c
+++ b/images/io-libmagick.c
@@ -9,22 +9,29 @@
 
 #undef LOCAL_DEBUG
 
 
 #undef LOCAL_DEBUG
 

-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "images/images.h"
-#include "images/color.h"
-#include "images/io-main.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 <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <magick/api.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <magick/api.h>

+#include <pthread.h>

 
 #define MAX_FILE_SIZE (1 << 30)
 #define QUANTUM_SCALE (QuantumDepth - 8)
 
 #define MAX_FILE_SIZE (1 << 30)
 #define QUANTUM_SCALE (QuantumDepth - 8)

-#define QUANTUM_TO_BYTE(x) ((uns)(x) >> QUANTUM_SCALE)
-#define BYTE_TO_QUANTUM(x) ((uns)(x) << QUANTUM_SCALE)
-#define OPACITY_MAX ((1 << QuantumDepth) - 1)
+#define QUANTUM_TO_BYTE(x) ((uint)(x) >> QUANTUM_SCALE)
+#define BYTE_TO_QUANTUM(x) ((uint)(x) << QUANTUM_SCALE)
+#define ALPHA_TO_BYTE(x) (255 - QUANTUM_TO_BYTE(x))
+#define BYTE_TO_ALPHA(x) (BYTE_TO_QUANTUM(255 - (x)))
+
+static pthread_mutex_t libmagick_mutex = PTHREAD_MUTEX_INITIALIZER;
+static uint libmagick_counter;

 
 struct magick_read_data {
   ExceptionInfo exception;
 
 struct magick_read_data {
   ExceptionInfo exception;


@@ -32,14 +39,32 @@ struct magick_read_data {
   Image *image;
 };
 
   Image *image;
 };
 

-static inline void
+int
+libmagick_init(struct image_io *io UNUSED)
+{
+  pthread_mutex_lock(&libmagick_mutex);
+  if (!libmagick_counter++)
+    InitializeMagick(NULL);
+  pthread_mutex_unlock(&libmagick_mutex);
+  return 1;
+}
+
+void
+libmagick_cleanup(struct image_io *io UNUSED)
+{
+  pthread_mutex_lock(&libmagick_mutex);
+  if (!--libmagick_counter)
+    DestroyMagick();
+  pthread_mutex_unlock(&libmagick_mutex);
+}
+
+static void

 libmagick_destroy_read_data(struct magick_read_data *rd)
 {
   if (rd->image)
     DestroyImage(rd->image);
   DestroyImageInfo(rd->info);
   DestroyExceptionInfo(&rd->exception);
 libmagick_destroy_read_data(struct magick_read_data *rd)
 {
   if (rd->image)
     DestroyImage(rd->image);
   DestroyImageInfo(rd->info);
   DestroyExceptionInfo(&rd->exception);

-  DestroyMagick();

 }
 
 static void
 }
 
 static void


@@ -48,8 +73,6 @@ libmagick_read_cancel(struct image_io *io)
   DBG("libmagick_read_cancel()");
 
   struct magick_read_data *rd = io->read_data;
   DBG("libmagick_read_cancel()");
 
   struct magick_read_data *rd = io->read_data;

-
-  DestroyImage(rd->image);

   libmagick_destroy_read_data(rd);
 }
 
   libmagick_destroy_read_data(rd);
 }
 


@@ -59,21 +82,20 @@ libmagick_read_header(struct image_io *io)
   DBG("libmagick_read_header()");
 
   /* Read entire stream */
   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))
     {
   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;
     }
       return 0;
     }

-  uns buf_size = file_size;
+  uint buf_size = file_size;

   byte *buf = xmalloc(buf_size);
   breadb(io->fastbuf, buf, buf_size);
 
   /* Allocate read structure */
   byte *buf = xmalloc(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));
+  struct magick_read_data *rd = io->read_data = mp_alloc_zero(io->internal_pool, sizeof(*rd));

 
   /* Initialize GraphicsMagick */
 
   /* Initialize GraphicsMagick */

-  InitializeMagick(NULL);

   GetExceptionInfo(&rd->exception);
   rd->info = CloneImageInfo(NULL);
   rd->info->subrange = 1;
   GetExceptionInfo(&rd->exception);
   rd->info = CloneImageInfo(NULL);
   rd->info->subrange = 1;


@@ -83,12 +105,12 @@ libmagick_read_header(struct image_io *io)
   xfree(buf);
   if (unlikely(!rd->image))
     {
   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;
     }
       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;
     }
 
       goto err;
     }
 


@@ -98,12 +120,14 @@ libmagick_read_header(struct image_io *io)
   switch (rd->image->colorspace)
     {
       case GRAYColorspace:
   switch (rd->image->colorspace)
     {
       case GRAYColorspace:

-        io->flags = COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA;
+        io->flags = COLOR_SPACE_GRAYSCALE;

         break;
       default:
         break;
       default:

-        io->flags = COLOR_SPACE_RGB | IMAGE_ALPHA;
+        io->flags = COLOR_SPACE_RGB;

         break;
     }
         break;
     }

+  if (rd->image->matte)
+    io->flags |= IMAGE_ALPHA;

   io->number_of_colors = rd->image->colors;
   if (rd->image->storage_class == PseudoClass && rd->image->compression != JPEGCompression)
     io->flags |= IMAGE_IO_HAS_PALETTE;
   io->number_of_colors = rd->image->colors;
   if (rd->image->storage_class == PseudoClass && rd->image->compression != JPEGCompression)
     io->flags |= IMAGE_IO_HAS_PALETTE;


@@ -145,9 +169,12 @@ libmagick_read_data(struct image_io *io)
 
   /* Prepare the image */
   struct image_io_read_data_internals rdi;
 
   /* Prepare the image */
   struct image_io_read_data_internals rdi;

-  uns read_flags = io->flags;
+  uint read_flags = io->flags;
+  uint 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))
   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);
   if (unlikely(!image_io_read_data_prepare(&rdi, io, rd->image->columns, rd->image->rows, read_flags)))
     {
       libmagick_destroy_read_data(rd);


@@ -158,7 +185,7 @@ libmagick_read_data(struct image_io *io)
   PixelPacket *src = (PixelPacket *)AcquireImagePixels(rd->image, 0, 0, rd->image->columns, rd->image->rows, &rd->exception);
   if (unlikely(!src))
     {
   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;
       libmagick_destroy_read_data(rd);
       image_io_read_data_break(&rdi, io);
       return 0;


@@ -176,7 +203,7 @@ libmagick_read_data(struct image_io *io)
 #       define IMAGE_WALK_DO_STEP do{ \
          walk_pos[0] = libmagick_pixel_to_gray(src); \
          src++; }while(0)
 #       define IMAGE_WALK_DO_STEP do{ \
          walk_pos[0] = libmagick_pixel_to_gray(src); \
          src++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       case 2:
        break;
 
       case 2:


@@ -187,9 +214,9 @@ libmagick_read_data(struct image_io *io)
 #       define IMAGE_WALK_COL_STEP 2
 #       define IMAGE_WALK_DO_STEP do{ \
          walk_pos[0] = libmagick_pixel_to_gray(src); \
 #       define IMAGE_WALK_COL_STEP 2
 #       define IMAGE_WALK_DO_STEP do{ \
          walk_pos[0] = libmagick_pixel_to_gray(src); \

-         walk_pos[1] = QUANTUM_TO_BYTE(src->opacity); \
+         walk_pos[1] = ALPHA_TO_BYTE(src->opacity); \

          src++; }while(0)
          src++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       case 3:
        break;
 
       case 3:


@@ -203,7 +230,7 @@ libmagick_read_data(struct image_io *io)
          walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
          walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
          src++; }while(0)
          walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
          walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
          src++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       case 4:
        break;
 
       case 4:


@@ -216,9 +243,9 @@ libmagick_read_data(struct image_io *io)
          walk_pos[0] = QUANTUM_TO_BYTE(src->red); \
          walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
          walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
          walk_pos[0] = QUANTUM_TO_BYTE(src->red); \
          walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
          walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \

-         walk_pos[3] = QUANTUM_TO_BYTE(src->opacity); \
+         walk_pos[3] = ALPHA_TO_BYTE(src->opacity); \

          src++; }while(0)
          src++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       default:
        break;
 
       default:


@@ -241,7 +268,6 @@ libmagick_write(struct image_io *io)
   int result = 0;
   ExceptionInfo exception;
   ImageInfo *info;
   int result = 0;
   ExceptionInfo exception;
   ImageInfo *info;

-  InitializeMagick(NULL);

   GetExceptionInfo(&exception);
   info = CloneImageInfo(NULL);
 
   GetExceptionInfo(&exception);
   info = CloneImageInfo(NULL);
 


@@ -256,7 +282,8 @@ libmagick_write(struct image_io *io)
         info->colorspace = RGBColorspace;
         break;
       default:
         info->colorspace = RGBColorspace;
         break;
       default:

-        ASSERT(0);
+        IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Unsupported color space.");
+        goto err;

     }
   switch (io->format)
     {
     }
   switch (io->format)
     {


@@ -277,7 +304,7 @@ libmagick_write(struct image_io *io)
   Image *image = AllocateImage(info);
   if (unlikely(!image))
     {
   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;
       goto err;
     }
   image->columns = img->cols;


@@ -287,7 +314,7 @@ libmagick_write(struct image_io *io)
   PixelPacket *pixels = SetImagePixels(image, 0, 0, img->cols, img->rows), *dest = pixels;
   if (unlikely(!pixels))
     {
   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;
     }
 
       goto err2;
     }
 


@@ -304,9 +331,9 @@ libmagick_write(struct image_io *io)
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \

-         dest->opacity = OPACITY_MAX; \
+         dest->opacity = 0; \

          dest++; }while(0)
          dest++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       case 2:
        break;
 
       case 2:


@@ -319,9 +346,9 @@ libmagick_write(struct image_io *io)
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \

-         dest->opacity = BYTE_TO_QUANTUM(walk_pos[1]); \
+         dest->opacity = BYTE_TO_ALPHA(walk_pos[1]); \

          dest++; }while(0)
          dest++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       case 3:
        break;
 
       case 3:


@@ -334,9 +361,9 @@ libmagick_write(struct image_io *io)
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \

-         dest->opacity = OPACITY_MAX; \
+         dest->opacity = 0; \

          dest++; }while(0)
          dest++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       case 4:
        break;
 
       case 4:


@@ -349,9 +376,9 @@ libmagick_write(struct image_io *io)
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \
          dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
          dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \
          dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \

-         dest->opacity = BYTE_TO_QUANTUM(walk_pos[3]); \
+         dest->opacity = BYTE_TO_ALPHA(walk_pos[3]); \

          dest++; }while(0)
          dest++; }while(0)

-#       include "images/image-walk.h"
+#       include <images/image-walk.h>

        break;
 
       default:
        break;
 
       default:


@@ -361,7 +388,7 @@ libmagick_write(struct image_io *io)
   /* Store pixels */
   if (unlikely(!SyncImagePixels(image)))
     {
   /* 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;
     }
 
       goto err2;
     }
 


@@ -370,12 +397,12 @@ libmagick_write(struct image_io *io)
   void *buf = ImageToBlob(info, image, &buf_len, &exception);
   if (unlikely(!buf))
     {
   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))
     {
       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;
     }
 
       goto err2;
     }
 


@@ -390,6 +417,5 @@ err2:
 err:
   DestroyImageInfo(info);
   DestroyExceptionInfo(&exception);
 err:
   DestroyImageInfo(info);
   DestroyExceptionInfo(&exception);

-  DestroyMagick();

   return result;
 }
   return result;
 }