rmagick 3.0.0 → 3.1.0

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 cache:
   directories:
     - ~/.ccache
+    - vendor/bundle
+    - build-ImageMagick
 
 os:
   - linux
@@ -10,17 +12,28 @@ os:
 sudo: required
 
 env:
+  - IMAGEMAGICK_VERSION=6.7.7-10
+  - IMAGEMAGICK_VERSION=6.7.7-10 CONFIGURE_OPTIONS=--enable-hdri
   - IMAGEMAGICK_VERSION=6.8.9-10
   - IMAGEMAGICK_VERSION=6.8.9-10 CONFIGURE_OPTIONS=--enable-hdri
+  - IMAGEMAGICK_VERSION=6.9.10-40
+  - IMAGEMAGICK_VERSION=6.9.10-40 CONFIGURE_OPTIONS=--enable-hdri
 
 before_install:
   - source before_install_$TRAVIS_OS_NAME.sh
 
-install: bundle install --verbose
+install: bundle install --path=vendor/bundle --verbose
 
 rvm:
   - 2.3
   - 2.4
+  - 2.5
+  - 2.6
+
+matrix:
+  include:
+    - rvm: 2.3
+      env: STYLE_CHECKS=true IMAGEMAGICK_VERSION=6.8.9-10
 
 notifications:
   webhooks:

data/CHANGELOG.md

