update to latest

add ruby-vips8 as well

Author: jcupitt

Gemfile

@@ -1,7 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

Gemfile.lock

@@ -1,26 +1,26 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    RubyInline (3.12.3)
+    RubyInline (3.12.4)
       ZenTest (~> 4.3)
-    ZenTest (4.10.0)
-    addressable (2.3.6)
+    ZenTest (4.11.0)
+    addressable (2.4.0)
     builder (3.2.2)
-    faraday (0.8.9)
+    faraday (0.8.11)
       multipart-post (~> 1.2.0)
-    ffi (1.9.3)
-    free-image (0.6.2)
+    ffi (1.9.10)
+    free-image (0.7.1)
       ffi (>= 1.0.10)
-    git (1.2.6)
+    git (1.2.9.1)
     github_api (0.10.1)
       addressable
       faraday (~> 0.8.1)
       hashie (>= 1.2)
       multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    hashie (3.0.0)
-    highline (1.6.21)
+    hashie (3.4.3)
+    highline (1.7.8)
     image_science (1.2.6)
       RubyInline (~> 3.9)
     jeweler (1.8.8)
@@ -32,24 +32,24 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    multi_json (1.10.1)
+    json (1.8.3)
+    jwt (1.5.2)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
-    oauth2 (0.9.4)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
+    rack (1.6.4)
+    rake (10.5.0)
+    rdoc (4.2.1)
       json (~> 1.4)
-    rmagick (2.13.2)
-    ruby-vips (0.3.8)
+    rmagick (2.15.4)
+    ruby-vips (0.3.13)
 
 PLATFORMS
   ruby
@@ -61,3 +61,6 @@ DEPENDENCIES
   jeweler (~> 1.8.3)
   rmagick
   ruby-vips
+
+BUNDLED WITH
+   1.10.6

README.md

@@ -9,42 +9,45 @@ Last update: June 6, 2014.
 ## Benchmarks
 
 ```bash
-$ bundle exec ./runner 
-Darwin 41.88.168.192.in-addr.arpa 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64
-
-Ruby-vips 0.3.8 built against vips-7.38.5-Fri Jun  6 13:56:58 MSK 2014
-
-Version: ImageMagick 6.8.8-9 Q16 x86_64 2014-06-06 http://www.imagemagick.org
+$ ./runner 
+Linux kiwi 4.2.0-23-generic #28-Ubuntu SMP Sun Dec 27 17:47:31 UTC 2015 x86_64
+x86_64 x86_64 GNU/Linux
+Ruby-vips 0.3.13 built against vips-8.2.2-Fri Jan 22 16:28:35 GMT 2016
+Version: ImageMagick 6.8.9-9 Q16 x86_64 2015-08-06 http://www.imagemagick.org
 Copyright: Copyright (C) 1999-2014 ImageMagick Studio LLC
-Features: DPC Modules
-Delegates: bzlib fftw freetype jng jpeg lcms ltdl png tiff xml zlib
+Features: DPC Modules OpenMP
+Delegates: bzlib djvu fftw fontconfig freetype jbig jng jpeg lcms lqr ltdl
+lzma openexr pangocairo png tiff wmf x xml zlib
 
 Image Science 1.2.6
-
 building test image ...
 tile=10
 test image is 2900 by 4420 pixels
 making tiff and jpeg derivatives ...
 timing ruby/ruby-vips.rb ... done
+timing ruby/ruby-vips8.rb ... done
 timing ruby/rmagick.rb ... done
 timing image-magick/image-magick ... done
 timing ruby/image_sci.rb ... done
 measuring memuse for ruby/ruby-vips.rb ... done
+measuring memuse for ruby/ruby-vips8.rb ... done
 measuring memuse for ruby/rmagick.rb ... done
 measuring memuse for ruby/image_sci.rb ... done
 
 real time in seconds, fastest of three runs
 benchmark	tiff	jpeg
-ruby-vips.rb	1.42	1.62
-image_sci.rb	1.47	1.70
-rmagick.rb	1.63	1.87
-image-magick	1.68	2.01
+ruby-vips.rb	0.25	0.33	
+ruby-vips8.rb	0.45	0.52	
+image-magick	0.86	1.03	
+rmagick.rb	0.92	1.01	
+image_sci.rb	1.11	0.88	
 
 peak memory use in bytes
 benchmark	peak RSS
-ruby-vips.rb	184926208
-image_sci.rb	629784576
-rmagick.rb	1465909248
+ruby-vips.rb	52828
+ruby-vips8.rb	60464
+image_sci.rb	146228
+rmagick.rb	350136
 ```
 
 ## Performance test design

image-magick/image-magick

@@ -4,8 +4,8 @@
 # we can't crop 100 pixels with the crop-on-load syntax, so we have to
 # find the width and height ourselves
 
-width=`header -f Xsize $1`
-height=`header -f Ysize $1`
+width=$(vipsheader -f Xsize $1)
+height=$(vipsheader -f Ysize $1)
 
 width=$((width - 200))
 height=$((height - 200))

ruby/rmagick.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'RMagick'
+require 'rmagick'
 
 include Magick
 

ruby/ruby-vips8.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'vips8'
+
+im = Vips::Image.new_from_file ARGV[0], :access => :sequential
+
+im = im.crop 100, 100, im.width - 200, im.height - 200
+im = im.similarity :scale => 0.9
+mask = Vips::Image.new_from_array [
+	[-1, -1,  -1], 
+	[-1,  16, -1],
+	[-1, -1,  -1]], 8
+im = im.conv(mask)
+
+im.write_to_file ARGV[1]

ruby/versions/ruby-vips8.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'vips'
+
+LIBVIPS_VERSION = %x[vips --version]
+
+puts "Ruby-vips #{VIPS::VERSION} built against #{LIBVIPS_VERSION}"

runner

@@ -21,20 +21,20 @@ sample=images/sample2.v
 
 echo building test image ...
 echo "tile=$tile"
-vips im_replicate $sample $tmp/t.v $tile $tile
+vips replicate $sample $tmp/t.v $tile $tile
 if [ $? != 0 ]; then
   echo "build of test image failed -- out of disc space?"
   exit 1
 fi
-echo -n "test image is" `header -f width $tmp/t.v` 
-echo " by" `header -f height $tmp/t.v` "pixels"
+echo -n "test image is" $(vipsheader -f width $tmp/t.v)
+echo " by" $(vipsheader -f height $tmp/t.v) "pixels"
 
 echo making tiff and jpeg derivatives ...
-vips im_copy $tmp/t.v $tmp/t.tif
-vips im_copy $tmp/t.v $tmp/t.jpg
+vips copy $tmp/t.v $tmp/t.tif
+vips copy $tmp/t.v $tmp/t.jpg
 
 # we want to use the time program, not the one built into the shell
-time=/usr/local/bin/time
+time=$(which time)
 if [ $? != 0 ]; then
   echo "unable to locate 'time' program"
   exit 1
@@ -80,6 +80,7 @@ function benchmark() {
 # tests we run
 programs="\
   ruby/ruby-vips.rb \
+  ruby/ruby-vips8.rb \
   ruby/rmagick.rb \
   image-magick/image-magick \
   ruby/image_sci.rb
@@ -97,6 +98,7 @@ done
 # subprocesses
 programs="\
   ruby/ruby-vips.rb \
+  ruby/ruby-vips8.rb \
   ruby/rmagick.rb \
   ruby/image_sci.rb \
 "