rmagick 1.9.3 → 1.10.0

data/ext/RMagick/rminfo.c

@@ -1,6 +1,6 @@
-/* $Id: rminfo.c,v 1.33 2005/06/19 20:26:34 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.36 2006/01/18 00:23:03 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rminfo.c
 | Author:   Tim Hunter
 | Purpose:  Info class method definitions for RMagick.
@@ -177,7 +177,7 @@ VALUE
 Info_authenticate_eq(VALUE self, VALUE passwd)
 {
     Info *info;
-    char *passwd_p;
+    char *passwd_p = NULL;
     long passwd_len = 0;
 
     Data_Get_Struct(self, Info, info);
@@ -1227,7 +1227,7 @@ Info_number_scenes_eq(VALUE self, VALUE nscenes)
 VALUE
 Info_orientation(VALUE self)
 {
-#if defined(HAVE_IMAGE_ORIENTATION)
+#if defined(HAVE_IMAGEINFO_ORIENTATION)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
@@ -1247,7 +1247,7 @@ Info_orientation(VALUE self)
 VALUE
 Info_orientation_eq(VALUE self, VALUE inter)
 {
-#if defined(HAVE_IMAGE_ORIENTATION)
+#if defined(HAVE_IMAGEINFO_ORIENTATION)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
@@ -1338,7 +1338,7 @@ VALUE
 Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
 {
     Info *info;
-    char *sampling_factor_p;
+    char *sampling_factor_p = NULL;
     long sampling_factor_len = 0;
 
     Data_Get_Struct(self, Info, info);

data/ext/RMagick/rmmain.c

@@ -1,6 +1,6 @@
-/* $Id: rmmain.c,v 1.99 2005/10/13 23:01:29 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.110 2006/01/20 23:59:46 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmmain.c
 | Author:   Tim Hunter
 | Purpose:  Contains all module, class, method declarations.
@@ -10,12 +10,14 @@
 
 #define MAIN                        // Define external variables
 #include "rmagick.h"
+#include "magick/version.h"
 
 /*----------------------------------------------------------------------------\
 | External declarations
 \----------------------------------------------------------------------------*/
 void Init_RMagick(void);
 
+static void test_Magick_version(void);
 static void version_constants(void);
 
 
@@ -406,7 +408,7 @@ Magick_set_monitor(VALUE class, VALUE monitor)
         // available, use the 3-parm version of rb_cvar_set.
         RUBY18(rb_cvar_set(Module_Magick, Magick_Monitor, monitor, 0);)
         RUBY16(rb_cvar_set(Module_Magick, Magick_Monitor, monitor);)
-        (void) SetMonitorHandler(&monitor_handler);
+        (void) SetMonitorHandler((MonitorHandler)&monitor_handler);
     }
 
     return class;
@@ -470,13 +472,8 @@ Magick_set_log_event_mask(int argc, VALUE *argv, VALUE class)
 static VALUE
 Magick_set_log_format(VALUE class, VALUE format)
 {
-#ifdef HAVE_SETLOGFORMAT
     SetLogFormat(STRING_PTR(format));
     return class;
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-#endif
 }
 
 
@@ -494,6 +491,7 @@ Init_RMagick(void)
     volatile VALUE observable;
 
     InitializeMagick("RMagick");
+    test_Magick_version();
 
     Module_Magick = rb_define_module("Magick");
 
@@ -627,6 +625,7 @@ Init_RMagick(void)
 
     rb_define_method(Class_Image, "adaptive_threshold", Image_adaptive_threshold, -1);
     rb_define_method(Class_Image, "add_noise", Image_add_noise, 1);
+    rb_define_method(Class_Image, "add_noise_channel", Image_add_noise_channel, -1);
     rb_define_method(Class_Image, "affine_transform", Image_affine_transform, 1);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
     rb_define_method(Class_Image, "[]=", Image_aset, 2);
@@ -679,7 +678,8 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "enhance", Image_enhance, 0);
     rb_define_method(Class_Image, "equalize", Image_equalize, 0);
     rb_define_method(Class_Image, "erase!", Image_erase_bang, 0);
