rmagick 2.9.2 → 2.10.0

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.288 2009/04/19 17:38:00 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.296 2009/06/19 22:07:05 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -21,6 +21,75 @@ static void test_Magick_version(void);
 static void version_constants(void);
 
 
+
+
+/*
+ *  Handle transferring ImageMagick memory allocations/frees to Ruby.
+ *  These functions have the same signature as the equivalent C functions.
+ */
+#if defined(HAVE_SETMAGICKMEMORYMETHODS)
+static void *rm_malloc(size_t size)
+{
+    void *p;
+//    int old_state;
+
+//    old_state = rb_gc_disable();
+    p = xmalloc((long)size);
+//    if (!RTEST(old_state))
+//    {
+//        rb_gc_enable();
+//    }
+
+    return p;
+}
+
+
+
+
+static void *rm_realloc(void *ptr, size_t size)
+{
+    void *p;
+//    int old_state;
+
+//    old_state = rb_gc_disable();
+    p = xrealloc(ptr, (long)size);
+//    if (!RTEST(old_state))
+//    {
+//        rb_gc_enable();
+//    }
+
+    return p;
+}
+
+
+
+
+static void rm_free(void *ptr)
+{
+    xfree(ptr);
+}
+
+
+static void set_managed_memory(void)
+{
+    ID enable_mm = rb_intern("RMAGICK_ENABLE_MANAGED_MEMORY");
+
+    if (RTEST(rb_const_defined(rb_cObject, enable_mm)) && RTEST(rb_const_get(rb_cObject, enable_mm)))
+    {
+        rb_warning("RMagick: %s", "managed memory enabled. This is an experimental feature.");
+        SetMagickMemoryMethods(rm_malloc, rm_realloc, rm_free);
+        rb_define_const(Module_Magick, "MANAGED_MEMORY", Qtrue);
+    }
+    else
+    {
+        rb_define_const(Module_Magick, "MANAGED_MEMORY", Qfalse);
+    }
+}
+#endif
+
+
+
+
 /*
   External:     Init_RMagick2
   Purpose:      define the classes and constants
@@ -32,16 +101,18 @@ Init_RMagick2(void)
 {
     volatile VALUE observable;
 
-#if defined(HAVE_MAGICKCOREGENESIS)
     MagickCoreGenesis("RMagick", MagickFalse);
-#else
-    InitializeMagick("RMagick");
-#endif
 
     test_Magick_version();
 
     Module_Magick = rb_define_module("Magick");
 
+#if defined(HAVE_SETMAGICKMEMORYMETHODS)
+    set_managed_memory();
+#else
+    rb_define_const(Module_Magick, "MANAGED_MEMORY", Qfalse);
+#endif
+
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
@@ -334,6 +405,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "scale", Image_scale, -1);
     rb_define_method(Class_Image, "scale!", Image_scale_bang, -1);
     rb_define_method(Class_Image, "segment", Image_segment, -1);
+    rb_define_method(Class_Image, "selective_blur_channel", Image_selective_blur_channel, -1);
     rb_define_method(Class_Image, "separate", Image_separate, -1);
     rb_define_method(Class_Image, "sepiatone", Image_sepiatone, -1);
     rb_define_method(Class_Image, "set_channel_depth", Image_set_channel_depth, 2);
@@ -742,7 +814,6 @@ Init_RMagick2(void)
     END_ENUM
 
     // AlphaChannelType constants
-#if defined(HAVE_TYPE_ALPHACHANNELTYPE)
     DEF_ENUM(AlphaChannelType)
         ENUMERATOR(UndefinedAlphaChannel)
         ENUMERATOR(ActivateAlphaChannel)
@@ -756,8 +827,10 @@ Init_RMagick2(void)
         ENUMERATOR(ShapeAlphaChannel)
         ENUMERATOR(TransparentAlphaChannel)
 #endif
-    END_ENUM
+#if defined(HAVE_ENUM_BACKGROUNDALPHACHANNEL)
+        ENUMERATOR(BackgroundAlphaChannel)
 #endif
+    END_ENUM
 
     // AnchorType constants (for Draw#text_anchor - these are not defined by ImageMagick)
     DEF_ENUM(AnchorType)
@@ -842,9 +915,7 @@ Init_RMagick2(void)
         ENUMERATOR(Rec709LumaColorspace)
         ENUMERATOR(Rec709YCbCrColorspace)
         ENUMERATOR(LogColorspace)
-#if defined(HAVE_ENUM_CMYCOLORSPACE)
         ENUMERATOR(CMYColorspace)
-#endif
     END_ENUM
 
     // ComplianceType constants are defined as enums but used as bit flags
@@ -870,10 +941,11 @@ Init_RMagick2(void)
         ENUMERATOR(AddCompositeOp)
         ENUMERATOR(AtopCompositeOp)
         ENUMERATOR(BlendCompositeOp)
+#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
+        ENUMERATOR(BlurCompositeOp)
+#endif
         ENUMERATOR(BumpmapCompositeOp)
-#if defined(HAVE_ENUM_CHANGEMASKCOMPOSITEOP)
         ENUMERATOR(ChangeMaskCompositeOp)
-#endif
         ENUMERATOR(ClearCompositeOp)
         ENUMERATOR(ColorBurnCompositeOp)
         ENUMERATOR(ColorDodgeCompositeOp)
@@ -888,9 +960,10 @@ Init_RMagick2(void)
         ENUMERATOR(CopyRedCompositeOp)
         ENUMERATOR(CopyYellowCompositeOp)
         ENUMERATOR(DarkenCompositeOp)
-#if defined(HAVE_ENUM_DIVIDECOMPOSITEOP)
-        ENUMERATOR(DivideCompositeOp)
+#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
+        ENUMERATOR(DistortCompositeOp)
 #endif
+        ENUMERATOR(DivideCompositeOp)
         ENUMERATOR(DstAtopCompositeOp)
         ENUMERATOR(DstCompositeOp)
         ENUMERATOR(DstInCompositeOp)
@@ -904,9 +977,7 @@ Init_RMagick2(void)
         ENUMERATOR(HueCompositeOp)
         ENUMERATOR(InCompositeOp)
         ENUMERATOR(LightenCompositeOp)
-#if defined(HAVE_ENUM_LINEARLIGHTCOMPOSITEOP)
         ENUMERATOR(LinearLightCompositeOp)
-#endif
         ENUMERATOR(LuminizeCompositeOp)
         ENUMERATOR(MinusCompositeOp)
         ENUMERATOR(ModulateCompositeOp)
@@ -969,15 +1040,12 @@ Init_RMagick2(void)
         ENUMERATOR(PreviousDispose)
     END_ENUM
 
-#if defined(HAVE_DISTORTIMAGE)
     // DistortImage "method" argument values
     DEF_ENUM(DistortImageMethod)
         ENUMERATOR(UndefinedDistortion)
         ENUMERATOR(AffineDistortion)
         ENUMERATOR(AffineProjectionDistortion)
-#if defined(HAVE_ENUM_ARCDISTORTION)
         ENUMERATOR(ArcDistortion)
-#endif
 #if defined(HAVE_ENUM_POLARDISTORTION)
         ENUMERATOR(PolarDistortion)
 #endif
@@ -995,9 +1063,7 @@ Init_RMagick2(void)
         ENUMERATOR(BilinearReverseDistortion)
 #endif
         ENUMERATOR(PerspectiveDistortion)
-#if defined(HAVE_ENUM_PERSPECTIVEPROJECTIONDISTORTION)
         ENUMERATOR(PerspectiveProjectionDistortion)
-#endif
 #if defined(HAVE_ENUM_POLYNOMIALDISTORTION)
         ENUMERATOR(PolynomialDistortion)
 #endif
@@ -1009,7 +1075,6 @@ Init_RMagick2(void)
         ENUMERATOR(BarrelInverseDistortion)
 #endif
     END_ENUM
-#endif
 
 #if defined(HAVE_TYPE_DITHERMETHOD)
     DEF_ENUM(DitherMethod)
@@ -1105,15 +1170,9 @@ Init_RMagick2(void)
         ENUMERATOR(LineInterlace)
         ENUMERATOR(PlaneInterlace)
         ENUMERATOR(PartitionInterlace)
-#if defined(HAVE_ENUM_GIFINTERLACE)
         ENUMERATOR(GIFInterlace)
-#endif
-#if defined(HAVE_ENUM_JPEGINTERLACE)
         ENUMERATOR(JPEGInterlace)
-#endif
-#if defined(HAVE_ENUM_PNGINTERLACE)
         ENUMERATOR(PNGInterlace)
-#endif
     END_ENUM
 
     DEF_ENUM(InterpolatePixelMethod)
@@ -1143,21 +1202,13 @@ Init_RMagick2(void)
         ENUMERATOR(OptimizePlusLayer)
         ENUMERATOR(CoalesceLayer)
         ENUMERATOR(DisposeLayer)
-#if defined(HAVE_ENUM_OPTIMIZETRANSLAYER)
         ENUMERATOR(OptimizeTransLayer)
-#endif
 #if defined(HAVE_ENUM_OPTIMIZEIMAGELAYER)
         ENUMERATOR(OptimizeImageLayer)
 #endif
-#if defined(HAVE_ENUM_REMOVEDUPSLAYER)
         ENUMERATOR(RemoveDupsLayer)
-#endif
-#if defined(HAVE_ENUM_REMOVEZEROLAYER)
         ENUMERATOR(RemoveZeroLayer)
-#endif
-#if defined(HAVE_ENUM_COMPOSITELAYER)
         ENUMERATOR(CompositeLayer)
-#endif
 #if defined(HAVE_ENUM_MERGELAYER)
         ENUMERATOR(MergeLayer)
 #endif
@@ -1176,9 +1227,7 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedMetric)
         ENUMERATOR(AbsoluteErrorMetric)
         ENUMERATOR(MeanAbsoluteErrorMetric)
-#if defined(HAVE_ENUM_MEANERRORPERPIXELMETRIC)
         ENUMERATOR(MeanErrorPerPixelMetric)
-#endif
         ENUMERATOR(MeanSquaredErrorMetric)
         ENUMERATOR(PeakAbsoluteErrorMetric)
         ENUMERATOR(PeakSignalToNoiseRatioMetric)
@@ -1193,9 +1242,7 @@ Init_RMagick2(void)
         ENUMERATOR(ImpulseNoise)
         ENUMERATOR(LaplacianNoise)
         ENUMERATOR(PoissonNoise)
-#if defined(HAVE_ENUM_RANDOMNOISE)
         ENUMERATOR(RandomNoise)
-#endif
     END_ENUM
 
     // Orientation constants
@@ -1339,18 +1386,12 @@ Init_RMagick2(void)
 #endif
 
     // SpreadMethod
-#if defined(HAVE_TYPE_SPREADMETHOD)
-    // In 6.3.0 ReflectSpread is misspelled as ReflectSpead.
-#if !defined(HAVE_ENUM_REFLECTSPREAD)
-#define ReflectSpread 2
-#endif
     DEF_ENUM(SpreadMethod)
         ENUMERATOR(UndefinedSpread)
         ENUMERATOR(PadSpread)
         ENUMERATOR(ReflectSpread)
         ENUMERATOR(RepeatSpread)
     END_ENUM
-#endif
 
     // StorageType
     DEF_ENUM(StorageType)
@@ -1397,18 +1438,10 @@ Init_RMagick2(void)
         ENUMERATOR(DitherVirtualPixelMethod)
         ENUMERATOR(RandomVirtualPixelMethod)
         ENUMERATOR(ConstantVirtualPixelMethod)
-#if defined(HAVE_ENUM_MASKVIRTUALPIXELMETHOD)
         ENUMERATOR(MaskVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_BLACKVIRTUALPIXELMETHOD)
         ENUMERATOR(BlackVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_GRAYVIRTUALPIXELMETHOD)
         ENUMERATOR(GrayVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_WHITEVIRTUALPIXELMETHOD)
         ENUMERATOR(WhiteVirtualPixelMethod)
-#endif
 #if defined(HAVE_ENUM_HORIZONTALTILEVIRTUALPIXELMETHOD)
         ENUMERATOR(HorizontalTileVirtualPixelMethod)
 #endif
@@ -1573,7 +1606,7 @@ version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2009/04/19 17:38:00 $) Copyright (C) 2009 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2009/06/19 22:07:05 $) Copyright (C) 2009 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"

data/ext/RMagick/rmpixel.c

@@ -1,4 +1,4 @@
-/* $Id: rmpixel.c,v 1.4 2009/02/28 23:50:36 rmagick Exp $ */
+/* $Id: rmpixel.c,v 1.5 2009/06/03 23:08:31 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmpixel.c
@@ -393,14 +393,9 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     saturation = NUM2DBL(rb_ary_entry(hsl, 1));
     luminosity = NUM2DBL(rb_ary_entry(hsl, 2));
 
-#if defined(HAVE_CONVERTHSLTORGB)
     rb_warning("Pixel#from_HSL is deprecated; use from_hsla");
     ConvertHSLToRGB(hue, saturation, luminosity,
                  &rgb.red, &rgb.green, &rgb.blue);
-#else
-    HSLTransform(hue, saturation, luminosity,
-                 &rgb.red, &rgb.green, &rgb.blue);
-#endif
     return Pixel_from_PixelPacket(&rgb);
 }
 
@@ -634,11 +629,7 @@ Pixel_to_hsla(VALUE self)
 
     Data_Get_Struct(self, Pixel, pixel);
 
-#if defined(HAVE_CONVERTRGBTOHSL)
     ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &sat, &lum);
-#else
-    TransformHSL(pixel->red, pixel->green, pixel->blue, &hue, &sat, &lum);
-#endif
     hue *= 360.0;
     sat *= 100.0;
     lum *= 100.0;
@@ -673,12 +664,9 @@ Pixel_to_HSL(VALUE self)
     volatile VALUE hsl;
 
     Data_Get_Struct(self, Pixel, pixel);
-#if defined(HAVE_CONVERTRGBTOHSL)
+
     rb_warning("Pixel#to_HSL is deprecated; use to_hsla");
     ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
-#else
-    TransformHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
-#endif
 
     hsl = rb_ary_new3(3, rb_float_new(hue), rb_float_new(saturation),
                       rb_float_new(luminosity));

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.178 2009/02/28 23:50:36 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.179 2009/06/03 23:08:31 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -27,7 +27,6 @@ static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 void *
 magick_safe_malloc(const size_t count, const size_t quantum)
 {
-#if defined(HAVE_ACQUIREQUANTUMMEMORY)
     void *ptr;
 
     ptr = AcquireQuantumMemory(count, quantum);
@@ -36,18 +35,6 @@ magick_safe_malloc(const size_t count, const size_t quantum)
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
     return ptr;
-#else
-
-    // Provide an implementation of AcquireQuantumMemory in releases prior to 6.3.5-9.
-    size_t size = count * quantum;
-
-    if (count == 0 || quantum != (size/count))
-    {
-        rb_raise(rb_eRuntimeError, "integer overflow detected in memory size computation. "
-               "Probable image corruption.");
-    }
-    return magick_malloc(size);
-#endif
 }
 
 
@@ -75,7 +62,6 @@ magick_free(void *ptr)
 void *
 magick_safe_realloc(void *memory, const size_t count, const size_t quantum)
 {
-#if defined(HAVE_RESIZEQUANTUMMEMORY)
     void *v;
     v = ResizeQuantumMemory(memory, count, quantum);
     if (!v)
@@ -83,16 +69,6 @@ magick_safe_realloc(void *memory, const size_t count, const size_t quantum)
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
     return v;
-#else
-    // Provide an implementation of ResizeQuantumMemory in releases prior to 6.3.5-9.
-    size_t size = count * quantum;
-    if (count == 0 || quantum != (size/count))
-    {
-        rb_raise(rb_eRuntimeError, "integer overflow detected in memory size computation. "
-               "Probable image corruption.");
-    }
-    return magick_realloc(memory, size);
-#endif
 }
 
 
@@ -576,7 +552,6 @@ void
 rm_write_temp_image(Image *image, char *temp_name)
 {
 
-#if defined(HAVE_SETIMAGEREGISTRY)
 #define TMPNAM_CLASS_VAR "@@_tmpnam_"
 
     MagickBooleanType okay;
@@ -612,24 +587,6 @@ rm_write_temp_image(Image *image, char *temp_name)
         rb_raise(rb_eRuntimeError, "SetImageRegistry failed.");
     }
 
-#else
-
-    long registry_id;
-
-    rb_warn("`%s' can cause memory leaks with ImageMagick "  MagickLibVersionText
-            ".\nUpgrade to ImageMagick 6.3.4-10 or later to prevent this behavior."
-          , rb_id2name(THIS_FUNC()));
-
-    registry_id = SetMagickRegistry(ImageRegistryType, image, sizeof(Image), &image->exception);
-    rm_check_image_exception(image, RetainOnError);
-    if (registry_id < 0)
-    {
-        rb_raise(rb_eRuntimeError, "SetMagickRegistry failed.");
-    }
-
-    sprintf(temp_name, "mpri:%ld", registry_id);
-#endif
-
 }
 
 
@@ -737,14 +694,7 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
 const char *
 rm_get_property(const Image *img, const char *property)
 {
-#if defined(HAVE_GETIMAGEPROPERTY)
     return GetImageProperty(img, property);
-#else
-    const ImageAttribute *attr;
-
-    attr = GetImageAttribute(img, property);
-    return attr ? (const char *)attr->value : NULL;
-#endif
 }
 
 
@@ -755,11 +705,7 @@ rm_get_property(const Image *img, const char *property)
 MagickBooleanType
 rm_set_property(Image *image, const char *property, const char *value)
 {
-#if defined(HAVE_SETIMAGEPROPERTY)
     return SetImageProperty(image, property, value);
-#else
-    return SetImageAttribute(image, property, value);
-#endif
 }
 
 
@@ -954,13 +900,11 @@ void rm_sync_image_options(Image *image, Info *info)
         image->scene = info->scene;
     }
 
-#if defined(HAVE_ST_TILE_OFFSET)
     option = GetImageOption(info, "tile-offset");
     if (option)
     {
         (void)ParseAbsoluteGeometry(option, &image->tile_offset);
     }
-#endif
 
     option = GetImageOption(info, "transparent");
     if (option)
@@ -1024,7 +968,6 @@ void rm_sync_image_options(Image *image, Info *info)
 VALUE
 rm_exif_by_entry(Image *image)
 {
-#if defined(HAVE_GETIMAGEPROPERTY)
     const char *property, *value;
     char *str;
     size_t len = 0, property_l, value_l;
@@ -1093,13 +1036,6 @@ rm_exif_by_entry(Image *image)
     v = rb_str_new(str, len);
     xfree(str);
     return v;
-
-#else
-
-    const char *attr = rm_get_property(image, "EXIF:*");
-    return attr ? rb_str_new2(attr) : Qnil;
-
-#endif
 }
 
 
@@ -1114,7 +1050,6 @@ rm_exif_by_entry(Image *image)
 VALUE
 rm_exif_by_number(Image *image)
 {
-#if defined(HAVE_GETIMAGEPROPERTY)
     const char *property, *value;
     char *str;
     size_t len = 0, property_l, value_l;
@@ -1183,13 +1118,6 @@ rm_exif_by_number(Image *image)
     v = rb_str_new(str, len);
     xfree(str);
     return v;
-
-#else
-
-    const char *attr = rm_get_property(image, "EXIF:!");
-    return attr ? rb_str_new2(attr) : Qnil;
-
-#endif
 }