ruby-vips 0.3.4 → 0.3.5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # master 
 
+# Version 0.3.5
+
+* rb_raise() in mask.c no longer passes a string pointer as the fmt arg, stopping gcc bailing out on some platforms [John Cupitt]
+* Image.magick() now calls im_magick2vips() directly rather than relying on libvips file type sniffing [John Cupitt]
+
 # Version 0.3.4
 
 * Update specs for lcms changes, thanks Stanislaw [John Cupitt]

data/Gemfile.lock

@@ -19,7 +19,7 @@ GEM
     rspec-core (2.11.1)
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -99,7 +99,7 @@ gem 'ruby-vips'
 ## Documentation.
 
 ruby-vips has [rdoc
-documentation](http://rubydoc.info/gems/ruby-vips/0.2.0/frames). Also
+documentation](http://rubydoc.info/gems/ruby-vips/frames). Also
 see [Wiki page](https://github.com/jcupitt/ruby-vips/wiki)
 
 ## Small example

data/ext/mask.c

@@ -282,7 +282,7 @@ mask_arg2mask(VALUE arg, INTMASK **imask, DOUBLEMASK **dmask)
         else
             errstr = "Expected an int array or an int Mask";
 
-        rb_raise(rb_eArgError, errstr);
+        rb_raise(rb_eArgError, "%s", errstr);
     }
 
     if (imask)

data/ext/reader.c

@@ -39,16 +39,16 @@ reader_s_recognized_p(VALUE klass, VALUE path)
 static VALUE
 reader_read_internal(VALUE obj, VALUE path, VALUE flags)
 {
-	VipsImage *im_new;
+    VipsImage *im_new;
 
-	/* flags bit 1 means "sequential mode requested".
-	 */
-	char *mode = NUM2INT(flags) & 1 ? "rs" : "rd";
+    /* flags bit 1 means "sequential mode requested".
+     */
+    char *mode = NUM2INT(flags) & 1 ? "rs" : "rd";
 
     if (!(im_new = im_open(StringValuePtr(path), mode)))
         vips_lib_error();
 
-	return img_init(cVIPSImage, im_new);
+    return img_init(cVIPSImage, im_new);
 }
 
 /* :nodoc: */
@@ -70,6 +70,21 @@ raw_read_internal(VALUE obj, VALUE path, VALUE width, VALUE height, VALUE bpp,
 	return img_init(cVIPSImage, im_new);
 }
 
+static VALUE
+magick_read_internal(VALUE obj, VALUE path, VALUE flags)
+{
+    VipsImage *im_new;
+
+    if (!(im_new = im_open(StringValuePtr(path), "p")))
+        vips_lib_error();
+    if (im_magick2vips(StringValuePtr(path), im_new)) {
+        im_close(im_new);
+        vips_lib_error();
+    }
+
+    return img_init(cVIPSImage, im_new);
+}
+
 static void
 reader_fmt_set(VALUE klass, const char* val)
 {
@@ -152,6 +167,7 @@ init_Reader(void)
      */
 
     VALUE magick_reader = rb_define_class_under(mVIPS, "MagickReader", reader);
+    rb_define_private_method(magick_reader, "read_internal", magick_read_internal, 2);
     reader_fmt_set(magick_reader, "magick");
 
     /*

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/vips/writer.rb

@@ -171,7 +171,7 @@ module VIPS
     end
 
     def layout_str
-      s = @layout
+      s = @layout.to_s
       s << ":#{@tile_size.join 'x'}" if @layout == :tile
       s
     end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2012-09-11"
+  s.date = "2013-01-15"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/jcupitt/ruby-vips"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "ruby-vips is a ruby extension for vips. It is extremely fast and it can process huge images without requiring the entire image to be loaded into memory."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,93 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-vips
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.3.5
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 4
-  version: 0.3.4
 platform: ruby
-authors: 
+authors:
 - Timothy Elliott
 - John Cupitt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
-  name: rdoc
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.8.3
-  name: jeweler
-  prerelease: false
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby extension for the vips image processing library.
 email: jcupitt@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - TODO
-files: 
+files:
 - CHANGELOG.md
 - Gemfile.lock
 - README.md
@@ -137,37 +135,32 @@ files:
 - LICENSE
 - TODO
 homepage: http://github.com/jcupitt/ruby-vips
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3498407689071905375
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ruby-vips is a ruby extension for vips. It is extremely fast and it can process huge images without requiring the entire image to be loaded into memory.
+summary: ruby-vips is a ruby extension for vips. It is extremely fast and it can process
+  huge images without requiring the entire image to be loaded into memory.
 test_files: []
-