rmagick 4.0.0 → 4.1.0.rc1

data/ext/RMagick/rminfo.c

@@ -443,7 +443,11 @@ Info_authenticate(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
+#if defined(IMAGEMAGICK_7)
+    return C_str_to_R_str(GetImageOption(info, "authenticate"));
+#else
     return C_str_to_R_str(info->authenticate);
+#endif
 }
 
 
@@ -470,6 +474,16 @@ Info_authenticate_eq(VALUE self, VALUE passwd_arg)
         passwd = StringValuePtr(passwd_arg);
     }
 
+#if defined(IMAGEMAGICK_7)
+    if (passwd)
+    {
+        SetImageOption(info, "authenticate", passwd);
+    }
+    else
+    {
+        RemoveImageOption(info, "authenticate");
+    }
+#else
     if (info->authenticate)
     {
         magick_free(info->authenticate);
@@ -479,6 +493,7 @@ Info_authenticate_eq(VALUE self, VALUE passwd_arg)
     {
         magick_clone_string(&info->authenticate, passwd);
     }
+#endif
 
     return passwd_arg;
 }
@@ -2463,7 +2478,11 @@ Info_view(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
+#if defined(IMAGEMAGICK_7)
+    return C_str_to_R_str(GetImageOption(info, "fpx:view"));
+#else
     return C_str_to_R_str(info->view);
+#endif
 }
 
 /**
@@ -2489,6 +2508,16 @@ Info_view_eq(VALUE self, VALUE view_arg)
         view = StringValuePtr(view_arg);
     }
 
+#if defined(IMAGEMAGICK_7)
+    if (view)
+    {
+        SetImageOption(info, "fpx:view", view);
+    }
+    else
+    {
+        RemoveImageOption(info, "fpx:view");
+    }
+#else
     if (info->view)
     {
         magick_free(info->view);
@@ -2498,6 +2527,7 @@ Info_view_eq(VALUE self, VALUE view_arg)
     {
         magick_clone_string(&info->view, view);
     }
+#endif
     return view_arg;
 }
 

data/ext/RMagick/rmkinfo.c

@@ -53,10 +53,26 @@ VALUE
 KernelInfo_initialize(VALUE self, VALUE kernel_string)
 {
     KernelInfo *kernel;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     Check_Type(kernel_string, T_STRING);
 
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    kernel = AcquireKernelInfo(StringValueCStr(kernel_string), exception);
+    if (rm_should_raise_exception(exception, DestroyExceptionRetention))
+    {
+        if (kernel != (KernelInfo *) NULL)
+        {
+            (void) DestroyKernelInfo(kernel);
+        }
+        rm_raise_exception(exception);
+    }
+#else
     kernel = AcquireKernelInfo(StringValueCStr(kernel_string));
+#endif
 
     if (!kernel)
     {
@@ -216,12 +232,28 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
     KernelInfo *kernel;
     KernelInfoType kernel_type;
     GeometryInfo info;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     Check_Type(geometry, T_STRING);
     VALUE_TO_ENUM(what, kernel_type, KernelInfoType);
     ParseGeometry(StringValueCStr(geometry), &info);
 
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    kernel = AcquireKernelBuiltIn(kernel_type, &info, exception);
+    if (rm_should_raise_exception(exception, DestroyExceptionRetention))
+    {
+        if (kernel != (KernelInfo *) NULL)
+        {
+            (void) DestroyKernelInfo(kernel);
+        }
+        rm_raise_exception(exception);
+    }
+#else
     kernel = AcquireKernelBuiltIn(kernel_type, &info);
+#endif
 
     if (!kernel)
     {

data/ext/RMagick/rmmain.c

@@ -996,7 +996,6 @@ Init_RMagick2(void)
         ENUMERATOR(CopyCyanCompositeOp)
         ENUMERATOR(CopyGreenCompositeOp)
         ENUMERATOR(CopyMagentaCompositeOp)
-        ENUMERATORV(CopyAlphaCompositeOp, CopyOpacityCompositeOp)
         ENUMERATOR(CopyRedCompositeOp)
         ENUMERATOR(CopyYellowCompositeOp)
         ENUMERATOR(DarkenCompositeOp)
@@ -1014,9 +1013,6 @@ Init_RMagick2(void)
         ENUMERATOR(DissolveCompositeOp)
         ENUMERATOR(ExclusionCompositeOp)
         ENUMERATOR(HardLightCompositeOp)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
-        ENUMERATOR(HardMixCompositeOp)
-#endif
         ENUMERATOR(HueCompositeOp)
         ENUMERATOR(InCompositeOp)
         ENUMERATOR(LightenCompositeOp)
@@ -1052,6 +1048,14 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedCompositeOp)
         ENUMERATOR(VividLightCompositeOp)
         ENUMERATOR(XorCompositeOp)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+        ENUMERATOR(HardMixCompositeOp)
+#endif
+#if defined(IMAGEMAGICK_7)
+        ENUMERATOR(CopyAlphaCompositeOp)
+#else
+        ENUMERATORV(CopyAlphaCompositeOp, CopyOpacityCompositeOp)
+#endif
     END_ENUM
 
     // CompressionType constants
@@ -1191,15 +1195,23 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedType)
         ENUMERATOR(BilevelType)
         ENUMERATOR(GrayscaleType)
-        ENUMERATORV(GrayscaleAlphaType, GrayscaleMatteType)
         ENUMERATOR(PaletteType)
-        ENUMERATORV(PaletteAlphaType, PaletteMatteType)
         ENUMERATOR(TrueColorType)
-        ENUMERATORV(TrueColorAlphaType, TrueColorMatteType)
         ENUMERATOR(ColorSeparationType)
-        ENUMERATORV(ColorSeparationAlphaType, ColorSeparationMatteType)
         ENUMERATOR(OptimizeType)
+#if defined(IMAGEMAGICK_7)
+        ENUMERATOR(GrayscaleAlphaType)
+        ENUMERATOR(PaletteAlphaType)
+        ENUMERATOR(TrueColorAlphaType)
+        ENUMERATOR(ColorSeparationAlphaType)
+        ENUMERATOR(PaletteBilevelAlphaType)
+#else
+        ENUMERATORV(GrayscaleAlphaType, GrayscaleMatteType)
+        ENUMERATORV(PaletteAlphaType, PaletteMatteType)
+        ENUMERATORV(TrueColorAlphaType, TrueColorMatteType)
+        ENUMERATORV(ColorSeparationAlphaType, ColorSeparationMatteType)
         ENUMERATORV(PaletteBilevelAlphaType, PaletteBilevelMatteType)
+#endif
     END_ENUM
 
     // InterlaceType constants
@@ -1243,18 +1255,24 @@ Init_RMagick2(void)
     END_ENUM
 
     DEF_ENUM(MetricType)
-        ENUMERATORV(UndefinedErrorMetric, UndefinedMetric)
         ENUMERATOR(AbsoluteErrorMetric)
         ENUMERATOR(MeanAbsoluteErrorMetric)
-        ENUMERATORV(MeanErrorPerPixelErrorMetric, MeanErrorPerPixelMetric)
         ENUMERATOR(MeanSquaredErrorMetric)
         ENUMERATOR(PeakAbsoluteErrorMetric)
-        ENUMERATORV(PeakSignalToNoiseRatioErrorMetric, PeakSignalToNoiseRatioMetric)
         ENUMERATOR(RootMeanSquaredErrorMetric)
         ENUMERATOR(NormalizedCrossCorrelationErrorMetric)
         ENUMERATOR(FuzzErrorMetric)
 #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(PerceptualHashErrorMetric)
+#endif
+#if defined(IMAGEMAGICK_7)
+        ENUMERATOR(UndefinedErrorMetric)
+        ENUMERATOR(MeanErrorPerPixelErrorMetric)
+        ENUMERATOR(PeakSignalToNoiseRatioErrorMetric)
+#else
+        ENUMERATORV(UndefinedErrorMetric, UndefinedMetric)
+        ENUMERATORV(MeanErrorPerPixelErrorMetric, MeanErrorPerPixelMetric)
+        ENUMERATORV(PeakSignalToNoiseRatioErrorMetric, PeakSignalToNoiseRatioMetric)
 #endif
     END_ENUM
 
@@ -1298,7 +1316,11 @@ Init_RMagick2(void)
         ENUMERATOR(BilinearInterpolatePixel)
         ENUMERATOR(IntegerInterpolatePixel)
         ENUMERATOR(MeshInterpolatePixel)
+#if defined(IMAGEMAGICK_7)
+        ENUMERATOR(NearestInterpolatePixel)
+#else
         ENUMERATORV(NearestInterpolatePixel, NearestNeighborInterpolatePixel)
+#endif
         ENUMERATOR(SplineInterpolatePixel)
         ENUMERATOR(Average9InterpolatePixel)
         ENUMERATOR(Average16InterpolatePixel)

data/ext/RMagick/rmpixel.c

@@ -12,6 +12,9 @@
 
 #include "rmagick.h"
 
+#if defined(IMAGEMAGICK_6)
+    #define QueryColorname QueryMagickColorname
+#endif
 
 /*
  *  Declare Pixel channel attribute writers
@@ -124,7 +127,11 @@ Pixel_alpha(VALUE self)
 {
     Pixel *pixel;
     Data_Get_Struct(self, Pixel, pixel);
+#if defined(IMAGEMAGICK_7)
+    return C_int_to_R_int(pixel->alpha);
+#else
     return C_int_to_R_int(QuantumRange - pixel->opacity);
+#endif
 }
 
 /**
@@ -200,10 +207,17 @@ Pixel_alpha_eq(VALUE self, VALUE v)
  
     rb_check_frozen(self);
     Data_Get_Struct(self, Pixel, pixel);
+#if defined(IMAGEMAGICK_7)
+    pixel->alpha = APP2QUANTUM(v);
+    (void) rb_funcall(self, rm_ID_changed, 0);
+    (void) rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM(pixel->alpha);
+#else
     pixel->opacity = QuantumRange - APP2QUANTUM(v);
     (void) rb_funcall(self, rm_ID_changed, 0);
     (void) rb_funcall(self, rm_ID_notify_observers, 1, self);
     return QUANTUM2NUM(QuantumRange - pixel->opacity);
+#endif
 }
 
 /*
@@ -212,7 +226,11 @@ Pixel_alpha_eq(VALUE self, VALUE v)
 DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(cyan, red)
 DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(magenta, green)
 DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(yellow, blue)
+#if defined(IMAGEMAGICK_7)
+DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, black)
+#else
 DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, opacity)
+#endif
 
 
 /**
@@ -255,7 +273,11 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
         pp->red     = pixel->red;
         pp->green   = pixel->green;
         pp->blue    = pixel->blue;
+#if defined(IMAGEMAGICK_7)
+        pp->alpha   = pixel->alpha;
+#else
         pp->opacity = pixel->opacity;
+#endif
     }
     else
     {
@@ -336,7 +358,11 @@ Pixel_case_eq(VALUE self, VALUE other)
         return (this->red == that->red
             && this->blue == that->blue
             && this->green == that->green
+#if defined(IMAGEMAGICK_7)
+            && this->alpha == that->alpha) ? Qtrue : Qfalse;
+#else
             && this->opacity == that->opacity) ? Qtrue : Qfalse;
+#endif
     }
 
     return Qfalse;
@@ -440,9 +466,13 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     double fuzz = 0.0;
     unsigned int equal;
     ColorspaceType colorspace = RGBColorspace;
+#if defined(IMAGEMAGICK_7)
+    PixelColor this, that;
+#else
     Image *image;
     Info *info;
     Pixel *this, *that;
+#endif
 
     switch (argc)
     {
@@ -458,6 +488,15 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
             break;
     }
 
+#if defined(IMAGEMAGICK_7)
+    Color_to_PixelColor(&this, self);
+    Color_to_PixelColor(&that, argv[0]);
+    this.fuzz = fuzz;
+    this.colorspace = colorspace;
+    that.fuzz = fuzz;
+    that.colorspace = colorspace;
+    equal = IsFuzzyEquivalencePixelInfo(&this, &that);
+#else
     Data_Get_Struct(self, Pixel, this);
     Data_Get_Struct(argv[0], Pixel, that);
 
@@ -485,6 +524,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
 
     equal = IsColorSimilar(image, this, that);
     (void) DestroyImage(image);
+#endif
 
     return equal ? Qtrue : Qfalse;
 }
@@ -602,7 +642,11 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
 
     exception = AcquireExceptionInfo();
 
+#if defined(IMAGEMAGICK_7)
+    (void) QueryColorCompliance(name, AllCompliance, &pp, exception);
+#else
     (void) QueryMagickColor(name, &pp, exception);
+#endif
     CHECK_EXCEPTION()
 
     (void) DestroyExceptionInfo(exception);
@@ -631,7 +675,11 @@ Pixel_from_MagickPixel(const MagickPixel *pp)
     pixel->red     = ROUND_TO_QUANTUM(pp->red);
     pixel->green   = ROUND_TO_QUANTUM(pp->green);
     pixel->blue    = ROUND_TO_QUANTUM(pp->blue);
+#if defined(IMAGEMAGICK_7)
+    pixel->alpha   = ROUND_TO_QUANTUM(pp->alpha);
+#else
     pixel->opacity = ROUND_TO_QUANTUM(pp->opacity);
+#endif
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
 }
@@ -657,7 +705,11 @@ Pixel_from_PixelPacket(const PixelPacket *pp)
     pixel->red     = pp->red;
     pixel->green   = pp->green;
     pixel->blue    = pp->blue;
+#if defined(IMAGEMAGICK_7)
+    pixel->alpha   = pp->alpha;
+#else
     pixel->opacity = pp->opacity;
+#endif
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
 }
@@ -683,7 +735,11 @@ Pixel_from_PixelColor(const PixelColor *pp)
     pixel->red     = pp->red;
     pixel->green   = pp->green;
     pixel->blue    = pp->blue;
+#if defined(IMAGEMAGICK_7)
+    pixel->alpha   = pp->alpha;
+#else
     pixel->opacity = pp->opacity;
+#endif
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
 }
@@ -711,7 +767,11 @@ Pixel_hash(VALUE self)
     hash  = ScaleQuantumToChar(pixel->red)   << 24;
     hash += ScaleQuantumToChar(pixel->green) << 16;
     hash += ScaleQuantumToChar(pixel->blue)  << 8;
+#if defined(IMAGEMAGICK_7)
+    hash += ScaleQuantumToChar(pixel->alpha);
+#else
     hash += ScaleQuantumToChar(QuantumRange - pixel->opacity);
+#endif
 
     return UINT2NUM(hash >> 1);
 }
@@ -770,13 +830,24 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
 
     Data_Get_Struct(self, Pixel, pixel);
 
+#if defined(IMAGEMAGICK_7)
+    pixel->alpha = OpaqueAlpha;
+#endif
+
     switch(argc)
     {
         case 4:
+#if defined(IMAGEMAGICK_7)
+            if (argv[3] != Qnil)
+            {
+                pixel->alpha = APP2QUANTUM(argv[3]);
+            }
+#else
             if (argv[3] != Qnil)
             {
                 pixel->opacity = APP2QUANTUM(argv[3]);
             }
+#endif
         case 3:
             if (argv[2] != Qnil)
             {
@@ -847,7 +918,11 @@ Pixel_marshal_dump(VALUE self)
     rb_hash_aset(dpixel, CSTR2SYM("red"), QUANTUM2NUM(pixel->red));
     rb_hash_aset(dpixel, CSTR2SYM("green"), QUANTUM2NUM(pixel->green));
     rb_hash_aset(dpixel, CSTR2SYM("blue"), QUANTUM2NUM(pixel->blue));
+#if defined(IMAGEMAGICK_7)
+    rb_hash_aset(dpixel, CSTR2SYM("alpha"), QUANTUM2NUM(pixel->alpha));
+#else
     rb_hash_aset(dpixel, CSTR2SYM("opacity"), QUANTUM2NUM(pixel->opacity));
+#endif
 
     RB_GC_GUARD(dpixel);
 
@@ -874,7 +949,11 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
     pixel->red = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("red")));
     pixel->green = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("green")));
     pixel->blue = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("blue")));
+#if defined(IMAGEMAGICK_7)
+    pixel->alpha = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("alpha")));
+#else
     pixel->opacity = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("opacity")));
+#endif
     return self;
 }
 
@@ -909,10 +988,17 @@ Pixel_spaceship(VALUE self, VALUE other)
     {
         return INT2NUM((this->blue - that->blue)/abs(this->blue - that->blue));
     }
+#if defined(IMAGEMAGICK_7)
+    else if(this->alpha != that->alpha)
+    {
+        return INT2NUM((this->alpha - that->alpha)/abs(this->alpha - that->alpha));
+    }
+#else
     else if(this->opacity != that->opacity)
     {
         return INT2NUM(((QuantumRange - this->opacity) - (QuantumRange - that->opacity))/abs((QuantumRange - this->opacity) - (QuantumRange - that->opacity)));
     }
+#endif
 
     // Values are equal, check class.
 
@@ -947,6 +1033,20 @@ Pixel_to_hsla(VALUE self)
     sat *= 255.0;
     lum *= 255.0;
 
+#if defined(IMAGEMAGICK_7)
+    if (pixel->alpha == OpaqueAlpha)
+    {
+        alpha = 1.0;
+    }
+    else if (pixel->alpha == TransparentAlpha)
+    {
+        alpha = 0.0;
+    }
+    else
+    {
+        alpha = (double)(pixel->alpha) / (double)QuantumRange;
+    }
+#else
     if (pixel->opacity == OpaqueOpacity)
     {
         alpha = 1.0;
@@ -959,6 +1059,7 @@ Pixel_to_hsla(VALUE self)
     {
         alpha = (double)(QuantumRange - pixel->opacity) / (double)QuantumRange;
     }
+#endif
 
     hsla = rb_ary_new3(4, rb_float_new(hue), rb_float_new(sat), rb_float_new(lum), rb_float_new(alpha));
 
@@ -985,7 +1086,11 @@ rm_set_magick_pixel_packet(Pixel *pixel, MagickPixel *pp)
     pp->red     = (MagickRealType) pixel->red;
     pp->green   = (MagickRealType) pixel->green;
     pp->blue    = (MagickRealType) pixel->blue;
+#if defined(IMAGEMAGICK_7)
+    pp->alpha   = (MagickRealType) pixel->alpha;
+#else
     pp->opacity = (MagickRealType) pixel->opacity;
+#endif
     pp->index   = (MagickRealType) 0.0;
 }
 
@@ -996,13 +1101,13 @@ rm_set_magick_pixel_packet(Pixel *pixel, MagickPixel *pp)
  * Ruby usage:
  *   - @verbatim Magick::Pixel#to_color @endverbatim
  *   - @verbatim Magick::Pixel#to_color(compliance) @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance, matte) @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance, matte, depth) @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance, matte, depth, hex) @endverbatim
+ *   - @verbatim Magick::Pixel#to_color(compliance, alpha) @endverbatim
+ *   - @verbatim Magick::Pixel#to_color(compliance, alpha, depth) @endverbatim
+ *   - @verbatim Magick::Pixel#to_color(compliance, alpha, depth, hex) @endverbatim
  *
  * Notes:
  *   - Default compliance is AllCompliance
- *   - Default matte is false
+ *   - Default alpha is false
  *   - Default depth is MAGICKCORE_QUANTUM_DEPTH
  *   - Default hex is false
  *   - The conversion respects the value of the 'opacity' field in the Pixel
@@ -1023,7 +1128,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     char name[MaxTextExtent];
     ExceptionInfo *exception;
     ComplianceType compliance = AllCompliance;
-    unsigned int matte = MagickFalse;
+    unsigned int alpha = MagickFalse;
     unsigned int depth = MAGICKCORE_QUANTUM_DEPTH;
 
     switch (argc)
@@ -1049,7 +1154,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
                     break;
             }
        case 2:
-            matte = RTEST(argv[1]);
+            alpha = RTEST(argv[1]);
         case 1:
             VALUE_TO_ENUM(argv[0], compliance, ComplianceType);
         case 0:
@@ -1069,28 +1174,34 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eNoMemError, "not enough memory to continue.");
     }
 
+    exception = AcquireExceptionInfo();
+
     image->depth = depth;
-    image->matte = matte;
+#if defined(IMAGEMAGICK_6)
+    image->matte = alpha;
+#endif
 
     rm_init_magickpixel(image, &mpp);
     rm_set_magick_pixel_packet(pixel, &mpp);
 
-    exception = AcquireExceptionInfo();
-
     // Support for hex-format color names moved out of QueryMagickColorname
     // in 6.4.1-9. The 'hex' argument was removed as well.
     if (hex)
     {
         if (compliance == XPMCompliance)
         {
+#if defined(IMAGEMAGICK_7)
+            mpp.alpha_trait = UndefinedPixelTrait;
+#else
             mpp.matte = MagickFalse;
+#endif
             mpp.depth = (unsigned long) min(1.0 * image->depth, 16.0);
         }
         (void) GetColorTuple(&mpp, MagickTrue, name);
     }
     else
     {
-        (void) QueryMagickColorname(image, &mpp, compliance, name, exception);
+        (void) QueryColorname(image, &mpp, compliance, name, exception);
     }
 
     (void) DestroyImage(image);
@@ -1120,7 +1231,11 @@ Pixel_to_s(VALUE self)
     Data_Get_Struct(self, Pixel, pixel);
     sprintf(buff, "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", alpha=" QuantumFormat,
             pixel->red, pixel->green, pixel->blue,
+#if defined(IMAGEMAGICK_7)
+            pixel->alpha);
+#else
             (QuantumRange - pixel->opacity));
+#endif
     return rb_str_new2(buff);
 }