rmagick 2.13.2 → 2.13.4

data/doc/rvgtext.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
 
-  <title>RMagick 2.13.2: RVG Reference: RVG::Text Class</title>
+  <title>RMagick 0.0.0: RVG Reference: RVG::Text Class</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -33,7 +33,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="rvgclip.html">Prev</a> | <a href=

data/doc/rvgtspan.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
 
-  <title>RMagick 2.13.2: RVG Reference: RVG::Tspan Class</title>
+  <title>RMagick 0.0.0: RVG Reference: RVG::Tspan Class</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="rvgtext.html">Prev</a> | <a href=

data/doc/rvgtut.html

@@ -9,7 +9,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
 
-  <title>RMagick 2.13.2: RVG Tutorial</title>
+  <title>RMagick 0.0.0: RVG Tutorial</title>
   <meta name="GENERATOR" content="Quanta Plus" />
   <link rel="stylesheet" type="text/css" href="css/doc.css" />
 <style type="text/css">
@@ -23,7 +23,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="constants.html">Prev</a> | <a href=

data/doc/rvguse.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
 
-  <title>RMagick 2.13.2: RVG Reference: RVG::Use Class</title>
+  <title>RMagick 0.0.0: RVG Reference: RVG::Use Class</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="rvgtspan.html">Prev</a> | <a href=

data/doc/rvgxform.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
 
-  <title>RMagick 2.13.2: RVG Reference: Transforms</title>
+  <title>RMagick 0.0.0: RVG Reference: Transforms</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -28,7 +28,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="rvgshape.html">Prev</a> | <a href=

data/doc/struct.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
 
-  <title>RMagick 2.13.2: Miscellaneous classes</title>
+  <title>RMagick 0.0.0: Miscellaneous classes</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="draw.html">Prev</a> | <a href=

data/doc/usage.html

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 7 December 2008), see www.w3.org" />
 
-  <title>RMagick 2.13.2: How to use RMagick</title>
+  <title>RMagick 0.0.0: How to use RMagick</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -90,7 +90,7 @@
 </head>
 
 <body>
-  <h6 id="header">RMagick 2.13.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 0.0.0 User's Guide and Reference</h6>
 
   <div class="nav">
     &laquo;&nbsp;<a href="index.html">Prev</a> | <a href=

data/examples/identify.rb

@@ -32,7 +32,7 @@ module Magick
                 puts "\t\tGray: #{channel_depth(Magick::GrayChannel)}-bits\n"
                 puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
             end
-            scale = Magick::QuantumRange / (Magick::QuantumRange >> (Magick::QuantumDepth-channel_depth))
+            scale = Magick::QuantumRange / (Magick::QuantumRange >> (Magick::MAGICKCORE_QUANTUM_DEPTH-channel_depth))
             puts "\tChannel statistics:\n"
             case color_space
             when Magick::RGBColorspace

data/ext/RMagick/extconf.rb

@@ -1,14 +1,14 @@
 require "mkmf"
 require "date"
 
-RMAGICK_VERS = "2.13.2"
-MIN_RUBY_VERS = "1.8.5"
+require_relative '../../lib/rmagick/version'
+
+RMAGICK_VERS = Magick::VERSION
+MIN_RUBY_VERS = Magick::MIN_RUBY_VERSION
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
-MIN_IM_VERS = "6.4.9"
+MIN_IM_VERS = Magick::MIN_IM_VERSION
 MIN_IM_VERS_NO = MIN_IM_VERS.tr(".","").to_i
 
-
-
 # Test for a specific value in an enum type
 def have_enum_value(enum, value, headers=nil, &b)
   checking_for "#{enum}.#{value}" do
@@ -131,9 +131,17 @@ if RUBY_PLATFORM !~ /mswin|mingw/
     exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details."
   end
 
+  # ugly way to handle which config tool we're going to use...
+  $magick_config = false
+  $pkg_config = false
+
   # Check for Magick-config
-  unless find_executable("Magick-config")
-    exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config in #{ENV['PATH']}\n"
+  if find_executable("Magick-config")
+    $magick_config = true
+  elsif find_executable("pkg-config")
+    $pkg_config = true
+  else
+    exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config or pkg-config in #{ENV['PATH']}\n"
   end
 
   check_multiple_imagemagick_versions()
@@ -141,38 +149,48 @@ if RUBY_PLATFORM !~ /mswin|mingw/
 
   # Ensure minimum ImageMagick version
   unless checking_for("ImageMagick version >= #{MIN_IM_VERS}")  do
