rmagick 3.0.0 → 3.1.0

data/ext/RMagick/rmagick.c

@@ -15,6 +15,20 @@
 
 
 
+static VALUE
+rm_yield_body(VALUE object)
+{
+    return rb_yield(object);
+}
+
+static VALUE
+rm_yield_handle_exception(VALUE allocated_area, VALUE exc)
+{
+    magick_free((void *)allocated_area);
+    rb_exc_raise(exc);
+    return Qnil; /* not reachable */
+}
+
 /**
  * If called with the optional block, iterates over the colors, otherwise
  * returns an array of Magick::Color objects.
@@ -48,7 +62,7 @@ Magick_colors(VALUE class)
     {
         for (x = 0; x < number_colors; x++)
         {
-            (void) rb_yield(Import_ColorInfo(color_info_list[x]));
+            rb_rescue(rm_yield_body, Import_ColorInfo(color_info_list[x]), rm_yield_handle_exception, (VALUE)color_info_list);
         }
         magick_free((void *)color_info_list);
         return class;
@@ -96,7 +110,7 @@ Magick_fonts(VALUE class)
     {
         for (x = 0; x < number_types; x++)
         {
-            (void) rb_yield(Import_TypeInfo((const TypeInfo *)type_info[x]));
+            rb_rescue(rm_yield_body, Import_TypeInfo((const TypeInfo *)type_info[x]), rm_yield_handle_exception, (VALUE)type_info);
         }
         magick_free((void *)type_info);
         return class;
@@ -135,10 +149,10 @@ MagickInfo_to_format(const MagickInfo *magick_info)
 {
     char mode[4];
 
-    mode[0] = magick_info->blob_support ? '*': ' ';
-    mode[1] = magick_info->decoder ? 'r' : '-';
-    mode[2] = magick_info->encoder ? 'w' : '-';
-    mode[3] = magick_info->encoder && magick_info->adjoin ? '+' : '-';
+    mode[0] = GetMagickBlobSupport(magick_info) ? '*': ' ';
+    mode[1] = GetImageDecoder(magick_info) ? 'r' : '-';
+    mode[2] = GetImageEncoder(magick_info) ? 'w' : '-';
+    mode[3] = GetMagickAdjoin(magick_info) ? '+' : '-';
 
     return rb_str_new(mode, sizeof(mode));
 }
@@ -245,6 +259,10 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             {
                 res = FileResource;
             }
+            else if (id == rb_intern("time"))
+            {
+                res = TimeResource;
+            }
             else
             {
                 rb_raise(rb_eArgError, "unknown resource: `:%s'", rb_id2name(id));
@@ -277,6 +295,10 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             {
                 res = FileResource;
             }
+            else if (rm_strcasecmp("time", str) == 0)
+            {
+                res = TimeResource;
+            }
             else
             {
                 rb_raise(rb_eArgError, "unknown resource: `%s'", str);

data/ext/RMagick/rmagick.h

@@ -19,9 +19,6 @@
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
-#if defined(HAVE_STDINT_H)
-#include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
@@ -98,26 +95,6 @@
 //! round to Quantum
 #define ROUND_TO_QUANTUM(value) ((Quantum) ((value) > (Quantum)QuantumRange ? QuantumRange : (value) + 0.5))
 
-
-// Ruby 1.9.0 changed the name to rb_frame_this_func
-#if defined(HAVE_RB_FRAME_THIS_FUNC)
-#define THIS_FUNC() rb_frame_this_func() /**< get the Ruby function being called */
-#else
-#define THIS_FUNC() rb_frame_last_func() /**< get the Ruby function being called */
-#endif
-
-// GetReadFile doesn't exist in Ruby 1.9.0
-#if !defined(GetReadFile)
-#define GetReadFile(fptr) rb_io_stdio_file(fptr) /**< Ruby read file pointer */
-#define GetWriteFile(fptr) rb_io_stdio_file(fptr) /**< Ruby write file pointer */
-#endif
-
-// rb_io_t replaces OpenFile in Ruby 1.9.0
-#if defined(HAVE_RB_IO_T)
-#undef OpenFile
-#define OpenFile rb_io_t /**< Ruby open file */
-#endif
-
 //! Convert a C string to a Ruby symbol. Used in marshal_dump/marshal_load methods
 #define CSTR2SYM(s) ID2SYM(rb_intern(s))
 //! Convert a C string to a Ruby String, or nil if the ptr is NULL
