rmagick 2.13.1 → 2.13.4

data/ext/RMagick/rminfo.c

@@ -93,7 +93,7 @@ static VALUE set_color_option(VALUE self, const char *option, VALUE color)
     Info *info;
     char *name;
     PixelPacket pp;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
     MagickBooleanType okay;
 
     Data_Get_Struct(self, Info, info);
@@ -104,10 +104,10 @@ static VALUE set_color_option(VALUE self, const char *option, VALUE color)
     }
     else
     {
-        GetExceptionInfo(&exception);
+        exception = AcquireExceptionInfo();
         name = StringValuePtr(color);
-        okay = QueryColorDatabase(name, &pp, &exception);
-        (void) DestroyExceptionInfo(&exception);
+        okay = QueryColorDatabase(name, &pp, exception);
+        (void) DestroyExceptionInfo(exception);
         if (!okay)
         {
             rb_raise(rb_eArgError, "invalid color name `%s'", name);
@@ -960,11 +960,11 @@ Info_depth_eq(VALUE self, VALUE depth)
     switch (d)
     {
         case 8:                     // always okay
-#if QuantumDepth == 16 || QuantumDepth == 32 || QuantumDepth == 64
+#if MAGICKCORE_QUANTUM_DEPTH == 16 || MAGICKCORE_QUANTUM_DEPTH == 32 || MAGICKCORE_QUANTUM_DEPTH == 64
         case 16:
-#if QuantumDepth == 32 || QuantumDepth == 64
+#if MAGICKCORE_QUANTUM_DEPTH == 32 || MAGICKCORE_QUANTUM_DEPTH == 64
         case 32:
-#if QuantumDepth == 64
+#if MAGICKCORE_QUANTUM_DEPTH == 64
         case 64:
 #endif
 #endif
@@ -1359,14 +1359,14 @@ VALUE Info_format(VALUE self)
 {
     Info *info;
     const MagickInfo *magick_info ;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     Data_Get_Struct(self, Info, info);
     if (*info->magick)
     {
-        GetExceptionInfo(&exception);
-        magick_info = GetMagickInfo(info->magick, &exception);
-        (void) DestroyExceptionInfo(&exception);
+        exception = AcquireExceptionInfo();
+        magick_info = GetMagickInfo(info->magick, exception);
+        (void) DestroyExceptionInfo(exception);
 
         return magick_info ? rb_str_new2(magick_info->name) : Qnil;
     }
@@ -1390,16 +1390,16 @@ Info_format_eq(VALUE self, VALUE magick)
     Info *info;
     const MagickInfo *m;
     char *mgk;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     Data_Get_Struct(self, Info, info);
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
     mgk = StringValuePtr(magick);
-    m = GetMagickInfo(mgk, &exception);
+    m = GetMagickInfo(mgk, exception);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
     if (!m)
     {

data/ext/RMagick/rmmain.c

@@ -22,6 +22,7 @@ void Init_RMagick(void);
 
 static void test_Magick_version(void);
 static void version_constants(void);
+static void features_constant(void);
 
 
 
@@ -431,6 +432,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "random_threshold_channel", Image_random_threshold_channel, -1);
     rb_define_method(Class_Image, "recolor", Image_recolor, 1);
     rb_define_method(Class_Image, "reduce_noise", Image_reduce_noise, 1);
+    rb_define_method(Class_Image, "resample", Image_resample, -1);
+    rb_define_method(Class_Image, "resample!", Image_resample_bang, -1);
     rb_define_method(Class_Image, "resize", Image_resize, -1);
     rb_define_method(Class_Image, "resize!", Image_resize_bang, -1);
     rb_define_method(Class_Image, "roll", Image_roll, 2);
@@ -818,13 +821,13 @@ Init_RMagick2(void)
 
 
     // Miscellaneous fixed-point constants
-    DEF_CONST(MaxRGB);
     DEF_CONST(QuantumRange);
-    DEF_CONST(QuantumDepth);
+    DEF_CONST(MAGICKCORE_QUANTUM_DEPTH);
     DEF_CONST(OpaqueOpacity);
     DEF_CONST(TransparentOpacity);
 
     version_constants();
+    features_constant();
 
     /*-----------------------------------------------------------------------*/
     /* Class Magick::Enum                                                    */
@@ -946,7 +949,7 @@ Init_RMagick2(void)
         ENUMERATOR(HSLColorspace)
         ENUMERATOR(HWBColorspace)
         ENUMERATOR(HSBColorspace)
-        ENUMERATOR(LABColorspace)
+        ENUMERATOR(LabColorspace)
         ENUMERATOR(Rec601LumaColorspace)
         ENUMERATOR(Rec601YCbCrColorspace)
         ENUMERATOR(Rec709LumaColorspace)
@@ -1703,3 +1706,24 @@ version_constants(void)
     rb_define_const(Module_Magick, "Long_version", str);
 
 }
+
+
+/**
+ * Create Features constant.
+ *
+ * No Ruby usage (internal function)
+ */
+static void
+features_constant(void)
+{
+    volatile VALUE features;
+
+#if defined(HAVE_GETMAGICKFEATURES)
+    features = rb_str_new2(GetMagickFeatures());
+#else
+    features = rb_str_new2(MagickSupport);
+#endif
+
+    rb_obj_freeze(features);
+    rb_define_const(Module_Magick, "Magick_features", features);
+}

data/ext/RMagick/rmpixel.c

@@ -217,12 +217,12 @@ Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
 {
     MagickBooleanType okay;
     char *name;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
     name = StringValuePtr(name_arg);
-    okay = QueryColorDatabase(name, color, &exception);
-    (void) DestroyExceptionInfo(&exception);
+    okay = QueryColorDatabase(name, color, exception);
+    (void) DestroyExceptionInfo(exception);
     if (!okay)
     {
         rb_raise(rb_eArgError, "invalid color name %s", name);
@@ -444,15 +444,15 @@ VALUE
 Pixel_from_color(VALUE class, VALUE name)
 {
     PixelPacket pp;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
     MagickBooleanType okay;
 
     class = class;      // defeat "never referenced" message from icc
 
-    GetExceptionInfo(&exception);
-    okay = QueryColorDatabase(StringValuePtr(name), &pp, &exception);
+    exception = AcquireExceptionInfo();
+    okay = QueryColorDatabase(StringValuePtr(name), &pp, exception);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
     if (!okay)
     {
@@ -488,7 +488,7 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
 {
     double h, s, l, a = 1.0;
     MagickPixelPacket pp;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
     char name[50];
     MagickBooleanType alpha = MagickFalse;
 
@@ -502,7 +502,7 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
         case 3:
             // saturation and lightness are out of 255 in new ImageMagicks and
             // out of 100 in old ImageMagicks. Compromise: always use %.
-            l = rm_percentage(argv[2],255.0); 
+            l = rm_percentage(argv[2],255.0);
             s = rm_percentage(argv[1],255.0);
             h = rm_percentage(argv[0],360.0);
             break;
@@ -547,12 +547,12 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
         sprintf(name, "hsl(%-2.1f,%-2.1f,%-2.1f)", h, s, l);
     }
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
-    (void) QueryMagickColor(name, &pp, &exception);
+    (void) QueryMagickColor(name, &pp, exception);
     CHECK_EXCEPTION()
 
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
     return Pixel_from_MagickPixelPacket(&pp);
 }
@@ -666,10 +666,8 @@ Pixel_hash(VALUE self)
     hash += ScaleQuantumToChar(pixel->green) << 16;
     hash += ScaleQuantumToChar(pixel->blue)  << 8;
     hash += ScaleQuantumToChar(pixel->opacity);
-    hash >>= 1;
-
-    return INT2FIX(hash);
 
+    return UINT2NUM(hash >> 1);
 }
 
 
@@ -877,7 +875,7 @@ Pixel_spaceship(VALUE self, VALUE other)
 /**
  * Return [hue, saturation, lightness, alpha] in the same ranges as
  * Pixel_from_hsla.
- * 
+ *
  *
  * Ruby usage:
  *   - @verbatim Pixel#to_hsla @endverbatim
@@ -913,7 +911,7 @@ Pixel_to_hsla(VALUE self)
     }
     else
     {
-        alpha = ROUND_TO_QUANTUM(QuantumRange - (pixel->opacity / QuantumRange));
+        alpha = (double)(QuantumRange - pixel->opacity) / (double)QuantumRange;
     }
 
     hsla = rb_ary_new3(4, rb_float_new(hue), rb_float_new(sat), rb_float_new(lum), rb_float_new(alpha));
@@ -962,7 +960,7 @@ Pixel_to_HSL(VALUE self)
  * Notes:
  *   - Default compliance is AllCompliance
  *   - Default matte is false
- *   - Default depth is QuantumDepth
+ *   - Default depth is MAGICKCORE_QUANTUM_DEPTH
  *   - Default hex is false
  *   - The conversion respects the value of the 'opacity' field in the Pixel
  *
@@ -980,10 +978,10 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     MagickPixelPacket mpp;
     MagickBooleanType hex = MagickFalse;
     char name[MaxTextExtent];
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
     ComplianceType compliance = AllCompliance;
     unsigned int matte = MagickFalse;
-    unsigned int depth = QuantumDepth;
+    unsigned int depth = MAGICKCORE_QUANTUM_DEPTH;
 
     switch (argc)
     {
@@ -996,10 +994,10 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
             switch (depth)
             {
                 case 8:
-#if QuantumDepth == 16 || QuantumDepth == 32
+#if MAGICKCORE_QUANTUM_DEPTH == 16 || MAGICKCORE_QUANTUM_DEPTH == 32
                 case 16:
 #endif
-#if QuantumDepth == 32
+#if MAGICKCORE_QUANTUM_DEPTH == 32
                 case 32:
 #endif
                     break;
@@ -1028,7 +1026,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     GetMagickPixelPacket(image, &mpp);
     rm_set_magick_pixel_packet(pixel, &mpp);
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
 #if defined(HAVE_NEW_QUERYMAGICKCOLORNAME)
     // Support for hex-format color names moved out of QueryMagickColorname
@@ -1044,14 +1042,14 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     }
     else
     {
-        (void) QueryMagickColorname(image, &mpp, compliance, name, &exception);
+        (void) QueryMagickColorname(image, &mpp, compliance, name, exception);
     }
 #else
-    (void) QueryMagickColorname(image, &mpp, compliance, hex, name, &exception);
+    (void) QueryMagickColorname(image, &mpp, compliance, hex, name, exception);
 #endif
     (void) DestroyImage(image);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
     // Always return a string, even if it's ""
     return rb_str_new2(name);

data/ext/RMagick/rmstruct.c

@@ -347,7 +347,7 @@ Color_to_s(VALUE self)
     Export_ColorInfo(&ci, self);
 
     sprintf(buff, "name=%s, compliance=%s, "
-#if (QuantumDepth == 32 || QuantumDepth == 64) && defined(HAVE_TYPE_LONG_DOUBLE)
+#if (MAGICKCORE_QUANTUM_DEPTH  == 32 || MAGICKCORE_QUANTUM_DEPTH  == 64) && defined(HAVE_TYPE_LONG_DOUBLE)
                   "color.red=%Lg, color.green=%Lg, color.blue=%Lg, color.opacity=%Lg ",
 #else
                   "color.red=%g, color.green=%g, color.blue=%g, color.opacity=%g ",

data/ext/RMagick/rmutil.c

@@ -627,13 +627,13 @@ VALUE
 rm_pixelpacket_to_color_name(Image *image, PixelPacket *color)
 {
     char name[MaxTextExtent];
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
-    (void) QueryColorname(image, color, X11Compliance, name, &exception);
+    (void) QueryColorname(image, color, X11Compliance, name, exception);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
     return rb_str_new2(name);
 }
@@ -698,11 +698,11 @@ rm_write_temp_image(Image *image, char *temp_name)
 #define TMPNAM_CLASS_VAR "@@_tmpnam_"
 
     MagickBooleanType okay;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
     volatile VALUE id_value;
     int id;
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
 
     // 'id' is always the value of its previous use
@@ -722,9 +722,9 @@ rm_write_temp_image(Image *image, char *temp_name)
     sprintf(temp_name, "mpri:%d", id);
 
     // Omit "mpri:" from filename to form the key
-    okay = SetImageRegistry(ImageRegistryType, temp_name+5, image, &exception);
+    okay = SetImageRegistry(ImageRegistryType, temp_name+5, image, exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    DestroyExceptionInfo(exception);
     if (!okay)
     {
         rb_raise(rb_eRuntimeError, "SetImageRegistry failed.");
@@ -1389,16 +1389,16 @@ Image *
 rm_clone_image(Image *image)
 {
     Image *clone;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
-    GetExceptionInfo(&exception);
-    clone = CloneImage(image, 0, 0, MagickTrue, &exception);
+    exception = AcquireExceptionInfo();
+    clone = CloneImage(image, 0, 0, MagickTrue, exception);
     if (!clone)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
-    rm_check_exception(&exception, clone, DestroyOnError);
-    (void) DestroyExceptionInfo(&exception);
+    rm_check_exception(exception, clone, DestroyOnError);
+    (void) DestroyExceptionInfo(exception);
 
     return clone;
 }
@@ -1486,7 +1486,7 @@ rm_split(Image *image)
 void
 rm_check_image_exception(Image *imglist, ErrorRetention retention)
 {
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
     Image *badboy = NULL;
     Image *image;
 
@@ -1495,7 +1495,7 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
         return;
     }
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
     // Find the image with the highest severity
     image = GetFirstImageInList(imglist);
@@ -1506,7 +1506,7 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
             if (!badboy || image->exception.severity > badboy->exception.severity)
             {
                 badboy = image;
-                InheritException(&exception, &badboy->exception);
+                InheritException(exception, &badboy->exception);
             }
 
             ClearMagickException(&image->exception);
@@ -1516,10 +1516,10 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
 
     if (badboy)
     {
-        rm_check_exception(&exception, imglist, retention);
+        rm_check_exception(exception, imglist, retention);
     }
 
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 }