-    version = `Magick-config --version`.chomp.tr(".","").to_i
-    version >= MIN_IM_VERS_NO
+    # extract version info from convert binary (could use identify as well)
+    convert_version_string = /^Version: ImageMagick\s+(?<Version>\d+\.\d+\.\d+\-\d+)\s+(?<Unknown>\S+)\s+(?<Arch>\S+)\s+(?<Date>\S+)/
+    match_data = `convert -version`.match(convert_version_string)
+    unless match_data.nil?
+      # taken from previous version, this doesn't look right though
+      # for example 6.8.12 whould show as greater than 6.12.9
+      # is there some property of imagemagick versioning that prevents this situation?
+      version = match_data['Version'].chomp.tr(".","").to_i
+      version >= MIN_IM_VERS_NO
+    end
   end
     exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
   end
 
 
-
-
-  $magick_version = `Magick-config --version`.chomp
-
-  # Ensure ImageMagick is not configured for HDRI
-  unless checking_for("HDRI disabled version of ImageMagick") do
-    not (`Magick-config --version`["HDRI"])
-  end
-    exit_failure "\nCan't install RMagick #{RMAGICK_VERS}."+
-           "\nRMagick does not work when ImageMagick is configured for High Dynamic Range Images."+
-           "\nDon't use the --enable-hdri option when configuring ImageMagick.\n"
+  # either set flags using Magick-config or pkg-config (new Debian default)
+  if $magick_config
+    # Save flags
+    $CFLAGS     = ENV["CFLAGS"].to_s   + " " + `Magick-config --cflags`.chomp
+    $CPPFLAGS   = ENV["CPPFLAGS"].to_s + " " + `Magick-config --cppflags`.chomp
+    $LDFLAGS    = ENV["LDFLAGS"].to_s  + " " + `Magick-config --ldflags`.chomp
+    $LOCAL_LIBS = ENV["LIBS"].to_s     + " " + `Magick-config --libs`.chomp
   end
 
-  # Save flags
-  $CFLAGS     = ENV["CFLAGS"].to_s   + " " + `Magick-config --cflags`.chomp
-  $CPPFLAGS   = ENV["CPPFLAGS"].to_s + " " + `Magick-config --cppflags`.chomp
-  $LDFLAGS    = ENV["LDFLAGS"].to_s  + " " + `Magick-config --ldflags`.chomp
-  $LOCAL_LIBS = ENV["LIBS"].to_s     + " " + `Magick-config --libs`.chomp
+  if $pkg_config
+    # Save flags
+    $CFLAGS     = ENV["CFLAGS"].to_s   + " " + `pkg-config --cflags MagickCore`.chomp
+    $CPPFLAGS   = ENV["CPPFLAGS"].to_s + " " + `pkg-config --cflags MagickCore`.chomp
+    $LDFLAGS    = ENV["LDFLAGS"].to_s  + " " + `pkg-config --libs MagickCore`.chomp
+    $LOCAL_LIBS = ENV["LIBS"].to_s     + " " + `pkg-config --libs MagickCore`.chomp
+  end
 
 elsif RUBY_PLATFORM =~ /mingw/  # mingw
 
   `convert -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-\d+ /
   abort "Unable to get ImageMagick version" unless $1
   $magick_version = $1
-  $LOCAL_LIBS = '-lCORE_RL_magick_ -lX11'
+  if RUBY_PLATFORM =~ /x64/
+    $LOCAL_LIBS = '-lCORE_RL_magick_'
+  else
+    $LOCAL_LIBS = '-lCORE_RL_magick_ -lX11'
+  end
 
 else  # mswin
 
@@ -205,10 +223,13 @@ end
 
 if RUBY_PLATFORM !~ /mswin|mingw/
 
-  unless `Magick-config --libs`[/\bl\s*(MagickCore|Magick)\b/]
-    exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
-           "Can't find the ImageMagick library or one of the dependent libraries. " +
-           "Check the mkmf.log file for more detailed information.\n"
+  # check for pkg-config if Magick-config doesn't exist
+  if $magick_config && `Magick-config --libs`[/\bl\s*(MagickCore|Magick)6?\b/]
+  elsif $pkg_config && `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
+  else
+      exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
+             "Can't find the ImageMagick library or one of the dependent libraries. " +
+             "Check the mkmf.log file for more detailed information.\n"
   end
 end
 
@@ -220,15 +241,19 @@ have_func("snprintf", headers)
    "AutoGammaImageChannel",          # 6.5.5-1
    "AutoLevelImageChannel",          # 6.5.5-1
    "BlueShiftImage",                 # 6.5.4-3
+   "ColorMatrixImage",               # 6.6.1-0
    "ConstituteComponentTerminus",    # 6.5.7-9
    "DeskewImage",                    # 6.4.2-5