-    rb_define_method(Class_Image, "export_pixels", Image_export_pixels, 5);
+    rb_define_method(Class_Image, "export_pixels", Image_export_pixels, -1);
+    rb_define_method(Class_Image, "export_pixels_to_str", Image_export_pixels_to_str, -1);
     rb_define_method(Class_Image, "flip", Image_flip, 0);
     rb_define_method(Class_Image, "flip!", Image_flip_bang, 0);
     rb_define_method(Class_Image, "flop", Image_flop, 0);
@@ -716,7 +716,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "oil_paint", Image_oil_paint, -1);
     rb_define_method(Class_Image, "opaque", Image_opaque, 2);
     rb_define_method(Class_Image, "opaque?", Image_opaque_q, 0);
-    rb_define_method(Class_Image, "ordered_dither", Image_ordered_dither, 0);
+    rb_define_method(Class_Image, "ordered_dither", Image_ordered_dither, -1);
     rb_define_method(Class_Image, "palette?", Image_palette_q, 0);
     rb_define_method(Class_Image, "pixel_color", Image_pixel_color, -1);
     rb_define_method(Class_Image, "posterize", Image_posterize, -1);
@@ -773,6 +773,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "trim!", Image_trim_bang, 0);
     rb_define_method(Class_Image, "unsharp_mask", Image_unsharp_mask, -1);
     rb_define_method(Class_Image, "unsharp_mask_channel", Image_unsharp_mask_channel, -1);
+    rb_define_method(Class_Image, "vignette", Image_vignette, -1);
     rb_define_method(Class_Image, "wave", Image_wave, -1);
     rb_define_method(Class_Image, "white_threshold", Image_white_threshold, -1);
     rb_define_method(Class_Image, "write", Image_write, 1);
@@ -875,6 +876,13 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Pixel, blue)
     DCL_ATTR_ACCESSOR(Pixel, opacity)
 
+    // Define the CMYK attributes
+    DCL_ATTR_ACCESSOR(Pixel, cyan)
+    DCL_ATTR_ACCESSOR(Pixel, magenta)
+    DCL_ATTR_ACCESSOR(Pixel, yellow)
+    DCL_ATTR_ACCESSOR(Pixel, black)
+
+
     // Define the instance methods
     rb_define_method(Class_Pixel, "<=>", Pixel_spaceship, 1);
     rb_define_method(Class_Pixel, "===", Pixel_case_eq, 1);
@@ -1113,14 +1121,31 @@ Init_RMagick(void)
                       , rm_enum_new(Class_ColorspaceType
                       , ID2SYM(rb_intern("SRGBColorspace"))
                       , INT2FIX(sRGBColorspace)));
-#if defined(HAVE_HSLCOLORSPACE)
-        ENUMERATOR(HSLColorspace)       // 5.5.7
+        ENUMERATOR(HSLColorspace)
+        ENUMERATOR(HWBColorspace)
+#if defined(HAVE_HSBCOLORSPACE)
+        ENUMERATOR(HSBColorspace)           // IM 6.0.0
 #endif
-#if defined(HAVE_HWBCOLORSPACE)
-        ENUMERATOR(HWBColorspace)       // 5.5.7
+#if defined(HAVE_CINEONLOGRGBCOLORSPACE)
+        ENUMERATOR(CineonLogRGBColorspace)  // GM 1.2
 #endif
-#if defined(HAVE_HSBCOLORSPACE)
-        ENUMERATOR(HSBColorspace)       // 6.0.0
+#if defined(HAVE_LABCOLORSPACE)
+        ENUMERATOR(LABColorspace)           // GM 1.2
+#endif
+#if defined(HAVE_REC601LUMACOLORSPACE)
+        ENUMERATOR(Rec601LumaColorspace)    // GM 1.2 && IM 6.2.2
+#endif
+#if defined(HAVE_REC601YCBCRCOLORSPACE)
+        ENUMERATOR(Rec601YCbCrColorspace)   // GM 1.2 && IM 6.2.2
+#endif
+#if defined(HAVE_REC709LUMACOLORSPACE)
+        ENUMERATOR(Rec709LumaColorspace)    // GM 1.2 && IM 6.2.2
+#endif
+#if defined(HAVE_REC709YCBCRCOLORSPACE)
+        ENUMERATOR(Rec709YCbCrColorspace)   // GM 1.2 && IM 6.2.2
+#endif
+#if defined(HAVE_LOGCOLORSPACE)
+        ENUMERATOR(LogColorspace)           // IM 6.2.3
 #endif
     END_ENUM
 