@@ -3,6 +3,61 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 3.1.0
+
+Deprecations: (To be removed in RMagick 4.0)
+
+- Support for Ruby 2.3
+- `KernelInfo#zero_nans` (#531) (no replacement)
+- `KernelInfo#show` (#532) (no replacement)
+- `ImageList#fx` (#529) (use `Image#fx` instead)
+- `Image#alpha=` (#530) (use `Image#alpha` instead)
+- `Image#mask=` (#530) (use `Image#mask` instead)
+- `Image#matte` (#530) (use `Image#alpha` instead)
+- `Image#matte=` (#530) (use `Image#alpha` instead)
+
+Enhancements:
+
+- Support ruby-mswin environment on Windows (#425)
+- Add test for supporting webp format (#406)
+- Add explicit Ruby 2.5 support (#339)
+- Add explicit Ruby 2.6 support (#467)
+- Restore support for ImageMagick 6.7 (#475)
+- Add explicit ImageMagick 6.9 support (#340)
+- Work towards ImageMagick 7.0 support (#470) (#487) (#489) (#492) (#494)
+- Improve error messaging (#480) (#517)
+- Add TimeResource support (#402)
+- Add Image#fx method (#529)
+
+Bug Fixes:
+
+- Many, many memory leaks fixed
+  (#362) (#361) (#360) (#359) (#358) (#357) (#367) (#370) (#364) (#372) (#373)
+  (#374) (#375) (#376) (#385) (#384) (#383) (#382) (#381) (#380) (#379) (#378)
+  (#377) (#391) (#390) (#389) (#396) (#401) (#409) (#419) (#417) (#416) (#415)
+  (#414) (#413) (#412) (#411) (#410) (#418) (#454) (#453) (#452) (#451) (#450)
+  (#461) (#460) (#459) (#563)
+- Fix SEGV in ImageList methods with invalid image list (#356)
+- Fix SEGV in Image#recolor (#387)
+- Fix SEGV in Image#profile! (#400)
+- Fix build error on Homebrew environment (#426)
+- Fix Image#quantize and ImageList#quantize could not make dither false (#458)
+- Replace obsoleted $defout to $stdout (#463)
+- Avoid SEGV in monitor feature for Ruby 2.5+ (#462)
+- Fix SEGV in Image#write with CMYKColorspace (#465)
+- Avoid problems related to GC in monitor feature (#468)
+- Get rid of compiler warnings (#484) (#491) (#500)
+- Fix rmfill leaks (#528)
+- Removed automatic allocation of the ImageInfo that is broken. (#547)
+- Fix color histogram (#540)
+- Fix Image#iptc_profile does not work with ImageMagick 6.7 (#558)
+
+Code Quality:
+
+- Many tests written
+- CI improvements
+- Other refactors
+
 ## RMagick 3.0.0
 
 Breaking Changes:

data/CONTRIBUTING.md

@@ -48,30 +48,23 @@ Useful information about RSpec:
 Committing
 ----------
 
-All work for a next release is done in the `develop` branch. Please create your branch off of it.
-
 It is better if you follow [Git Style Guide](https://github.com/agis-/git-style-guide).
 
 
 Pull Requests
 -------------
 
-Please choose the `rmagick/rmagick` repo and the `develop` branch as the destination for your pull request.
-
-NOTE: GitHub suggests `rmagick-temp/rmagick` repo by default. **This is incorrect.** Please switch to `rmagick/rmagick`. It should be the next repo in the drop-down list.
-
-Every pull request is tested:
-
-1. On [Travis CI](https://travis-ci.org/rmagick/rmagick).
-   It runs all Minitest and RSpec tests on several Ruby and ImageMagick versions.
-   See [.travis.yml](.travis.yml) for details.
-2. On [Semaphore CI](https://semaphoreci.com/rmagick/rmagick).
-   It runs [RuboCop](https://rubocop.readthedocs.io).
-   RuboCop is run on a different CI server and appears as a different check on pull request pages because this way it is easier to spot what kind of tests are failed.
-
-An ideal pull request does not fail these tests.
-If your pull request fails these tests, please improve it and push the improvements until it doesn't.
-You can ignore failures that are not caused by your changes.
+Please choose the `rmagick/rmagick` repo as the destination for your pull
+request. GitHub may suggest `rmagick-temp/rmagick` repo by default. **This is
+incorrect.** Please switch to `rmagick/rmagick`. It should be the next repo in
+the drop-down list.
+
+Every pull request is tested on [Travis
+CI](https://travis-ci.org/rmagick/rmagick) to cover Linux builds,
+[Appveyor](https://ci.appveyor.com/project/mockdeep/rmagick) for Windows
+builds, and [CircleCI](https://circleci.com/gh/rmagick/rmagick) for another
+Linux environment and console access for debugging builds.  It runs all
+Minitest and RSpec tests on several Ruby and ImageMagick versions.
 
 A quick way to fix formatting errors is to run `bundle exec rubocop --autocorrect path/to/file.rb`.
 

data/README.textile

@@ -1,6 +1,6 @@
 h1. RMagick
 
-!https://img.shields.io/gem/v/rmagick.svg?style=flat(RubyGems)!:http://rubygems.org/gems/rmagick !https://img.shields.io/gem/dt/rmagick.svg?style=flat! !https://www.versioneye.com/ruby/rmagick/reference_badge.svg?style=flat(VersionEye)!:https://www.versioneye.com/ruby/rmagick/references !https://img.shields.io/travis/rmagick/rmagick/master.svg?style=flat(Travis CI)!:https://travis-ci.org/rmagick/rmagick !https://img.shields.io/codeclimate/github/rmagick/rmagick.svg?style=flat(Code Climate)!:https://codeclimate.com/github/rmagick/rmagick !https://badges.gitter.im/Join%20Chat.svg(Gitter)!:https://gitter.im/rmagick/rmagick?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+!https://img.shields.io/gem/v/rmagick.svg?style=flat!:http://rubygems.org/gems/rmagick !https://travis-ci.org/rmagick/rmagick.svg?branch=master!:https://travis-ci.org/rmagick/rmagick !https://ci.appveyor.com/api/projects/status/xw3usp6s1ghfimb4/branch/master?svg=true!:https://ci.appveyor.com/project/mockdeep/rmagick !https://circleci.com/gh/rmagick/rmagick.svg?style=svg!:https://circleci.com/gh/rmagick/rmagick
 
 h3. Table of Contents
 
@@ -32,7 +32,7 @@ These prerequisites are required for the latest DEVELOPMENT version of RMagick.
 
 Ruby must be able to build C-Extensions (e.g. MRI, Rubinius, not JRuby)
 
-*ImageMagick* Version 6.4.9 or later (6.x.x). Version 7 is NOT yet supported; ETA April 2019 ( https://github.com/rmagick/rmagick/pull/299 ). You can get ImageMagick from "www.imagemagick.org":http://www.imagemagick.org.
+*ImageMagick* Version 6.7.7 or later (6.x.x). Version 7 is NOT yet supported; ETA Summer 2019 (https://github.com/rmagick/rmagick/issues/256). You can get ImageMagick from "www.imagemagick.org":http://www.imagemagick.org.
 
 On Ubuntu, you can run:
 

data/Rakefile

@@ -190,7 +190,7 @@ task spec: :compile
 if ENV['STYLE_CHECKS']
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-  task default: %i[spec test rubocop]
+  task default: %i[rubocop]
 else
   task default: %i[spec test]
 end

data/before_install_linux.sh

@@ -1,3 +1,5 @@
+set -euox pipefail
+
 sudo apt-get update
 
 # remove all existing imagemagick related packages
@@ -6,24 +8,59 @@ sudo apt-get autoremove -y imagemagick* libmagick* --purge
 # install build tools, ImageMagick delegates
 sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev \
   liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev libxml2-dev \
-  libtiff5-dev vim ghostscript ccache
-
-case $IMAGEMAGICK_VERSION in
-    latest)
-        wget http://www.imagemagick.org/download/ImageMagick.tar.xz
-        tar -xf ImageMagick.tar.xz
-        cd ImageMagick-*
-    ;;
-    *)
-        wget http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
-        tar -xf ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
-        cd ImageMagick-${IMAGEMAGICK_VERSION}
-    ;;
-esac
-CC="ccache cc" CXX="ccache c++" ./configure --prefix=/usr $CONFIGURE_OPTIONS
-make
-sudo make install
-cd ..
+  libtiff5-dev libwebp-dev vim ghostscript ccache
+
+if [ ! -v IMAGEMAGICK_VERSION ]; then
+  echo "you must specify an ImageMagick version."
+  echo "example: 'IMAGEMAGICK_VERSION=6.8.9-10 bash ./before_install_linux.sh'"
+  exit 1
+fi
+
+if [ ! -d /usr/include/freetype ]; then
+  # If `/usr/include/freetype` is not existed, ImageMagick 6.7 configuration fails about Freetype.
+  sudo ln -sf /usr/include/freetype2 /usr/include/freetype
+fi
+
+project_dir=`pwd`
+build_dir=${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}
+if [ -v CONFIGURE_OPTIONS ]; then
+  build_dir=${build_dir}-${CONFIGURE_OPTIONS}
+fi
+
+build_imagemagick() {
+  mkdir -p build-ImageMagick
+
+  version=(${IMAGEMAGICK_VERSION//./ })
+  if (( "${version[0]}${version[1]}" >= 69 )); then
+    wget https://github.com/ImageMagick/ImageMagick6/archive/${IMAGEMAGICK_VERSION}.tar.gz
+    tar -xf ${IMAGEMAGICK_VERSION}.tar.gz
+    mv ImageMagick6-${IMAGEMAGICK_VERSION} $build_dir
+  else
+    wget https://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
+    tar -xf ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
+    mv ImageMagick-${IMAGEMAGICK_VERSION} $build_dir
+  fi
+
+  options="--with-magick-plus-plus=no --disable-docs"
+  if [ -v CONFIGURE_OPTIONS ]; then
+    options="${CONFIGURE_OPTIONS} $options"
+  fi
+
+  cd $build_dir
+  CC="ccache cc" CXX="ccache c++" ./configure --prefix=/usr $options
+  make -j
+}
+
+if [ ! -d $build_dir ]; then
+  build_imagemagick
+fi
+
+cd $build_dir
+sudo make install -j
+cd $project_dir
+
 sudo ldconfig
 
-gem install bundler -v 1.17.3
+gem install bundler
+
+set +ux

data/doc/ex/sparse_color.rb

@@ -36,6 +36,11 @@ begin
   img2['Label'] = 'Barycentric'
   imgl << draw_centers(img2, false)
 
+  img2 = img.sparse_color(Magick::InverseColorInterpolate, 30, 10, 'red',
+                          10, 80, 'blue', 70, 60, 'lime')
+  img2['Label'] = 'Barycentric'
+  imgl << draw_centers(img2, false)
+
   montage = imgl.montage do
     self.background_color = 'none'
     self.geometry = '100x100+10+10'

data/doc/magick.html

@@ -352,9 +352,9 @@ p Magick.formats »
       <dt>resource_type</dt>
 
       <dd>One of the symbols <code>:area</code>,
-      <code>:disk</code>, <code>:file</code>, <code>:map</code>, or
-      <code>:memory</code>. You may use a string instead of a
-      symbol.</dd>
+      <code>:disk</code>, <code>:file</code>, <code>:map</code>,
+      <code>:memory</code>, or <code>:time</code>. You may use a
+      string instead of a symbol.</dd>
 
       <dt>limit</dt>
 
@@ -367,7 +367,8 @@ p Magick.formats &raquo;
       the <span class="arg">resource_type</span> is
       <code>:area</code> the limit is the maximum width * height of
       an image in pixels that can reside in pixel cache memory. If
-      this argument is omitted the limit is not changed.</dd>
+      <code>:time</code>, the limit is measured in seconds. If this
+      argument is omitted the limit is not changed.</dd>
     </dl>
 
     <h4>Returns</h4>
@@ -378,6 +379,10 @@ p Magick.formats &raquo;
     <h4>Notes</h4>
 
     <p>This method supercedes <code>set_cache_threshold</code>.</p>
+
+    <p>Setting the <code>:time</code> limit resets the elapsed time
+    to zero in the pixel cache. Call it before any operation that
+    you need to set a time limit on.</p>
   </div>
 
   <div class="sig">

data/doc/rvg.html

@@ -893,7 +893,7 @@ canvas.background_position = :scaled
   <div style="margin-left: 235px; margin-top:1em">
     <p>RVG supports a subset of the unit identifiers defined by the
     SVG specification. In RVG, unit identifiers are methods in the
-    Float and Fixnum classes. The units are (for the most part)
+    Float and Integer classes. The units are (for the most part)
     defined in terms of "dots per inch," accordingly, the unit
     identifier methods are added only if the value</p>
     <pre>
@@ -911,7 +911,7 @@ canvas.background_position = :scaled
 </pre>
 
     <p>If the dpi is defined, the following methods are added to
-    <code>Float</code> and <code>Fixnum</code></p>
+    <code>Float</code> and <code>Integer</code></p>
 
     <dl>
       <dt>px</dt>

data/doc/rvgtut.html

@@ -140,7 +140,7 @@
 
   <p><code>RVG::dpi</code> enables the use of <em>unit methods</em>
   in RVG. When you set <code>RVG::dpi</code> to a non-nil value,
-  RVG adds a number of conversion methods to the Fixnum and Float
+  RVG adds a number of conversion methods to the Integer and Float
   classes . These methods allow you to specify measurements in
   units such as inches, millimeters, and centimeters. <em>DPI</em>
   stands for "dots per inch," the image resolution. Here I set

data/examples/histogram.rb

@@ -290,7 +290,7 @@ image = image.first
 
 # Give the user something to look at while we're working.
 name = File.basename(filename).sub(/\..*?$/, '')
-$defout.sync = true
+$stdout.sync = true
 printf "Creating #{name}_Histogram.miff"
 
 timer = Thread.new do

data/ext/RMagick/extconf.rb

@@ -14,16 +14,26 @@ module RMagick
     attr_reader :headers
 
     def initialize
+      @stdout = $stdout.dup
+
+      setup_paths_for_homebrew
       configure_compile_options
       assert_can_compile!
       configure_headers
     end
 
+    def setup_paths_for_homebrew
+      return unless find_executable('brew')
+
+      brew_pkg_config_path = "#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig"
+      pkgconfig_paths = ENV['PKG_CONFIG_PATH'].to_s.split(':')
+      if File.exist?(brew_pkg_config_path) && !pkgconfig_paths.include?(brew_pkg_config_path)
+        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], brew_pkg_config_path].compact.join(':')
+      end
+    end
+
     def configured_compile_options
       {
-        magick_config: $magick_config,
-        with_magick_wand: $with_magick_wand,
-        pkg_config: $pkg_config,
         magick_version: $magick_version,
         local_libs: $LOCAL_LIBS,
         cflags: $CFLAGS,
@@ -35,15 +45,13 @@ module RMagick
     end
 
     def configure_headers
-      # headers = %w{assert.h ctype.h errno.h float.h limits.h math.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h time.h}
       @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h]
-      headers << 'stdint.h' if have_header('stdint.h') # defines uint64_t
       headers << 'sys/types.h' if have_header('sys/types.h')
 
-      if have_header('wand/MagickWand.h')
-        headers << 'wand/MagickWand.h'
+      if have_header('magick/MagickCore.h')
+        headers << 'magick/MagickCore.h'
       else
-        exit_failure "\nCan't install RMagick #{RMAGICK_VERS}. Can't find MagickWand.h."
+        exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find magick/MagickCore.h."
       end
     end
 
@@ -56,21 +64,9 @@ module RMagick
         cc = (ENV['CC'] || config::CONFIG['CC'] || 'gcc').split(' ').first
         exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cc)
 
-        # ugly way to handle which config tool we're going to use...
-        $with_magick_wand = false
-        $magick_config = false
-        $pkg_config = false
-
-        # Check for Magick-config
-        if find_executable('Magick-config') && !has_graphicsmagick_libmagick_dev_compat?
-          $magick_config = true
-          $magick_version = `Magick-config --version`[/^(\d+\.\d+\.\d+)/]
-        elsif find_executable('pkg-config')
-          $pkg_config = true
-          $magick_version = `pkg-config MagickCore --modversion`[/^(\d+\.\d+\.\d+)/]
-        else
-          exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config or pkg-config in #{ENV['PATH']}\n"
-        end
+        magick_package = determine_imagemagick_package
+
+        $magick_version = `pkg-config #{magick_package} --modversion`[/^(\d+\.\d+\.\d+)/]
 
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
@@ -83,51 +79,11 @@ module RMagick
           exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n" if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
         end
 
-        # From ImageMagick 6.9 binaries are split to two and we have to use
-        # MagickWand instead of MagickCore
-        checking_for("presence of MagickWand API (ImageMagick version >= #{Magick::MIN_WAND_VERSION})") do
-          $with_magick_wand = Gem::Version.new($magick_version) >= Gem::Version.new(Magick::MIN_WAND_VERSION)
-          if $with_magick_wand
-            Logging.message('Detected 6.9+ version, using MagickWand API')
-          else
-            Logging.message('Older version detected, using MagickCore API')
-          end
-        end
-
-        # either set flags using Magick-config, MagickWand-config or pkg-config (new Debian default)
-        if $with_magick_wand
-          if $magick_config
-            # Save flags
-            $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `MagickWand-config --cflags`.chomp
-            $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `MagickWand-config --cppflags`.chomp
-            $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `MagickWand-config --ldflags`.chomp
-            $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `MagickWand-config --libs`.chomp
-          end
-
-          if $pkg_config
-            # Save flags
-            $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp
-            $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp
-            $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickWand`.chomp
-            $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickWand`.chomp
-          end
-        else
-          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
-
-          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
-        end
+        # Save flags
+        $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags #{magick_package}`.chomp
+        $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags #{magick_package}`.chomp
+        $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs #{magick_package}`.chomp
+        $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs #{magick_package}`.chomp
 
         set_archflags_for_osx if RUBY_PLATFORM =~ /darwin/ # osx
 
@@ -136,7 +92,12 @@ module RMagick
         `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
         $magick_version = Regexp.last_match(1)
-        search_paths_for_library_for_mingw unless have_library('CORE_RL_magick_')
+
+        dir_paths = search_paths_for_library_for_windows
+        $CPPFLAGS = %(-I"#{dir_paths[:include]}")
+        $LDFLAGS = %(-L"#{dir_paths[:lib]}")
+
+        have_library('CORE_RL_magick_')
         have_library('X11')
 
       else # mswin
@@ -144,10 +105,11 @@ module RMagick
         `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
         $magick_version = Regexp.last_match(1)
-        $CFLAGS = '-W3'
-        $CPPFLAGS = %(-I"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include" -I"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\include")
-        # The /link option is required by the Makefile but causes warnings in the mkmf.log file.
-        $LDFLAGS = %(/link /LIBPATH:"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib" /LIBPATH:"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\lib" /LIBPATH:"C:\\ruby\\lib")
+
+        dir_paths = search_paths_for_library_for_windows
+        $CPPFLAGS << %( -I"#{dir_paths[:include]}")
+        $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
+
         $LOCAL_LIBS = 'CORE_RL_magick_.lib'
         have_library('X11')
 
@@ -178,26 +140,49 @@ SRC
       end
     end
 
-    def has_graphicsmagick_libmagick_dev_compat?
-      config_path = `which Magick-config`.chomp
-      if File.exist?(config_path) &&
-         File.symlink?(config_path) &&
-         File.readlink(config_path) =~ /GraphicsMagick/
-        msg = 'Found a graphicsmagick-libmagick-dev-compat installation.'
-        Logging.message msg
-        message msg + "\n"
-        true
+    def exit_failure(msg)
+      msg = "ERROR: #{msg}"
+
+      Logging.message msg
+
+      @stdout.puts "\n\n"
+      if ENV['NO_COLOR']
+        @stdout.puts msg
       else
-        false
+        @stdout.print "\e[31m\e[1m#{msg}\e[0m"
       end
-    end
+      @stdout.puts "\n\n"
+      @stdout.flush
 
-    def exit_failure(msg)
-      Logging.message msg
-      message msg + "\n"
       exit(1)
     end
 
+    def determine_imagemagick_package
+      unless find_executable('pkg-config')
+        exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find pkg-config in #{ENV['PATH']}\n"
+      end
+
+      packages = `pkg-config --list-all`.scan(/(ImageMagick\-6[\.A-Z0-9]+) .*/).flatten
+
+      # For ancient version of ImageMagick 6 we need a different regex
+      if packages.empty?
+        packages = `pkg-config --list-all`.scan(/(ImageMagick) .*/).flatten
+      end
+
+      if packages.empty?
+        exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
+      end
+
+      if packages.length > 1
+        package_lines = packages.map { |package| " - #{package}" }.join("\n")
+        msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n#{package_lines}\n\n"
+        Logging.message msg
+        message msg
+      end
+
+      packages.first
+    end
+
     # Seems like lots of people have multiple versions of ImageMagick installed.
     def check_multiple_imagemagick_versions
       versions = []
@@ -260,12 +245,13 @@ SRC
       $ARCH_FLAG = archflags.join(' ') unless archflags.empty?
     end
 
-    def search_paths_for_library_for_mingw
+    def search_paths_for_library_for_windows
       msg = 'searching PATH for the ImageMagick library...'
       Logging.message msg
       message msg + "\n"
 
       found_lib = false
+      dir_paths = {}
 
       paths = ENV['PATH'].split(File::PATH_SEPARATOR)
       paths.each do |dir|
@@ -273,13 +259,14 @@ SRC
         lib_file = File.join(lib, 'CORE_RL_magick_.lib')
         next unless File.exist?(lib_file)
 
-        $CPPFLAGS = %(-I"#{File.join(dir, 'include')}")
-        $LDFLAGS = %(-L"#{lib}")
-        found_lib = have_library('CORE_RL_magick_')
-        break if found_lib
+        dir_paths[:include] = File.join(dir, 'include')
+        dir_paths[:lib] = lib
+
+        found_lib = true
+        break
       end
 
-      return if found_lib
+      return dir_paths if found_lib
 
       exit_failure <<END_MINGW
 Can't install RMagick #{RMAGICK_VERS}.
@@ -292,25 +279,10 @@ END_MINGW
     end
 
     def assert_can_compile!
-      assert_not_windows!
       assert_minimum_ruby_version!
       assert_has_dev_libs!
     end
 
-    def assert_not_windows!
-      return unless RUBY_PLATFORM =~ /mswin/
-
-      abort <<END_MSWIN
-+----------------------------------------------------------------------------+
-| This rmagick gem is for use only on Linux, BSD, OS X, and similar systems  |
-| that have a gnu or similar toolchain installed. The rmagick-win32 gem is a |
-| pre-compiled version of RMagick bundled with ImageMagick for use on        |
-| Microsoft Windows systems. The rmagick-win32 gem is available on RubyForge.|
-| See http://rmagick.rubyforge.org/install-faq.html for more information.    |
-+----------------------------------------------------------------------------+
-END_MSWIN
-    end
-
     def assert_minimum_ruby_version!
       unless checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
         version = RUBY_VERSION.tr('.', '').to_i
@@ -323,10 +295,7 @@ END_MSWIN
     def assert_has_dev_libs!
       return unless RUBY_PLATFORM !~ /mswin|mingw/
 
-      # 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
+      unless `pkg-config --libs MagickCore`[/\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"
@@ -335,164 +304,21 @@ END_MSWIN
 
     def create_header_file
       have_func('snprintf', headers)
-      ['AcquireImage', # 6.4.1
-       'AffinityImage', # 6.4.3-6
-       'AffinityImages', # 6.4.3-6
-       '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
-       'GetImageChannelEntropy', # 6.9.0-0
-       'GetMagickFeatures', # 6.5.7-1
-       'GetVirtualPixels', # 6.4.5-6
-       'LevelImageColors', # 6.4.2
-       'LevelColorsImageChannel', # 6.5.6-4
-       'LevelizeImageChannel', # 6.4.2
-       'LiquidRescaleImage', # 6.3.8-2
-       'MagickLibAddendum', # 6.5.9-1
-       '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
-       'TransparentPaintImageChroma' # 6.4.5-6
+      [
+        'GetImageChannelEntropy', # 6.9.0-0
+        'SetImageGray' # 6.9.1-10
       ].each do |func|
         have_func(func, headers)
       end
 
-      checking_for('QueryMagickColorname() new signature') do
-        if try_compile(<<"SRC")
-#{COMMON_HEADERS}
-        #{cpp_include(headers)}
-/*top*/
-int main() {
-  MagickBooleanType okay;
-  Image *image;
-  MagickPixelPacket *color;
-  char *name;
-  ExceptionInfo *exception;
-  okay = QueryMagickColorname(image, color, SVGCompliance, name, exception);
-  return 0;
-  }
-SRC
-          $defs.push('-DHAVE_NEW_QUERYMAGICKCOLORNAME')
-          true
-        else
-          false
-        end
-      end
-
-      have_struct_member('Image', 'type', headers) # ???
-      have_struct_member('DrawInfo', 'kerning', headers) # 6.4.7-8
-      have_struct_member('DrawInfo', 'interline_spacing', headers) # 6.5.5-8
-      have_struct_member('DrawInfo', 'interword_spacing', headers) # 6.4.8-0
-      have_type('DitherMethod', headers) # 6.4.2
-      have_type('MagickFunction', headers) # 6.4.8-8
-      have_type('ImageLayerMethod', headers) # 6.3.6 replaces MagickLayerMethod
-      have_type('long double', headers)
-      # have_type("unsigned long long", headers)
-      # have_type("uint64_t", headers)
-      # have_type("__int64", headers)
-      # have_type("uintmax_t", headers)
-      # check_sizeof("unsigned long", headers)
-      # check_sizeof("Image *", headers)
-
-      have_enum_values('AlphaChannelType', ['CopyAlphaChannel', # 6.4.3-7
-                                            'BackgroundAlphaChannel', # 6.5.2-5
-                                            'RemoveAlphaChannel'], headers) # 6.7.5-1
-      have_enum_values('CompositeOperator', ['BlurCompositeOp', # 6.5.3-7
-                                             'DistortCompositeOp', # 6.5.3-10
-                                             'LinearBurnCompositeOp', # 6.5.4-3
-                                             'LinearDodgeCompositeOp', # 6.5.4-3
-                                             'MathematicsCompositeOp', # 6.5.4-3
-                                             'PegtopLightCompositeOp', # 6.5.4-3
-                                             'PinLightCompositeOp', # 6.5.4-3
-                                             'VividLightCompositeOp'], headers) # 6.5.4-3
-      have_enum_values('CompressionType', ['DXT1Compression', # 6.3.9-3
-                                           'DXT3Compression', # 6.3.9-3
-                                           'DXT5Compression', # 6.3.9-3
-                                           'ZipSCompression', # 6.5.5-4
-                                           'PizCompression', # 6.5.5-4
-                                           'Pxr24Compression', # 6.5.5-4
-                                           'B44Compression', # 6.5.5-4
-                                           'B44ACompression'], headers) # 6.5.5-4
-
-      have_enum_values('DistortImageMethod', ['BarrelDistortion', # 6.4.2-5
-                                              'BarrelInverseDistortion', # 6.4.3-8
-                                              'BilinearForwardDistortion', # 6.5.1-2
-                                              'BilinearReverseDistortion', # 6.5.1-2
-                                              'DePolarDistortion', # 6.4.2-6
-                                              'PolarDistortion', # 6.4.2-6
-                                              'PolynomialDistortion', # 6.4.2-4
-                                              'ShepardsDistortion'], headers) # 6.4.2-4
-      have_enum_value('DitherMethod', 'NoDitherMethod', headers) # 6.4.3
-      have_enum_values('FilterTypes', ['KaiserFilter', # 6.3.6
-                                       'WelshFilter', # 6.3.6-4
-                                       'ParzenFilter', # 6.3.6-4
-                                       'LagrangeFilter', # 6.3.7-2
-                                       'BohmanFilter', # 6.3.7-2
-                                       'BartlettFilter', # 6.3.7-2
-                                       'SentinelFilter'], headers) # 6.3.7-2
-      have_enum_values('MagickEvaluateOperator', ['PowEvaluateOperator', # 6.4.1-9
-                                                  'LogEvaluateOperator', # 6.4.2
-                                                  'ThresholdEvaluateOperator', # 6.4.3
-                                                  'ThresholdBlackEvaluateOperator', # 6.4.3
-                                                  'ThresholdWhiteEvaluateOperator', # 6.4.3
-                                                  'GaussianNoiseEvaluateOperator', # 6.4.3
-                                                  'ImpulseNoiseEvaluateOperator', # 6.4.3
-                                                  'LaplacianNoiseEvaluateOperator', # 6.4.3
-                                                  'MultiplicativeNoiseEvaluateOperator', # 6.4.3
-                                                  'PoissonNoiseEvaluateOperator', # 6.4.3
-                                                  'UniformNoiseEvaluateOperator', # 6.4.3
-                                                  'CosineEvaluateOperator', # 6.4.8-5
-                                                  'SineEvaluateOperator', # 6.4.8-5
-                                                  'AddModulusEvaluateOperator'], # 6.4.8-5
-                       headers)
-      have_enum_values('MagickFunction', ['ArcsinFunction', # 6.5.2-8
-                                          'ArctanFunction', # 6.5.2-8
-                                          'PolynomialFunction', # 6.4.8-8
-                                          'SinusoidFunction'], headers) # 6.4.8-8
-      have_enum_values('ImageLayerMethod', ['FlattenLayer', # 6.3.6-2
-                                            'MergeLayer', # 6.3.6
-                                            'MosaicLayer', # 6.3.6-2
-                                            'TrimBoundsLayer'], headers) # 6.4.3-8
-      have_enum_values('VirtualPixelMethod', ['HorizontalTileVirtualPixelMethod', # 6.4.2-6
-                                              'VerticalTileVirtualPixelMethod', # 6.4.2-6
-                                              'HorizontalTileEdgeVirtualPixelMethod', # 6.5.0-1
-                                              'VerticalTileEdgeVirtualPixelMethod', # 6.5.0-1
-                                              'CheckerTileVirtualPixelMethod'], # 6.5.0-1
-                       headers)
-
-      headers = ['ruby.h', 'ruby/io.h']
-
-      have_func('rb_frame_this_func', headers)
-
       # Miscellaneous constants
       $defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
       $defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")
 
+      if Gem::Version.new($magick_version) >= Gem::Version.new('6.8.9')
+        $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9=1')
+      end
+
       create_header
     end
 
@@ -514,10 +340,10 @@ SRC
 
 
 #{'=' * 70}
-      #{DateTime.now.strftime('%a %d%b%y %T')}
+#{DateTime.now.strftime('%a %d %b %y %T')}
 This installation of RMagick #{RMAGICK_VERS} is configured for
 Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick #{$magick_version}
-      #{'=' * 70}
+#{'=' * 70}
 
 
 END_SUMMARY