+   "DestroyConstitute",              # 6.5.7-9(deprecated)
    "EncipherImage",                  # 6.3.8-6
    "EqualizeImageChannel",           # 6.3.6-9
+   "EvaluateImages",                 # 6.8.6-4
    "FloodfillPaintImage",            # 6.3.7
    "FunctionImageChannel",           # 6.4.8-8
    "GetAuthenticIndexQueue",         # 6.4.5-6
    "GetAuthenticPixels",             # 6.4.5-6
    "GetImageAlphaChannel",           # 6.3.9-2
+   "GetMagickFeatures",              # 6.5.7-1
    "GetVirtualPixels",               # 6.4.5-6
    "LevelImageColors",               # 6.4.2
    "LevelColorsImageChannel",        # 6.5.6-4
@@ -238,12 +263,16 @@ have_func("snprintf", headers)
    "OpaquePaintImageChannel",        # 6.3.7-10
    "QueueAuthenticPixels",           # 6.4.5-6
    "RemapImage",                     # 6.4.4-0
+   "RemapImages",                    # 6.4.4-0
    "RemoveImageArtifact",            # 6.3.6
+   "RotationalBlurImage",            # 6.8.8-9
+   "RotationalBlurImageChannel",     # 6.8.8-9
    "SelectiveBlurImageChannel",      # 6.5.0-3
    "SetImageAlphaChannel",           # 6.3.6-9
    "SetImageArtifact",               # 6.3.6
    "SetMagickMemoryMethods",         # 6.4.1
    "SparseColorImage",               # 6.3.6-?
+   "StatisticImage",                 # 6.6.8-6
    "SyncAuthenticPixels",            # 6.4.5-6
    "TransformImageColorspace",       # 6.5.1
    "TransparentPaintImage",          # 6.3.7-10

data/ext/RMagick/rmagick.c