@@ -1134,9 +1159,7 @@ Init_RMagick(void)
                   , ID2SYM(rb_intern("AllCompliance"))
                   , INT2FIX(SVGCompliance|X11Compliance|XPMCompliance)));
 
-#if defined(HAVE_NOCOMPLIANCE)
         ENUMERATOR(NoCompliance)
-#endif
         ENUMERATOR(SVGCompliance)
         ENUMERATOR(X11Compliance)
         ENUMERATOR(XPMCompliance)
@@ -1236,15 +1259,13 @@ Init_RMagick(void)
         ENUMERATOR(LineThroughDecoration)
     END_ENUM
 
-#if defined(HAVE_DISPOSETYPE)
-    // DisposeType constants (5.5.1)
+    // DisposeType constants
     DEF_ENUM(DisposeType)
         ENUMERATOR(UndefinedDispose)
         ENUMERATOR(BackgroundDispose)
         ENUMERATOR(NoneDispose)
         ENUMERATOR(PreviousDispose)
     END_ENUM
-#endif
 
     DEF_ENUM(EndianType)
         ENUMERATOR(UndefinedEndian)
@@ -1561,6 +1582,64 @@ Init_RMagick(void)
 
 }
 
+
+
+
+/*
+ *  Static:     test_Magick_version
+ *  Purpose:    Ensure the version of ImageMagick we're running with matches
+ *              the version we were compiled with.
+ *  Notes:      Bypass the test by defining the constant RMAGICK_BYPASS_VERSION_TEST
+ *              to 'true' at the top level, before requiring 'RMagick'
+*/
+static void test_Magick_version(void)
+{
+    unsigned long version_number;
+    const char *version_str;
+    const char *web_site =
+#if defined(MagickHomeURL)
+        MagickHomeURL
+#else
+        MagickWebSite
+#endif
+        ;
+    int x, n;
+    ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
+
+    if (RTEST(rb_const_defined(rb_cObject, bypass)) && RTEST(rb_const_get(rb_cObject, bypass)))
+    {
+        return;
+    }
+
+    version_str = GetMagickVersion(&version_number);
+    if (version_number != MagickLibVersion)
+    {
+        // Extract the string "ImageMagick X.Y.Z"
+        n = 0;
+        for (x = 0; version_str[x] != '\0'; x++)
+        {
+            if (version_str[x] == ' ' && ++n == 2)
+            {
+                break;
+            }
+        }
+
+        rb_raise(rb_eRuntimeError,
+            "This version of RMagick was created to run with %s %s\n"
+            "but %.*s is installed on this system. You should either\n"
+            "   1) refer to the RMagick README file to learn how to create\n"
+            "      a version of RMagick for %.*s, or\n"
+            "   2) download %s %s from %s and install it." ,
+            MagickPackageName, MagickLibVersionText, x, version_str, x, version_str,
+            MagickPackageName, MagickLibVersionText, web_site);
+    }
+
+}
+
+
+
+
+
 /*
     Static:     version_constants
     Purpose:    create Version, Magick_version, and Version_long constants.
@@ -1568,19 +1647,29 @@ Init_RMagick(void)
 static void version_constants(void)
 {
     const char *mgk_version;
+    volatile VALUE str;
     char long_version[1000];
 
     mgk_version = GetMagickVersion(NULL);
-    rb_define_const(Module_Magick, "Magick_version", rb_str_new2(mgk_version));
 
-    rb_define_const(Module_Magick, "Version", rb_str_new2(PACKAGE_STRING));
+    str = rb_str_new2(mgk_version);
+    rb_obj_freeze(str);
+    rb_define_const(Module_Magick, "Magick_version", str);
+
+    str = rb_str_new2(PACKAGE_STRING);
+    rb_obj_freeze(str);
+    rb_define_const(Module_Magick, "Version", str);
+
     sprintf(long_version,
-        "This is %s ($Date: 2005/10/13 23:01:29 $) Copyright (C) 2005 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2006/01/20 23:59:46 $) Copyright (C) 2006 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"
         "Email: rmagick@rubyforge.org\n",
         PACKAGE_STRING, mgk_version, RUBY_VERSION_STRING);
-    rb_define_const(Module_Magick, "Long_version", rb_str_new2(long_version));
+
+    str = rb_str_new2(long_version);
+    rb_obj_freeze(str);
+    rb_define_const(Module_Magick, "Long_version", str);
 
 }

data/ext/RMagick/rmutil.c

@@ -1,6 +1,6 @@
-/* $Id: rmutil.c,v 1.60 2005/10/13 23:01:29 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.66 2006/01/20 23:59:46 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2005 by Timothy P. Hunter
+|                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmutil.c
 | Author:   Tim Hunter
 | Purpose:  Utility functions for RMagick
@@ -130,6 +130,28 @@ char *rm_string_value_ptr_len(volatile VALUE *ptr, long *len)
 }
 
 
+/*
+ *  Extern:     rm_strcasecmp(s1, s2)
+ *  Purpose:    compare s1 and s2 ignoring case
+ *  Returns:    same as strcmp(3)
+*/
+int
+rm_strcasecmp(const char *s1, const char *s2)
+{
+    while (*s1 && *s2)
+    {
+        if (toupper(*s1) != toupper(*s2))
+        {
+            break;
+        }
+        s1 += 1;
+        s2 += 1;
+    }
+    return (int)(*s1 - *s2);
+}
+
+
+
 /*
  *  Extern:     rm_check_ary_len(ary, len)
  *  Purpose:    raise exception if array too short
@@ -523,8 +545,6 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
 /*
     Method:  Pixel#fcmp(other[, fuzz[, colorspace]])
     Purpose: Compare pixel values for equality
-    Notes:   The colorspace value is ignored < 5.5.5
-             and > 5.5.7.
 */
 VALUE
 Pixel_fcmp(int argc, VALUE *argv, VALUE self)
