solid fill class

.gitignore

@@ -0,0 +1,21 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

.travis.yml

@@ -0,0 +1,51 @@
+language: ruby
+env:
+  # Currently successful release
+  - IMAGEMAGICK_VERSION=6.6.9-10
+  # Ubuntu's current stable release
+  - IMAGEMAGICK_VERSION=6.7.7-10
+  # Latest 6.7 release
+  - IMAGEMAGICK_VERSION=6.7.9-10
+  # Latest 6.8 release
+  - IMAGEMAGICK_VERSION=6.8.9-6
+  # Try with HDRI support, we don't mind if this fails currently.
+  - IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+before_install:
+  - dpkg --list imagemagick
+  - sudo apt-get remove imagemagick
+  - sudo apt-get install build-essential libx11-dev libxext-dev zlib1g-dev libpng12-dev libjpeg-dev libfreetype6-dev libxml2-dev
+  - sudo apt-get build-dep imagemagick
+  - wget http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.gz
+  - tar -xzvf ImageMagick-${IMAGEMAGICK_VERSION}.tar.gz
+  - cd ImageMagick-${IMAGEMAGICK_VERSION}
+  - ./configure --prefix=/usr $CONFIGURE_OPTIONS
+  - sudo make install
+  - cd ..
+  - sudo ldconfig
+rvm:
+  - 1.9
+  - 2.0
+  - 2.1
+matrix:
+  exclude:
+#    - rvm: 1.9
+#      env: IMAGEMAGICK_VERSION=6.7.7-10
+    - rvm: 1.9
+      env: IMAGEMAGICK_VERSION=6.7.9-10
+#    - rvm: 1.9
+#      env: IMAGEMAGICK_VERSION=6.8.9-6
+    - rvm: 1.9
+      env: IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.7.7-10
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.7.9-10
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.8.9-6
+    - rvm: 2.0
+      env: IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri
+  allow_failures:
+    - env: IMAGEMAGICK_VERSION=6.7.7-10
+    - env: IMAGEMAGICK_VERSION=6.7.9-10
+    #- env: IMAGEMAGICK_VERSION=6.8.9-6
+    - env: IMAGEMAGICK_VERSION=6.8.9-6 CONFIGURE_OPTIONS=--enable-hdri

Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rmagick.gemspec
+gemspec

README.md

@@ -0,0 +1,27 @@
+# RMagick
+
+[![Build Status](https://travis-ci.org/gemhome/rmagick.svg?branch=master)](https://travis-ci.org/gemhome/rmagick)
+
+This is the official fork of RMagick. The decision to create a fork [originated here](https://github.com/rmagick/rmagick/issues/18#issuecomment-50022523), where you can read more about why it happened.
+
+## Installation
+
+Add the following to your `Gemfile`:
+```ruby
+gem 'rmagick'
+```
+
+Then run this:
+```sh
+bundle install
+```
+
+If you don't use a `Gemfile`, install it manually like this:
+```sh
+gem install rmagick
+```
+
+Require RMagick in your project as follows:
+```ruby
+require 'rmagick'
+```

Rakefile

@@ -0,0 +1,55 @@
+# note, there are other, legacy tasks in build_tarball.rake
+# thate currently are run by e.g.
+#   rake -f build_tarball.rake clean release=RMagick_2-13-1
+#   rake -f build_tarball.rake release=RMagick_2-13-1
+require './lib/rmagick/version'
+require 'fileutils'
+desc "build and push gem, tag and push repo"
+task "release" do
+  sh("git diff --exit-code")
+  abort "Git repo not clean" unless $?.success?
+  sh("git diff-index --quiet --cached HEAD")
+  abort "Git repo not commited" unless $?.success?
+  version = Magick::VERSION
+  # e.g. 2.13.3 becomes RMagick_2-13-3
+  version_tag = "RMagick_#{version.gsub(".","-")}"
+  # e.g. 2.13.3 becomes rmagick-2.13.3.gem
+  gem_name = "rmagick-#{version}.gem"
+
+  # build gem
+  sh "gem build -V rmagick.gemspec"
+  if $?.success?
+    base = File.expand_path('..', __FILE__)
+    FileUtils.mkdir_p(File.join(base, 'pkg'))
+    FileUtils.mv(File.join(base, gem_name), 'pkg')
+    # push gem
+    sh "gem push #{File.join(base, 'pkg', gem_name)}"
+    if $?.success?
+      sh "git tag -a -m \"Version #{version}\" #{version_tag}"
+      STDOUT.puts "Tagged #{version_tag}."
+      sh "git push"
+      sh "git push --tags"
+    else
+      abort "tagging abd pushing gem failed"
+    end
+
+  else
+    STDERR.puts "Could not build gem"
+    exit $?.exitstatus
+  end
+end
+
+require 'rake/extensiontask'
+require 'rake/testtask'
+
+Rake::ExtensionTask.new('RMagick2') do |ext|
+  ext.ext_dir = 'ext/RMagick'
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+end
+
+task :test => :compile
+
+task :default => :test

doc/ex/mask.rb

@@ -31,6 +31,6 @@
 
 # Use the #level method to darken the image under the black part of the mask.
 
-img = img.level(0, Magick::MaxRGB, 0.50)
+img = img.level(0, Magick::QuantumRange, 0.50)
 img.write('mask.jpg')
 

examples/identify.rb

@@ -32,7 +32,7 @@ def identify
                 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

ext/RMagick/extconf.rb

@@ -164,7 +164,11 @@ def check_partial_imagemagick_versions()
   `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
 
@@ -197,7 +201,7 @@ def check_partial_imagemagick_versions()
 
 if RUBY_PLATFORM !~ /mswin|mingw/
 
-  unless `Magick-config --libs`[/\bl\s*(MagickCore|Magick)\b/]
+  unless `Magick-config --libs`[/\bl\s*(MagickCore|Magick)6?\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"
@@ -212,10 +216,13 @@ def check_partial_imagemagick_versions()
    "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
@@ -230,12 +237,16 @@ def check_partial_imagemagick_versions()
    "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

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++)

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