@@ -33,15 +33,15 @@ VALUE
 Magick_colors(VALUE class)
 {
     const ColorInfo **color_info_list;
-    unsigned long number_colors, x;
+    size_t number_colors, x;
     volatile VALUE ary;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
-    GetExceptionInfo(&exception);
+    exception = AcquireExceptionInfo();
 
-    color_info_list = GetColorInfoList("*", &number_colors, &exception);
+    color_info_list = GetColorInfoList("*", &number_colors, exception);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
 
     if (rb_block_given_p())
@@ -82,14 +82,14 @@ VALUE
 Magick_fonts(VALUE class)
 {
     const TypeInfo **type_info;
-    unsigned long number_types, x;
+    size_t number_types, x;
     volatile VALUE ary;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
-    GetExceptionInfo(&exception);
-    type_info = GetTypeInfoList("*", &number_types, &exception);
+    exception = AcquireExceptionInfo();
+    type_info = GetTypeInfoList("*", &number_types, exception);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
     if (rb_block_given_p())
     {
@@ -166,18 +166,18 @@ VALUE
 Magick_init_formats(VALUE class)
 {
     const MagickInfo **magick_info;
-    unsigned long number_formats, x;
+    size_t number_formats, x;
     volatile VALUE formats;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     class = class;      // defeat "never referenced" message from icc
     formats = rb_hash_new();
 
     // IM 6.1.3 added an exception argument to GetMagickInfoList
-    GetExceptionInfo(&exception);
-    magick_info = GetMagickInfoList("*", &number_formats, &exception);
+    exception = AcquireExceptionInfo();
+    magick_info = GetMagickInfoList("*", &number_formats, exception);
     CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(exception);
 
 
     for (x = 0; x < number_formats; x++)

data/ext/RMagick/rmagick.h

@@ -68,17 +68,17 @@
 
 
 // Handle Quantum <-> Ruby Numeric object conversion
-#if (QuantumDepth == 8 || QuantumDepth == 16)
+#if (MAGICKCORE_QUANTUM_DEPTH == 8 || MAGICKCORE_QUANTUM_DEPTH == 16)
 #define QUANTUM2NUM(q) INT2FIX((q)) /**< Quantum -> Ruby Numeric conversion */
 #define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quantum <- Ruby Numeric conversion */
-#elif (QuantumDepth == 32)
+#elif (MAGICKCORE_QUANTUM_DEPTH == 32)
 #define QUANTUM2NUM(q) UINT2NUM((q)) /**< Quantum -> Ruby Numeric conversion */
 #define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quntum <- Ruby Numeric conversion */
-#elif (QuantumDepth == 64)
+#elif (MAGICKCORE_QUANTUM_DEPTH == 64)
 #define QUANTUM2NUM(q) ULL2NUM((q)) /**< Quantum -> Ruby Numeric conversion */
 #define NUM2QUANTUM(n) (Quantum)NUM2ULL((n)) /**< Quntum <- Ruby Numeric conversion */
 #else
-#error Specified QuantumDepth is not supported.
+#error Specified MAGICKCORE_QUANTUM_DEPTH is not supported.
 #endif
 //! Convert user-supplied objects to Quantum
 #define APP2QUANTUM(n) rm_app2quantum((n))
@@ -457,7 +457,7 @@ EXTERN ID rm_ID_y;                 /**< "y" */
    Handle warnings & errors
 */
 //! Handle warnings & errors
-#define CHECK_EXCEPTION() rm_check_exception(&exception, NULL, RetainOnError);
+#define CHECK_EXCEPTION() rm_check_exception(exception, NULL, RetainOnError);
 
 
 /*
@@ -634,9 +634,9 @@ Pixel_##_cmyk_channel_(VALUE self) \
 #define END_ENUM }
 
 //!  Define a Magick module constant
-#if QuantumDepth == 64
+#if MAGICKCORE_QUANTUM_DEPTH == 64
 #define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, ULL2NUM(constant))
-#else   // QuantumDepth == 8, 16, 32
+#else   // MAGICKCORE_QUANTUM_DEPTH == 8, 16, 32
 #define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, UINT2NUM(constant))
 #endif
 
@@ -1075,6 +1075,8 @@ extern VALUE Image_read_inline(VALUE, VALUE);
 extern VALUE Image_recolor(VALUE, VALUE);
 extern VALUE Image_reduce_noise(VALUE, VALUE);
 extern VALUE Image_remap(int, VALUE *, VALUE);
+extern VALUE Image_resample(int, VALUE *, VALUE);
+extern VALUE Image_resample_bang(int, VALUE *, VALUE);
 extern VALUE Image_resize(int, VALUE *, VALUE);
 extern VALUE Image_resize_bang(int, VALUE *, VALUE);
 extern VALUE Image_roll(VALUE, VALUE, VALUE);

data/ext/RMagick/rmdraw.c

@@ -501,16 +501,16 @@ image_to_str(Image *image)
     unsigned char *blob;
     size_t length;
     Info *info;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     if (image)
     {
         info = CloneImageInfo(NULL);
-        GetExceptionInfo(&exception);
-        blob = ImageToBlob(info, image, &length, &exception);
+        exception = AcquireExceptionInfo();
+        blob = ImageToBlob(info, image, &length, exception);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
-        DestroyExceptionInfo(&exception);
+        DestroyExceptionInfo(exception);
         dimg = rb_str_new((char *)blob, (long)length);
         magick_free((void*)blob);
     }
@@ -536,16 +536,16 @@ Image *str_to_image(VALUE str)
 {
     Image *image = NULL;
     Info *info;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     if (str != Qnil)
     {
         info = CloneImageInfo(NULL);
-        GetExceptionInfo(&exception);
-        image = BlobToImage(info, RSTRING_PTR(str), RSTRING_LEN(str), &exception);
+        exception = AcquireExceptionInfo();
+        image = BlobToImage(info, RSTRING_PTR(str), RSTRING_LEN(str), exception);
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
-        DestroyExceptionInfo(&exception);
+        DestroyExceptionInfo(exception);
     }
 
     return image;
@@ -1776,15 +1776,15 @@ VALUE
 PolaroidOptions_initialize(VALUE self)
 {
     Draw *draw;
-    ExceptionInfo exception;
+    ExceptionInfo *exception;
 
     // Default shadow color
     Data_Get_Struct(self, Draw, draw);
 
-    GetExceptionInfo(&exception);
-    (void) QueryColorDatabase("gray75", &draw->shadow_color, &exception);
+    exception = AcquireExceptionInfo();
+    (void) QueryColorDatabase("gray75", &draw->shadow_color, exception);
     CHECK_EXCEPTION()
-    (void) QueryColorDatabase("#dfdfdf", &draw->info->border_color, &exception);
+    (void) QueryColorDatabase("#dfdfdf", &draw->info->border_color, exception);
 
     if (rb_block_given_p())
     {

data/ext/RMagick/rmenum.c

@@ -408,8 +408,8 @@ ColorspaceType_new(ColorspaceType cs)
         case HSBColorspace:
             name = "HSBColorspace";
             break;
-        case LABColorspace:
-            name = "LABColorspace";
+        case LabColorspace:
+            name = "LabColorspace";
             break;
         case Rec601YCbCrColorspace:
             name = "Rec601YCbCrColorspace";