@@ -556,7 +576,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(self, Pixel, this);
     Data_Get_Struct(argv[0], Pixel, that);
 
-#if defined(HAVE_FUZZYCOLORCOMPARE)
+#if defined(HAVE_FUZZYCOLORCOMPARE) || defined(HAVE_ISCOLORSIMILAR)
     // The FuzzyColorCompare function expects to get the
     // colorspace and fuzz parameters from an Image structure.
 
@@ -576,7 +596,11 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     image->colorspace = colorspace;
     image->fuzz = fuzz;
 
+#if defined(HAVE_ISCOLORSIMILAR)
+    equal = IsColorSimilar(image, this, that);
+#else
     equal = FuzzyColorCompare(image, this, that);
+#endif
     DestroyImage(image);
 
 #else
@@ -623,6 +647,20 @@ DEF_PIXEL_CHANNEL_WRITER(blue)
 DEF_PIXEL_CHANNEL_WRITER(opacity)
 
 
+/*
+    Methods:    Pixel CMYK attribute accessors
+    Purpose:    Get/set Pixel attributes
+    Note:       Pixel is Observable. Setters call changed, notify_observers
+    Note:       Setters return their argument values for backward compatibility
+                to when Pixel was a Struct class.
+*/
+DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(cyan, red)
+DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(magenta, green)
+DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(yellow, blue)
+DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, opacity)
+
+
+
 /*
     Method:     Pixel#<=>
     Purpose:    Support Comparable mixin
@@ -1001,6 +1039,19 @@ ColorspaceType_new(ColorspaceType cs)
 {
     const char *name;
 
+#if defined(HAVE_REC601YCBCRCOLORSPACE)
+    // GM 1.2  defines this symbol to be equal to YCbCrColorspace,  so we
+    // can't use it as a case label.  GM wants the string version of this
+    // enumerator to be Rec601YCbCrColorspace (see ColorspaceTypeToString
+    // in colorspace.c) so that's what we return for both versions of the
+    // enumerator.
+    if (cs == Rec601YCbCrColorspace)
+    {
+        return rm_enum_new(Class_ColorspaceType
+            , ID2SYM(rb_intern("Rec601YCbCrColorspace")), INT2FIX(cs));
+    }
+#endif
+
     switch(cs)
     {
         default:
@@ -1043,15 +1094,46 @@ ColorspaceType_new(ColorspaceType cs)
         case sRGBColorspace:
             name = "sRGBColorspace";
             break;
-#if defined(HAVE_HSLCOLORSPACE)
         case HSLColorspace:
             name = "HSLColorspace";
             break;
-#endif
-#if defined(HAVE_HWBCOLORSPACE)
         case HWBColorspace:
             name = "HWBColorspace";
             break;
+#if defined(HAVE_HSBCOLORSPACE)
+        case HSBColorspace:
+            name = "HSBColorspace";
+            break;
+#endif
+#if defined(HAVE_LABCOLORSPACE)
+        case LABColorspace:
+            name = "LABColorspace";
+            break;
+#endif
+#if defined(HAVE_CINEONLOGRGBCOLORSPACE)
+        case CineonLogRGBColorspace:
+            name = "CineonLogRGBColorspace";
+            break;
+#endif
+#if defined(HAVE_REC601LUMACOLORSPACE)
+        case Rec601LumaColorspace:
+            name = "Rec601LumaColorspace";
+            break;
+#endif
+#if defined(HAVE_REC709LUMACOLORSPACE)
+        case Rec709LumaColorspace:
+            name = "Rec709LumaColorspace";
+            break;
+#endif
+#if defined(HAVE_REC709YCBCRCOLORSPACE)
+        case Rec709YCbCrColorspace:
+            name = "Rec709YCbCrColorspace";
+            break;
+#endif
+#if defined(HAVE_LOGCOLORSPACE)
+        case LogColorspace:
+            name = "LogColorspace";
+            break;
 #endif
     }
 
@@ -2426,27 +2508,16 @@ Compliance_name(ComplianceType *c)
         *c = XPMCompliance;
         return "XPMCompliance";
     }
-#if defined(HAVE_NOCOMPLIANCE)
-    else if (*c != NoCompliance)
-    {
-        return "unknown";
-    }
-    else
+    else if (*c == NoCompliance)
     {
         *c = NoCompliance;
         return "NoCompliance";
     }
-#else
-    else if (*c != UnknownCompliance)
-    {
-        return "unknown";
-    }
     else
     {
-        *c = UnknownCompliance;
-        return "UnknownCompliance";
+        *c = UndefinedCompliance;
+        return "UndefinedCompliance";
     }
-#endif
 }
 
 
@@ -2763,9 +2834,9 @@ magick_error_handler(
         sprintf(msg,
 #endif
                      "%s%s%s",
-            GET_MSG(severity, reason),
+            GetLocaleExceptionMessage(severity, reason),
             description ? ": " : "",
-            description ? GET_MSG(severity, description) : "");
+            description ? GetLocaleExceptionMessage(severity, description) : "");
 
 #if defined(HAVE_EXCEPTIONINFO_MODULE)
         {
@@ -2790,9 +2861,9 @@ magick_error_handler(
         sprintf(msg,
 #endif
                      "RMagick: %s%s%s",
-            GET_MSG(severity, reason),
+            GetLocaleExceptionMessage(severity, reason),
             description ? ": " : "",
-            description ? GET_MSG(severity, description) : "");
+            description ? GetLocaleExceptionMessage(severity, description) : "");
         rb_warning(msg);
     }
 }
@@ -2897,7 +2968,7 @@ void rm_handle_all_errors(Image *seq)
                 badboy = image;
             }
         }
-        image = GET_NEXT_IMAGE(image);
+        image = GetNextImageInList(image);
     }
 
     if (badboy)
@@ -2958,14 +3029,6 @@ rm_split(Image *image)
     }
     while (image)
     {
-#if HAVE_REMOVEFIRSTIMAGEFROMLIST
         (void) RemoveFirstImageFromList(&image);
-#else
-        Image *next;
-
-        next = GET_NEXT_IMAGE(image);
-        image->previous = image->next = NULL;
-        image = next;
-#endif
     }
 }