@@ -133,43 +110,13 @@
         f = NULL;
 
 
-/** ImageMagick 6.5.7 replaced DestroyConstitute with
- * ConstituteComponentTerminus. Both have the same signature.
- */
-#if defined(HAVE_CONSTITUTECOMPONENTTERMINUS)
-#define DestroyConstitute(void) ConstituteComponentTerminus(void)
-#endif
-
-/** ImageMagick 6.5.9 replaced MagickLibSubversion with
- * MagickLibAddendum.
- */
-#if defined(HAVE_MAGICKLIBADDENDUM)
 #define MagickLibSubversion MagickLibAddendum
-#endif
-
-/** IM 6.4.1 replaced AllocateImage with AcquireImage.
- * Both have the same signature.
- */
-#if !defined(HAVE_ACQUIREIMAGE)
-#define AcquireImage(info) AllocateImage(info)
-#endif
-
-// ImageLayerMethod replaced MagickLayerMethod starting with 6.3.6
-#if defined(HAVE_TYPE_IMAGELAYERMETHOD)
-#define LAYERMETHODTYPE ImageLayerMethod /**< layer method */
-#define CLASS_LAYERMETHODTYPE Class_ImageLayerMethod /**< layer method class */
-#define LAYERMETHODTYPE_NAME ImageLayerMethod_name /**< layer method name */
-#define LAYERMETHODTYPE_NEW  ImageLayerMethod_new /**< new layer method */
-#else
-#define LAYERMETHODTYPE MagickLayerMethod /**< layer method */
-#define CLASS_LAYERMETHODTYPE Class_MagickLayerMethod /**< layer method class */
-#define LAYERMETHODTYPE_NAME MagickLayerMethod_name /**< layer method name */
-#define LAYERMETHODTYPE_NEW  MagickLayerMethod_new /**< new layer method */
-#endif
 
 
 typedef ImageInfo Info; /**< Make type name match class name */
 typedef PixelPacket Pixel; /**< Make type name match class name */
+typedef MagickPixelPacket MagickPixel;
+typedef PixelPacket PixelColor;
 
 //! Montage
 typedef struct
@@ -192,7 +139,7 @@ typedef struct
     DrawInfo *info;             /**< the DrawInfo struct */
     VALUE primitives;           /**< the primitive string */
     struct TmpFile_Name *tmpfile_ary; /**< the tmp filenames */
-    PixelPacket shadow_color;   /**< PolaroidOptions#shadow_color */
+    PixelColor shadow_color;   /**< PolaroidOptions#shadow_color */
 } Draw;             // make the type match the class name
 
 // Enum
@@ -267,47 +214,27 @@ typedef enum _QuantumExpressionOperator
     RShiftQuantumOperator,    /**< rshift */
     SubtractQuantumOperator,  /**< subtract */
     XorQuantumOperator,       /**< xor */
-#if defined(HAVE_ENUM_POWEVALUATEOPERATOR)
     PowQuantumOperator,       /**< pow */
-#endif
-#if defined(HAVE_ENUM_LOGEVALUATEOPERATOR)
     LogQuantumOperator,       /**< log */
-#endif
-#if defined(HAVE_ENUM_THRESHOLDEVALUATEOPERATOR)
     ThresholdQuantumOperator, /**< threshold */
-#endif
-#if defined(HAVE_ENUM_THRESHOLDBLACKEVALUATEOPERATOR)
     ThresholdBlackQuantumOperator, /**< threshold black */
