ruby-vips 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # master 
-...
+
+### Changed
+
+* Don't use :sequential option for older libvipses [John Cupitt]
+
+### Fixed
+
+* Fixed check of sequential mode support [Stanislaw Pankevich]
 
 # Version 0.2.0
 

data/README.md

@@ -4,14 +4,14 @@
 from git master of libvips (the unreleased 7.29) as well. You may prefer
 the stable 0.2 branch of ruby-vips.
 
+[![Build Status](https://secure.travis-ci.org/jcupitt/ruby-vips.png)](http://travis-ci.org/jcupitt/ruby-vips)
+
 ruby-vips is a ruby extension for [vips](http://www.vips.ecs.soton.ac.uk). 
 It is extremely fast and it can process huge images without requiring the 
 entire image to be loaded into memory. For example, the benchmark at 
 [vips-benchmarks](https://github.com/stanislaw/vips-benchmarks) loads a large
 image, crops, shrinks, sharpens and saves again:
 
-[![Build Status](https://secure.travis-ci.org/jcupitt/ruby-vips.png)](http://travis-ci.org/jcupitt/ruby-vips)
-
 <pre>
 real time in seconds, fastest of three runs
 benchmark       tiff    jpeg
@@ -30,6 +30,9 @@ rmagick.rb      1370064
 
 See also [benchmarks at the official libvips
 website](http://www.vips.ecs.soton.ac.uk/index.php?title=Speed_and_Memory_Use).
+There's a handy blog post explaining [how libvips opens
+files](http://libvips.blogspot.co.uk/2012/06/how-libvips-opens-file.html)
+which gives some more background.
 
 ruby-vips allows you to set up pipelines that don't get executed until you
 output the image to disk or to a string. This means you can create,

data/lib/vips.rb

@@ -5,3 +5,12 @@ require 'vips_ext'
 require 'vips/version'
 require 'vips/reader'
 require 'vips/writer'
+
+module Vips
+  class << self
+    def sequential_mode_supported?
+      comp = VIPS::LIB_VERSION_ARRAY <=> [7,28,0]
+      comp >= 0
+    end
+  end
+end

data/lib/vips/reader.rb

@@ -24,15 +24,10 @@ module VIPS
 
     # Creates a CSV reader.
     def initialize(path, options={})
-      @line_skip = 0
-      @whitespace = ' "'
-      @separator = ";,\t"
-      @line_limit = 0
-
-      self.line_skip = options[:line_skip] if options.has_key?(:line_skip)
-      self.whitespace = options[:whitespace] if options.has_key?(:whitespace)
-      self.separator = options[:separator] if options.has_key?(:separator)
-      self.line_limit = options[:line_limit] if options.has_key?(:line_limit)
+      @line_skip = options[:line_skip] || 0
+      @whitespace = options[:whitespace] || ' "'
+      @separator = options[:separator] || ";,\t"
+      @line_limit = options[:line_limit] || 0
 
       super path, options
     end
@@ -75,13 +70,9 @@ module VIPS
 
     # Creates a jpeg image file reader.
     def initialize(path, options={})
-      @shrink_factor = 1
-      @fail_on_warn = false
-      @sequential = false
-
-      self.shrink_factor = options[:shrink_factor] if options.has_key?(:shrink_factor)
-      self.fail_on_warn = options[:fail_on_warn] if options.has_key?(:fail_on_warn)
-      self.sequential = options[:sequential] if options.has_key?(:sequential)
+      @shrink_factor = options[:shrink_factor] || 1
+      @fail_on_warn = options[:fail_on_warn] || false
+      @sequential = options[:sequential] || false
 
       super path, options
     end
@@ -91,8 +82,11 @@ module VIPS
       str = "#{@path}:#{shrink_factor}"
       str << "," 
       str << "fail" if @fail_on_warn
-      str << "," 
-      str << "sequential" if @sequential
+
+      if Vips.sequential_mode_supported?
+        str << "," 
+        str << "sequential" if @sequential
+      end
 
       read_internal str
     end
@@ -116,10 +110,9 @@ module VIPS
     # Create a tiff image file reader.
     def initialize(path, options={})
       @page_number = nil
-      @sequential = false
+      @sequential = options[:sequential] || false
 
       self.page_number = options[:page_number] if options.has_key?(:page_number)
-      self.sequential = options[:sequential] if options.has_key?(:sequential)
       super path, options
     end
 
@@ -127,8 +120,11 @@ module VIPS
     def read
       str = "#{@path}:"
       str << "#{@page_number}" if @page_number
-      str << ","
-      str << "sequential" if @sequential
+
+      if Vips.sequential_mode_supported?
+        str << ","
+        str << "sequential" if @sequential
+      end
 
       read_internal str
     end
@@ -149,17 +145,19 @@ module VIPS
 
     # Create a png image file reader.
     def initialize(path, options={})
-      @sequential = false
+      @sequential = options[:sequential] || false
 
-      self.sequential = options[:sequential] if options.has_key?(:sequential)
       super path, options
     end
 
     # Read the png file from disk and return a VIPS Image object.
     def read
       str = @path
-      str << ":"
-      str << "sequential" if @sequential
+
+      if Vips.sequential_mode_supported?
+        str << ":"
+        str << "sequential" if @sequential
+      end
 
       read_internal str
     end

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2012-06-29"
+  s.date = "2012-07-16"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -423159501
+      hash: 204024303
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: