rmagick 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14fbc044f6437f806685330840ec7a65eca53394c52e9c83bb125764cbcfcec7
-  data.tar.gz: 5497e651500e3bcf58c1055e68fac7a5f754757119c03a3b6916663660c53ade
+  metadata.gz: 1bc6ac748ddb89b0be62b816518a4193167fb74eab1d482187a2e8fc5b3bc707
+  data.tar.gz: 509ab59e79d7ba1a47e18dacdf5032a014df73e791c63313f1faa88efc1a6a64
 SHA512:
-  metadata.gz: 14c5cabe80554f502aef129861aa8ba0fb0eb7d2c5ad37a8ea4120a2d600912fd8dcb4c40cca5e1c2d55a2372f82e54b885ec53acf69a1af227cc3ca553084d3
-  data.tar.gz: f72d9459f44f9680a3dd30a96d948e70aefceefa8b4b751bfd3286d36e06d1b834f9b1c850c119ebc61e6f2a7dde7167f6a44f554d56eccddb68151601782d7a
+  metadata.gz: eaf280335cb5d4e9fc67c769d3b91308ab84689012e399eaf92043ab4058655fcac0087836bfed05647e2f813c30d823f9d664cc31143a02b7ba76c0747b412d
+  data.tar.gz: 8d08619eb5ae6bf689e0c05d59da465d9b53c1c090733fe723d5d0f020e332bafc841860f86b6d38e21bb85fb12da59ebf2a97e3a6f8136f9c405565c8c01d64

data/.appveyor.yml

@@ -8,25 +8,25 @@ environment:
       PATCH_VERSION: 10
     - RUBY_VERSION: 23-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 40
+      PATCH_VERSION: 49
     - RUBY_VERSION: 24-x64
       IMAGEMAGICK_VERSION: 6.8.9
       PATCH_VERSION: 10
     - RUBY_VERSION: 24-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 40
+      PATCH_VERSION: 49
     - RUBY_VERSION: 25-x64
       IMAGEMAGICK_VERSION: 6.8.9
       PATCH_VERSION: 10
     - RUBY_VERSION: 25-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 40
+      PATCH_VERSION: 49
     - RUBY_VERSION: 26-x64
       IMAGEMAGICK_VERSION: 6.8.9
       PATCH_VERSION: 10
     - RUBY_VERSION: 26-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 40
+      PATCH_VERSION: 49
 
 install:
   - appveyor-retry appveyor DownloadFile https://ftp.icm.edu.pl/pub/graphics/ImageMagick/binaries/ImageMagick-%IMAGEMAGICK_VERSION%-%PATCH_VERSION%-Q16-x64-dll.exe

data/.circleci/config.yml

@@ -17,7 +17,7 @@ jobs:
       - run:
           name: setup linux
           command: |
-            IMAGEMAGICK_VERSION=6.9.10-40 bash before_install_linux.sh
+            IMAGEMAGICK_VERSION=6.9.10-49 bash before_install_linux.sh
 
       - run:
           name: install dependencies

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+build-ImageMagick/

data/.rubocop_todo.yml

@@ -105,6 +105,7 @@ Lint/NumberConversion:
     - 'lib/rvg/to_c.rb'
     - 'test/Import_Export.rb'
     - 'test/Enum.rb'
+    - 'test/lib/internal/Geometry.rb'
 
 # Offense count: 1
 Lint/RescueException:
@@ -368,6 +369,7 @@ Style/AutoResourceCleanup:
 Style/CaseEquality:
   Exclude:
     - 'test/Enum.rb'
+    - 'test/Pixel.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -424,6 +426,10 @@ Style/EvalWithLocation:
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/units.rb'
 
+Style/FormatString:
+  Exclude:
+    - 'examples/identify.rb'
+
 # Offense count: 158
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated

data/.travis.yml

@@ -2,10 +2,28 @@ language: ruby
 
 cache:
   directories:
-    - ~/.ccache
+    - ~/.cache/rubocop_cache
     - vendor/bundle
     - build-ImageMagick
 
+dist: xenial
+addons:
+  apt:
+    packages:
+      - build-essential
+      - libx11-dev
+      - libxext-dev
+      - zlib1g-dev
+      - liblcms2-dev
+      - libpng-dev
+      - libjpeg-dev
+      - libfreetype6-dev
+      - libxml2-dev
+      - libtiff5-dev
+      - libwebp-dev
+      - ghostscript
+      - ccache
+
 os:
   - linux
 
@@ -16,24 +34,24 @@ env:
   - 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
+  - IMAGEMAGICK_VERSION=6.9.10-49
+  - IMAGEMAGICK_VERSION=6.9.10-49 CONFIGURE_OPTIONS=--enable-hdri
 
 before_install:
-  - source before_install_$TRAVIS_OS_NAME.sh
+  - /bin/bash before_install_$TRAVIS_OS_NAME.sh
 
 install: bundle install --path=vendor/bundle --verbose
 
 rvm:
-  - 2.3
-  - 2.4
-  - 2.5
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
   - 2.6
 
 matrix:
   include:
     - rvm: 2.3
-      env: STYLE_CHECKS=true IMAGEMAGICK_VERSION=6.8.9-10
+      env: STYLE_CHECKS=true
 
 notifications:
   webhooks:

data/CHANGELOG.md

@@ -3,6 +3,110 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 3.2.0
+
+This is expected to be the final deprecation release before RMagick 4.0. We
+have added loads of deprecation warnings to clear the pathway for ImageMagick 7
+support. Once you've fixed all of them you should be fine to upgrade to version
+4.0 without any pain. There are a small handful of edge cases which we could
+not cleanly deprecate, though they should be extremely rare. These will be
+documented in the 4.0 release. Thanks to @dlemstra for the hard work making
+this release possible.
+
+The biggest change in moving towards RMagick 4.0 will be the fact that
+`opacity` is deprecated in favor of `alpha`.
+
+**NOTE: `opacity` is the opposite of `alpha`!!!**
+
+If you are currently passing opacity into methods, you will need to invert the
+value and use the new `alpha:` keyword argument. If you are passing an integer,
+`alpha = 255 - opacity`. An integer `opacity` of 0 is an `alpha` of 255.
+
+Also, **major kudos to @Watson1978** for enabling Ruby's memory management in
+(#697).  This should go a long way towards improving RMagick's reputation for
+memory usage.
+
+Deprecations: (To be removed in RMagick 4.0)
+
+- `Info#group` (#578) (no replacement)
+- `Image#blur` (#579) (no replacement)
+- Renamed `AlphaChannelType` to `AlphaChannelOption` (#596)
+- Renamed `DistortImageMethod` to `DistortMethod` (#605)
+- Renamed `FilterTypes` to `FilterType` (#611)
+- Renamed `InterpolatePixelMethod` to `PixelInterpolateMethod` (#613)
+- Renamed `ImageLayerMethod` to `LayerMethod` (#618)
+- Deprecate the `opacity` property of the Pixel class. (use `alpha` instead) (#619)
+- Deprecate old enum names. (use IM7 names instead) (#627)
+- `StaticGravity` (use `CenterGravity` instead) (#638)
+- `Image#sync_profiles` (no replacement) (#640)
+- Deprecate old metric type values (use IM7 names instead) (#647)
+- Deprecate `ResetAlphaChannel` (no replacement) (#644)
+- Deprecate `FlattenAlphaChannel` (no replacement) (#645)
+- Deprecate `MatteChannel` (no replacement) (#646)
+- Deprecate `ConstantVirtualPixelMethod` (no replacement) (#649)
+- Deprecate `IntegerPixel` (no replacement) (#650)
+- Deprecate `Image.combine` (use `ImageList#combine` instead) (#690)
+- Deprecate `Image#opacity` (use `Image#alpha` instead) (#669)
+- Deprecate unnamed argument for opacity in `Image#transparent` (use keyword `alpha:` instead) (#695)
+- Deprecate unnamed argument for opacity in `Image#black_threshold` and `Image#white_threshold.` (use keyword `alpha:` instead) (#709)
+- Deprecate unnamed argument for opacity in `Image#matte_flood_fill` (use keyword `alpha:` instead) (#711)
+- Deprecate unnamed argument for opacity in `Image#paint_transparent` (use keyword `alpha:` instead) (#717)
+- Deprecate unnamed argument for opacity in `Image#transparent_chroma.` (use keyword `alpha:` instead) (#722)
+- Deprecate `Draw#matte` (use `Draw#alpha` instead) (#724)
+
+Enhancements:
+
+- Many internal adjustments to prepare for ImageMagick 7 support.
+- Added alpha property to the pixel class. (#617)
+- Add combine to the ImageList class. (#589)
+- Add new alpha constants (#651)
+- Add `Image#mask=` (#660)
+- Add `Draw#alpha` to replace `Draw#matte` (#726)
+- Add Draw#image (#720)
+- Add ArchLinux support (#727)
+
+Bug Fixes:
+
+- Fix `Font#to_s` to not raise error (#569)
+- Fix a SEGV in `Image#reduce_noise` (#576)
+- Fix infinite loop in `Image#compose` (#587)
+- Fix enumeration memory leaks (#592) (#594) (#606) (#610) (#626)
+- Don't allow `Image#class_type` to be set to undefined (#599)
+- Fixed setting the name of the clip path. (#608)
+- Fix memory leak in `Info#view=` (#642)
+- Fix memory leak in `Image.constitute` (#665)
+- Raise error on invalid arguments in `Draw#bezier` (#674)
+- Fix memory leak in `Image#sparse_color` (#683)
+- Prevent negative values for `Image#convolve` (#679)
+- Several cleanups and fixes in the examples
+- Raise error on invalid arguments in `Draw#color` (#691)
+- Raise error on invalid arguments in `Draw#opacity` (#692)
+- Raise error on invalid arguments in `Draw#fill_opacity` (#693)
+- Raise error on invalid arguments in `Draw#stroke_opacity` (#694)
+- Raise error on invalid arguments in `Draw#font_weight` (#696)
+- Raise error on invalid arguments in `Draw#pattern` (#702)
+- Raise error on invalid arguments in `Draw#point` (#703)
+- Raise error on invalid arguments in `Draw#font_size` (#704)
+- Raise error on invalid arguments in `Draw#polygon` (#705)
+- Raise error on invalid arguments in `Draw#polyline` (#706)
+- Raise error on invalid arguments in `Draw#rotate` (#707)
+- Raise error on invalid arguments in `Draw#scale` (#708)
+- Raise error on invalid arguments in `Draw#stroke_dashoffset` (#710)
+- Raise error on invalid arguments in `Draw#translate` (#713)
+- Raise error on invalid arguments in `Draw#text` (#714)
+- Raise error on invalid arguments in `Draw#stroke` (#715)
+- Raise error on invalid arguments in `Draw#matte` (#716)
+- Raise error on invalid arguments in `Draw#skewx`, `Draw#skewy` (#719)
+- Fix `Image#thumbnail` to keep image aspect ratio like ImageMagick (#718)
+- Fix bug where `ImageList#montage` doesn't apply `border_color` & `matte_color` (#601)
+- Fix stack-buffer-overflow in `Draw#annotate` (#725)
+- Enable managed memory feature (#697)
+
+Code Quality:
+
+- Many tests written
+- Several fixes to reduce compiler warnings.
+
 ## RMagick 3.1.0
 
 Deprecations: (To be removed in RMagick 4.0)

data/before_install_linux.sh

@@ -1,14 +1,11 @@
 set -euox pipefail
 
-sudo apt-get update
-
-# remove all existing imagemagick related packages
-sudo apt-get autoremove -y imagemagick* libmagick* --purge
+gem install bundler
 
-# 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 libwebp-dev vim ghostscript ccache
+if [ -v STYLE_CHECKS ]; then
+  set +ux
+  exit 0
+fi
 
 if [ ! -v IMAGEMAGICK_VERSION ]; then
   echo "you must specify an ImageMagick version."
@@ -16,6 +13,18 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
   exit 1
 fi
 
+# remove all existing imagemagick related packages
+sudo apt-get autoremove -y imagemagick* libmagick* --purge
+
+if [ ! -v TRAVIS ]; then
+  sudo apt-get update
+
+  # 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 libwebp-dev vim ghostscript ccache
+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
@@ -34,10 +43,12 @@ build_imagemagick() {
   if (( "${version[0]}${version[1]}" >= 69 )); then
     wget https://github.com/ImageMagick/ImageMagick6/archive/${IMAGEMAGICK_VERSION}.tar.gz
     tar -xf ${IMAGEMAGICK_VERSION}.tar.gz
+    rm ${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
+    rm ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
     mv ImageMagick-${IMAGEMAGICK_VERSION} $build_dir
   fi
 
@@ -61,6 +72,4 @@ cd $project_dir
 
 sudo ldconfig
 
-gem install bundler
-
 set +ux

data/benchmarks/memory/README.md

@@ -0,0 +1,50 @@
+# How to measure the memory usage
+
+## 1. Install gnuplot
+If you need a graph of memory usage, it can draw the graph with `gnuplot`.
+
+With `Homebrew`, you can install `gnuplot` like
+
+```
+$ brew install gnuplot
+```
+
+## 2. Retrieve two performance data `before` / `after`
+Retrieve data before applying patches.
+
+```
+$ rake build
+$ gem install pkg/rmagick-3.1.0.gem
+$ cd benchmarks/memory
+$ ruby image_new.rb > before.csv
+```
+
+Apply the patches then retrieve improved data.
+
+```
+$ rake build
+$ gem install pkg/rmagick-3.1.0.gem
+$ cd benchmarks/memory
+$ ruby image_new.rb > after.csv
+```
+
+## 3. Draw the performance graph
+Launch `gnuplot` and execute `load 'rmagick.gnuplot'` command in prompt then the performance graph will be drew.
+
+```
+$ cd benchmarks/memory
+$ gnuplot
+
+	G N U P L O T
+	Version 5.2 patchlevel 7    last modified 2019-05-29
+
+	Copyright (C) 1986-1993, 1998, 2004, 2007-2018
+	Thomas Williams, Colin Kelley and many others
+
+	gnuplot home:     http://www.gnuplot.info
+	faq, bugs, etc:   type "help FAQ"
+	immediate help:   type "help"  (plot window: hit 'h')
+
+Terminal type is now 'qt'
+gnuplot> load 'rmagick.gnuplot'
+```

data/benchmarks/memory/image_new.rb

@@ -0,0 +1,8 @@
+require 'rmagick'
+
+1000.times do |i|
+  Magick::Image.new(1000, 1000)
+
+  rss = Integer(`ps -o rss= -p #{Process.pid}`) / 1024.0
+  puts "#{i},#{rss}"
+end

data/benchmarks/memory/rmagick.gnuplot

@@ -0,0 +1,16 @@
+set datafile separator ","
+
+set key outside center top horizontal reverse Left samplen 2
+unset border
+set xtics scale 0
+set ytics scale 0
+set grid ytics linewidth 1 linetype -1
+
+set style line 1 lt 1 lc rgbcolor "#3465a4" lw 2.5 pt 7 ps 1
+set style line 2 lt 1 lc rgbcolor "#ff6347" lw 2.5 pt 7 ps 1
+set style line 3 lt 1 lc rgbcolor "#888a85" lw 2.5 pt 5 ps 1
+
+set xlabel "Nth loop"
+set ylabel "Memory usage (MiB)"
+
+plot "before.csv" with line linestyle 1, "after.csv" with line linestyle 2

data/doc/ex/coalesce.rb

@@ -19,7 +19,7 @@ cells = Magick::ImageList.new
 cells.new_image buttons.columns * 5, buttons.rows * 5 do
   self.background_color = '#000000ff' # transparent
 end
-cells.matte = true
+cells.alpha(Magick::ActivateAlphaChannel)
 
 offset = Magick::Rectangle.new(0, 0, 0, 0)
 
@@ -44,7 +44,7 @@ srand 1234
   offset.x = x * button.columns
   offset.y = y * button.rows
   button.page = offset
-  button.matte = true
+  button.alpha(Magick::ActivateAlphaChannel)
   cells << button
 end
 

data/doc/ex/drawcomp.rb

@@ -4,16 +4,16 @@ require 'rmagick'
 
 # Read the snake image file and scale to 200 pixels high.
 begin
-  snake = Magick::ImageList.new('images/Snake.wmf')
+  snake = Magick::ImageList.new('images/Snake.png')
   snake.scale!(200.0 / snake.rows)
 
   # Read the coffee cup image and scale to 200 pixels high.
-  coffee = Magick::ImageList.new('images/Coffee.wmf')
+  coffee = Magick::ImageList.new('images/Coffee.png')
   coffee.scale!(200.0 / coffee.rows)
 
   # We want the "no" symbol to be a little smaller.
   # Read and scale to 150 pixels high.
-  sign = Magick::ImageList.new('images/No.wmf')
+  sign = Magick::ImageList.new('images/No.png')
   sign.scale!(150.0 / sign.rows)
 
   # Change the white pixels in the sign to transparent.

data/doc/ex/get_pixels.rb

@@ -38,7 +38,7 @@ rows.times do |y|
 end
 
 # Composite the mono version of the image over the color version.
-grayrocks.matte = true
+grayrocks.alpha(Magick::ActivateAlphaChannel)
 combine = rocks.composite(grayrocks, Magick::CenterGravity, Magick::OverCompositeOp)
 # combine.display
 combine.write 'get_pixels.jpg'