-#endif
-#if defined(HAVE_ENUM_THRESHOLDWHITEEVALUATEOPERATOR)
     ThresholdWhiteQuantumOperator, /**< threshold white */
-#endif
-#if defined(HAVE_ENUM_GAUSSIANNOISEEVALUATEOPERATOR)
     GaussianNoiseQuantumOperator, /**< gaussian noise */
-#endif
-#if defined(HAVE_ENUM_IMPULSENOISEEVALUATEOPERATOR)
     ImpulseNoiseQuantumOperator, /**< impulse noise */
-#endif
-#if defined(HAVE_ENUM_LAPLACIANNOISEEVALUATEOPERATOR)
     LaplacianNoiseQuantumOperator, /**< laplacian noise */
-#endif
-#if defined(HAVE_ENUM_MULTIPLICATIVENOISEEVALUATEOPERATOR)
     MultiplicativeNoiseQuantumOperator, /**< multiplicative noise */
-#endif
-#if defined(HAVE_ENUM_POISSONNOISEEVALUATEOPERATOR)
     PoissonNoiseQuantumOperator, /**< poisson noise */
-#endif
-#if defined(HAVE_ENUM_UNIFORMNOISEEVALUATEOPERATOR)
     UniformNoiseQuantumOperator, /**< uniform noise */
-#endif
-#if defined(HAVE_ENUM_COSINEEVALUATEOPERATOR)
     CosineQuantumOperator,    /**< cosine */
-#endif
-#if defined(HAVE_ENUM_SINEEVALUATEOPERATOR)
     SineQuantumOperator,      /**< sine */
-#endif
-#if defined(HAVE_ENUM_ADDMODULUSEVALUATEOPERATOR)
-    AddModulusQuantumOperator /**< add modulus */
+    AddModulusQuantumOperator, /**< add modulus */
+    MeanQuantumOperator, /**< mean */
+    AbsQuantumOperator, /**< abs */
+    ExponentialQuantumOperator, /**< exponential */
+    MedianQuantumOperator, /**< median */
+    SumQuantumOperator /**< sum */
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+    , RootMeanSquareQuantumOperator /** root mean square */
 #endif
 } QuantumExpressionOperator ;
 
@@ -370,16 +297,14 @@ EXTERN VALUE Class_CompressionType;
 EXTERN VALUE Class_DecorationType;
 EXTERN VALUE Class_DisposeType;
 EXTERN VALUE Class_DistortImageMethod;
-#if defined(HAVE_TYPE_DITHERMETHOD)
 EXTERN VALUE Class_DitherMethod;
-#endif
 EXTERN VALUE Class_EndianType;
 EXTERN VALUE Class_FilterTypes;
 EXTERN VALUE Class_GravityType;
 EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
 EXTERN VALUE Class_InterpolatePixelMethod;
-EXTERN VALUE CLASS_LAYERMETHODTYPE;
+EXTERN VALUE Class_ImageLayerMethod;
 EXTERN VALUE Class_MagickFunction;
 EXTERN VALUE Class_NoiseType;
 EXTERN VALUE Class_OrientationType;
@@ -387,9 +312,7 @@ EXTERN VALUE Class_PaintMethod;
 EXTERN VALUE Class_PreviewType;
 EXTERN VALUE Class_RenderingIntent;
 EXTERN VALUE Class_ResolutionType;
-#if defined(HAVE_SPARSECOLORIMAGE)
 EXTERN VALUE Class_SparseColorMethod;
-#endif
 EXTERN VALUE Class_SpreadMethod;
 EXTERN VALUE Class_StorageType;
 EXTERN VALUE Class_StretchType;
@@ -529,91 +452,6 @@ EXTERN ID rm_ID_y;                 /**< "y" */
     ATTR_READER(class, attr)\
     ATTR_WRITER(class, attr)
 
-/*
- *  Define functions to get/set attributes in Image::Info that
- *  use the Get/SetImageOption API.
-*/
-//! Option attribute reader. For Image::Info.
-#define OPTION_ATTR_READER(opt, key) \
-    VALUE Info_##opt(VALUE self)\
-    {\
-        return get_option(self, #key);\
-    }
-//! Option attribute writer. For Image::Info.
-#define OPTION_ATTR_WRITER(opt, key) \
-    VALUE Info_##opt##_eq(VALUE self, VALUE string)\
-    {\
-        return set_option(self, #key, string);\
-    }
-//! Option attribute accessor. For Image::Info.
-#define OPTION_ATTR_ACCESSOR(opt, key)\
-    OPTION_ATTR_READER(opt, key)\
-    OPTION_ATTR_WRITER(opt, key)
-
-
-/*
- *  Declare Pixel channel attribute writers
-*/
-//! Pixel channel attribute writer.
-#define DEF_PIXEL_CHANNEL_WRITER(_channel_) \
-extern VALUE \
-Pixel_##_channel_##_eq(VALUE self, VALUE v) \
-{ \
-    Pixel *pixel; \
- \
-    rb_check_frozen(self); \
-    Data_Get_Struct(self, Pixel, pixel); \
-    pixel->_channel_ = APP2QUANTUM(v); \
-    (void) rb_funcall(self, rm_ID_changed, 0); \
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
-    return QUANTUM2NUM((pixel->_channel_)); \
-}
-
-
-/*
- *  Declare Pixel CMYK channel attribute accessors
-*/
-//! Pixel CMYK channel attribute accessor.
-#define DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(_cmyk_channel_, _rgb_channel_) \
-extern VALUE \
-Pixel_##_cmyk_channel_##_eq(VALUE self, VALUE v) \
-{ \
-    Pixel *pixel; \
- \
-    rb_check_frozen(self); \
-    Data_Get_Struct(self, Pixel, pixel); \
-    pixel->_rgb_channel_ = APP2QUANTUM(v); \
-    (void) rb_funcall(self, rm_ID_changed, 0); \
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
-    return QUANTUM2NUM(pixel->_rgb_channel_); \
-} \
- \
-extern VALUE \
-Pixel_##_cmyk_channel_(VALUE self) \
-{ \
-    Pixel *pixel; \
- \
-    Data_Get_Struct(self, Pixel, pixel); \
-    return INT2NUM(pixel->_rgb_channel_); \
-}
-
-
-/*
- *  Enum constants - define a subclass of Enum for the specified enumeration.
- *  Define an instance of the subclass for each member in the enumeration.
- *  Initialize each instance with its name and value.
- */
-//! define Ruby enum
-#define DEF_ENUM(tag) {\
-   VALUE _cls, _enum;\
-   _cls =  Class_##tag = rm_define_enum_type(#tag);
-
-//! define Ruby enumerator elements
-#define ENUMERATOR(val)\
-   _enum = rm_enum_new(_cls, ID2SYM(rb_intern(#val)), INT2NUM(val));\
-   rb_define_const(Module_Magick, #val, _enum);
-//! end of an enumerator
-#define END_ENUM }
 
 //!  Define a Magick module constant
 #if MAGICKCORE_QUANTUM_DEPTH == 64
@@ -634,9 +472,6 @@ Pixel_##_cmyk_channel_(VALUE self) \
    e = (type)(magick_enum->val);\
    } while(0)
 
-//! create case statement, mapping enum to its name
-#define ENUM_TO_NAME(_enum) case _enum: return #_enum;
-
 
 // Method, external function declarations. These declarations are
 // grouped by the source file in which the methods are defined.
@@ -1015,6 +850,7 @@ extern VALUE Image_flop_bang(VALUE);
 extern VALUE Image_frame(int, VALUE *, VALUE);
 extern VALUE Image_from_blob(VALUE, VALUE);
 extern VALUE Image_function_channel(int, VALUE *, VALUE);
+extern VALUE Image_fx(int, VALUE *, VALUE);
 extern VALUE Image_gamma_channel(int, VALUE *, VALUE);
 extern VALUE Image_gamma_correct(int, VALUE *, VALUE);
 extern VALUE Image_gaussian_blur(int, VALUE *, VALUE);
@@ -1198,27 +1034,41 @@ extern VALUE  Enum_case_eq(VALUE, VALUE);
 extern VALUE  Enum_type_initialize(VALUE, VALUE, VALUE);
 extern VALUE  Enum_type_each(VALUE);
 extern VALUE  rm_enum_new(VALUE, VALUE, VALUE);
-
-
-// rmstruct.c
-extern VALUE  ChromaticityInfo_to_s(VALUE);
-extern VALUE  ChromaticityInfo_new(ChromaticityInfo *);
-extern void   Color_to_PixelPacket(PixelPacket *, VALUE);
-extern void   Color_to_MagickPixelPacket(Image *, MagickPixelPacket *, VALUE);
-extern VALUE  Color_to_s(VALUE);
-extern VALUE  Import_ColorInfo(const ColorInfo *);
 extern VALUE  ClassType_new(ClassType);
 extern VALUE  ColorspaceType_new(ColorspaceType);
+extern const char *ComplianceType_name(ComplianceType *);
+extern VALUE  ComplianceType_new(ComplianceType);
 extern VALUE  CompositeOperator_new(CompositeOperator);
 extern VALUE  CompressionType_new(CompressionType);
 extern VALUE  DisposeType_new(DisposeType);
 extern VALUE  EndianType_new(EndianType);
 extern VALUE  FilterTypes_new(FilterTypes);
 extern VALUE  GravityType_new(GravityType);
-extern VALUE  Font_to_s(VALUE);
+extern VALUE  ImageLayerMethod_new(ImageLayerMethod);
 extern VALUE  ImageType_new(ImageType);
 extern VALUE  InterlaceType_new(InterlaceType);
-extern VALUE  Pixel_from_MagickPixelPacket(const MagickPixelPacket *);
+extern VALUE  InterpolatePixelMethod_new(InterpolatePixelMethod);
+extern VALUE  OrientationType_new(OrientationType);
+extern VALUE  RenderingIntent_new(RenderingIntent);
+extern VALUE  ResolutionType_new(ResolutionType);
+extern const char *StorageType_name(StorageType);
+extern VALUE  StretchType_new(StretchType);
+extern const char *StretchType_name(StretchType);
+extern VALUE  StyleType_new(StyleType);
+extern const char *StyleType_name(StyleType);
+extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
+
+
+// rmstruct.c
+extern VALUE  ChromaticityInfo_to_s(VALUE);
+extern VALUE  ChromaticityInfo_new(ChromaticityInfo *);
+extern void   Color_to_PixelColor(PixelColor *, VALUE);
+extern void   Color_to_MagickPixel(Image *, MagickPixel *, VALUE);
+extern VALUE  Color_to_s(VALUE);
+extern VALUE  Import_ColorInfo(const ColorInfo *);
+extern VALUE  Font_to_s(VALUE);
+extern VALUE  Pixel_from_MagickPixel(const MagickPixel *);
+extern VALUE  Pixel_from_PixelColor(const PixelColor *);
 extern VALUE  Pixel_from_PixelPacket(const PixelPacket *);
 extern void   Export_PointInfo(PointInfo *, VALUE);
 extern VALUE  Import_PointInfo(PointInfo *);
@@ -1226,16 +1076,12 @@ extern VALUE  PrimaryInfo_to_s(VALUE);
 extern VALUE  Import_PrimaryInfo(PrimaryInfo *);
 extern VALUE  RectangleInfo_to_s(VALUE);
 extern VALUE  Import_RectangleInfo(RectangleInfo *);
-extern VALUE  RenderingIntent_new(RenderingIntent);
-extern VALUE  ResolutionType_new(ResolutionType);
 extern VALUE  SegmentInfo_to_s(VALUE);
 extern VALUE  Import_SegmentInfo(SegmentInfo *);
 extern void   Export_AffineMatrix(AffineMatrix *, VALUE);
 extern VALUE  Import_AffineMatrix(AffineMatrix *);
 extern void   Export_ChromaticityInfo(ChromaticityInfo *, VALUE);
 extern void   Export_ColorInfo(ColorInfo *, VALUE);
-extern VALUE  InterpolatePixelMethod_new(InterpolatePixelMethod);
-extern VALUE  OrientationType_new(OrientationType);
 extern void   Export_PrimaryInfo(PrimaryInfo *, VALUE);
 extern void   Export_RectangleInfo(RectangleInfo *, VALUE);
 extern void   Export_SegmentInfo(SegmentInfo *, VALUE);
@@ -1245,9 +1091,6 @@ extern VALUE  Import_TypeInfo(const TypeInfo *);
 extern VALUE  TypeMetric_to_s(VALUE);
 extern void   Export_TypeInfo(TypeInfo *, VALUE);
 extern VALUE  Import_TypeMetric(TypeMetric *);
-extern const char *StorageType_name(StorageType);
-extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
-extern VALUE  LAYERMETHODTYPE_NEW(LAYERMETHODTYPE);
 
 
 // rmutil.c
@@ -1258,13 +1101,17 @@ extern void   magick_free(void *);
 extern void  *magick_realloc(void *, const size_t);
 extern void  *magick_safe_realloc(void *, const size_t, const size_t);
 extern void   magick_clone_string(char **, const char *);
+extern Image *rm_acquire_image(ImageInfo *);
 extern VALUE  rm_cur_image(VALUE);
-extern VALUE  rm_pixelpacket_to_color_name(Image *, PixelPacket *);
-extern VALUE  rm_pixelpacket_to_color_name_info(Info *, PixelPacket *);
+extern VALUE  rm_pixelcolor_to_color_name(Image *, PixelColor *);
+extern VALUE  rm_pixelcolor_to_color_name_info(Info *, PixelColor *);
+extern void   rm_init_magickpixel(const Image *, MagickPixel *);
+extern void   rm_set_magickpixel(MagickPixel *, const char *);
 extern VALUE  rm_no_freeze(VALUE);
 extern int    rm_strcasecmp(const char *, const char *);
 extern int    rm_strncasecmp(const char *, const char *, size_t);
 extern void   rm_check_ary_len(VALUE, long);
+extern VALUE  rm_check_ary_type(VALUE ary);
 extern Image *rm_check_destroyed(VALUE);
 extern Image *rm_check_frozen(VALUE);
 extern VALUE  rm_to_s(VALUE);
@@ -1283,10 +1130,9 @@ extern void   rm_get_geometry(VALUE, long *, long *, unsigned long *, unsigned l
 extern const char *rm_get_property(const Image *, const char *);
 extern MagickBooleanType rm_set_property(Image *, const char *, const char *);
 extern void   rm_set_user_artifact(Image *, Info *);
-void          rm_set_magick_pixel_packet(Pixel *, MagickPixelPacket *);
 extern void   rm_sync_image_options(Image *, Info *);
 extern void   rm_split(Image *);
-extern void   rm_magick_error(const char *, const char *);
+extern void   rm_magick_error(const char *);
 
 //! whether to retain on errors
 typedef enum
@@ -1295,6 +1141,12 @@ typedef enum
     DestroyOnError = 1 /**< do not retain on error */
 } ErrorRetention;
 
+typedef enum
+{
+    RetainExceptionRetention,
+    DestroyExceptionRetention
+} ExceptionRetention;
+
 extern void   rm_check_image_exception(Image *, ErrorRetention);
 extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
 extern void   rm_ensure_result(Image *);
@@ -1306,5 +1158,7 @@ extern void   rm_get_optional_arguments(VALUE);
 extern void   rm_fatal_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_warning_handler(const ExceptionType, const char *, const char *);
+extern MagickBooleanType rm_should_raise_exception(ExceptionInfo *, const ExceptionRetention);
+extern void   rm_raise_exception(ExceptionInfo *);
 #endif