ruby-vips 0.3.9 → 0.3.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc46d8bad7bdd686a69c0da9fb009c27afd4c66b
+  data.tar.gz: 827afdfb3a22897c2b65c85b31535760e8dc450a
+SHA512:
+  metadata.gz: fa458e1470eb0e7196ce1eb9ddb0c182366a72299acd01edd4dcf283c0a04ba0df6705ee0da15494ae1be1cde0e2a9d6bcdfa2fe13bfeeb432f7963929388bf1
+  data.tar.gz: 4c107f40deace0d32bb530d81ec6b9d70578d50589805b5fc8ecb9b33495fe96401b1b0327b5877e88c93565c19b07ab8ba26b9fa26ee18220ab3876712258d6

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # master 
 
+# Version 0.3.12
+
+* incremental GC every 10 writes [felixbuenemann]
+* updated bundle [John Cupitt]
+
+# Version 0.3.11
+
+* added magick load from buffer [John Cupitt]
+
+# Version 0.3.10
+
+* added webp write [John Cupitt]
+
 # Version 0.3.9
 
 * removed a stray file from gemspec [Alessandro Tagliapietra]

data/Gemfile.lock

@@ -25,7 +25,7 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
+    json (1.8.3)
     jwt (1.0.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -39,10 +39,8 @@ GEM
       rack (~> 1.2)
     rack (1.5.2)
     rake (10.2.2)
-    rdoc (4.1.1)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rdoc-data (4.0.1)
-      rdoc (~> 4.0)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -60,8 +58,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 1.0)
   jeweler (~> 1.8.3)
-  rdoc (~> 4.1)
-  rdoc-data (~> 4.0)
+  rdoc (~> 3.12)
   rspec

data/README.md

@@ -61,39 +61,42 @@ Install [homebrew](http://mxcl.github.com/homebrew) and enter:
 
 ```bash
 $ brew tap homebrew/science
-$ brew install vips --with-cfitsio --with-fftw --with-imagemagick \
-    --with-libexif --with-liboil --with-libtiff --with-little-cms \
-    --with-openexr --with-openslide --with-pango
+$ brew install vips 
+```
+
+You may see some harmless warnings. 
+
+To verify that your vips install is working, try:
+
+```bash
+$ vips --version
+vips-7.42.1-Sat Dec 27 12:01:43 GMT 2014
 ```
 
 libvips has a lot of optional dependencies. You
-may not need all of them.  See [the notes
+may not need all of them.  True `brew info vips` to see what you have enabled
+and what is disabled. See also [the notes
 here](http://www.vips.ecs.soton.ac.uk/index.php?title=Build_on_OS_X) for
 more information.
 
 If you want to build things outside homebrew which depend on vips,
-such as ruby-vips, your pkg-config will need to be working. You
-need to point pkg-config at the homebrew area, and, additionally, at
-homebrew's libxml2 area:
-
-In your .profile, add something like:
+such as ruby-vips, your pkg-config will need to be working. To test
+`pkg-config`, try:
 
 ```bash
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig
+$ pkg-config vips --modversion
 ```
 
-To verify that your vips install is correct and working, try:
-
-```bash
-$ vips --version
-vips-7.36.4-Tue Nov 19 12:22:47 GMT 2013
-```
+If you see a version number, you are OK. If you don't, either update your
+homebrew, or try adjusting `PKG_CONFIG_PATH`. At various times homebrew has
+needed various settings. You might need to point it at homebrew or even at
+libxml2. 
 
-To verify that your pkg-config is working correctly with vips, try:
+To verify that your `pkg-config` is working correctly with vips, try:
 
 ```bash
 $ pkg-config vips --libs
--L/usr/local/Cellar/vips/7.36.4/lib ... a lot of stuff
+-L/usr/local/Cellar/vips/7.42.1/lib ... a lot of stuff
 ```
 
 TODO: Describe & test with macports.

data/ext/reader.c

@@ -73,6 +73,28 @@ jpeg_buf_internal(VALUE obj, VALUE buf, VALUE shrink, VALUE fail)
     return img_init(cVIPSImage, im_new);
 }
 
+static VALUE
+magick_buf_internal(VALUE obj, VALUE buf)
+{
+    VipsImage *im_new;
+
+    im_new = NULL; 
+
+#if ATLEAST_VIPS( 8, 2 )
+    buf = StringValue(buf);
+
+    if (!(im_new = im_open("", "p")))
+        vips_lib_error();
+
+    if (im_bufmagick2vips(RSTRING_PTR(buf), RSTRING_LEN(buf), im_new, FALSE))
+        vips_lib_error();
+#else
+    rb_raise(eVIPSError, "This method is not implemented in your version of VIPS");
+#endif
+
+    return img_init(cVIPSImage, im_new);
+}
+
 static VALUE
 png_buf_internal(VALUE obj, VALUE buf)
 {
@@ -214,6 +236,10 @@ init_Reader(void)
     rb_define_private_method(magick_reader, "read_internal", magick_read_internal, 2);
     reader_fmt_set(magick_reader, "magick");
 
+    magick_reader = rb_define_class_under(mVIPS, "MagickReader", reader);
+    rb_define_private_method(magick_reader, "buf_internal", magick_buf_internal, 1);
+    reader_fmt_set(magick_reader, "magick");
+
     /*
      * Read Analyze images.
      */

data/ext/tags

@@ -4,18 +4,17 @@
 !_TAG_PROGRAM_NAME	Exuberant Ctags	//
 !_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
 !_TAG_PROGRAM_VERSION	5.9~svn20110310	//
-ATLEAST_VIPS	ruby_vips.h	19;"	d
 CGETPIX	image.c	241;"	d	file:
-DBL2NUM	ruby_vips.h	26;"	d
+DBL2NUM	ruby_vips.h	20;"	d
 GETPIX	image.c	228;"	d	file:
 GetImg	image.h	26;"	d
 Init_vips_ext	ruby_vips.c	/^Init_vips_ext()$/;"	f
-NEED_ruby_vips_class_map_all	ruby_vips.h	51;"	d
+NEED_ruby_vips_class_map_all	ruby_vips.h	45;"	d
 OutImg	image.h	32;"	d
 OutImg2	image.h	36;"	d
 OutImg3	image.h	40;"	d
 OutPartial	image.h	44;"	d
-RARRAY_LENINT	ruby_vips.h	30;"	d
+RARRAY_LENINT	ruby_vips.h	24;"	d
 RUBY_VIPS_BINARY	image.h	59;"	d
 RUBY_VIPS_H	ruby_vips.h	2;"	d
 RUBY_VIPS_HEADER_H	header.h	2;"	d
@@ -103,8 +102,8 @@ id_ushort	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short
 id_white	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
 id_xyz	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
 id_yxy	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
-im_openout	ruby_vips.h	41;"	d
-im_openout	ruby_vips.h	42;"	d
+im_openout	ruby_vips.h	35;"	d
+im_openout	ruby_vips.h	36;"	d
 imask	mask.h	/^  INTMASK *imask;$/;"	m	struct:_vipsMask
 imask2rb	mask.c	/^imask2rb(INTMASK *msk)$/;"	f
 img_abs	image_arithmetic.c	/^img_abs(VALUE obj)$/;"	f
@@ -420,12 +419,11 @@ mask_scale	mask.c	/^mask_scale(VALUE obj)$/;"	f	file:
 mask_to_image	mask.c	/^mask_to_image(VALUE obj)$/;"	f	file:
 mask_xsize	mask.c	/^mask_xsize(VALUE obj)$/;"	f	file:
 mask_ysize	mask.c	/^mask_ysize(VALUE obj)$/;"	f	file:
-png_buf_internal	reader.c	/^png_buf_internal(VALUE obj, VALUE buf)$/;"	f	file:
 png_buf_internal	writer.c	/^png_buf_internal(VALUE obj, VALUE compression, VALUE interlace)$/;"	f	file:
 png_write_internal	writer.c	/^png_write_internal(VALUE obj, VALUE path)$/;"	f	file:
 ppm_write_internal	writer.c	/^ppm_write_internal(VALUE obj, VALUE path)$/;"	f	file:
 raw_read_internal	reader.c	/^raw_read_internal(VALUE obj, VALUE path, VALUE width, VALUE height, VALUE bpp,$/;"	f	file:
-rb_str_new_cstr	ruby_vips.h	34;"	d
+rb_str_new_cstr	ruby_vips.h	28;"	d
 reader_fmt_set	reader.c	/^reader_fmt_set(VALUE klass, const char* val)$/;"	f	file:
 reader_get_fmt_class	reader.c	/^reader_get_fmt_class(VALUE klass)$/;"	f
 reader_read_internal	reader.c	/^reader_read_internal(VALUE obj, VALUE path, VALUE flags)$/;"	f	file:
@@ -435,10 +433,9 @@ ruby_vips_type_map	ruby_vips.c	/^ruby_vips_type_map( GType base, VipsTypeMap2 fn
 tiff_write_internal	writer.c	/^tiff_write_internal(VALUE obj, VALUE path)$/;"	f	file:
 vipsImg	image.h	/^typedef struct _vipsImg vipsImg;$/;"	t	typeref:struct:_vipsImg
 vipsMask	mask.h	/^typedef struct _vipsMask vipsMask;$/;"	t	typeref:struct:_vipsMask
-vips_class_map_concrete_all	ruby_vips.h	50;"	d
+vips_class_map_concrete_all	ruby_vips.h	44;"	d
 vips_lib_error	ruby_vips.c	/^vips_lib_error()$/;"	f
 vips_s_debug_info	ruby_vips.c	/^vips_s_debug_info(VALUE obj)$/;"	f	file:
-vips_s_thread_shutdown	ruby_vips.c	/^vips_s_thread_shutdown(VALUE obj)$/;"	f	file:
 vips_s_version_array	ruby_vips.c	/^vips_s_version_array()$/;"	f	file:
 vips_s_version_string	ruby_vips.c	/^vips_s_version_string()$/;"	f	file:
 vips_write_internal	writer.c	/^vips_write_internal(VALUE obj, VALUE path)$/;"	f	file:

data/ext/writer.c

@@ -248,6 +248,23 @@ png_write_internal(VALUE obj, VALUE path)
 
 /* :nodoc: */
 
+static VALUE
+webp_write_internal(VALUE obj, VALUE path)
+{
+#if ATLEAST_VIPS( 7, 42 )
+    GetImg(obj, data, im);
+
+    if (im_vips2webp(im, RSTRING_PTR(path)))
+        vips_lib_error();
+#else
+    rb_raise(eVIPSError, "This method is not implemented in your version of VIPS");
+#endif
+
+    return obj;
+}
+
+/* :nodoc: */
+
 static VALUE
 csv_write_internal(VALUE obj, VALUE path)
 {
@@ -327,6 +344,13 @@ init_Writer(void)
     rb_define_private_method(png_writer, "write_internal", png_write_internal, 1);
     rb_define_private_method(png_writer, "buf_internal", png_buf_internal, 2);
 
+    /*
+     * Write WebP images.
+     */
+
+    VALUE webp_writer = rb_define_class_under(mVIPS, "WEBPWriter", writer);
+    rb_define_private_method(webp_writer, "write_internal", webp_write_internal, 1);
+
     /*
      * Write CSV images.
      */

data/lib/vips/reader.rb

@@ -214,6 +214,12 @@ module VIPS
     end
   end
 
+  class MagickReader < Reader
+    def read_buffer
+      @_im = buf_internal @path
+    end
+  end
+
   class Image
 
     # Load a ppm file straight to a VIPS Image.

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.3.9"
+  VERSION = "0.3.12"
 end

data/lib/vips/writer.rb

@@ -14,14 +14,14 @@ module VIPS
     # GCing before every write would have a horrible effect on performance, so
     # as a compromise we GC every @@gc_interval writes
 
-    @@gc_interval = 100
+    @@gc_interval = 10
     @@gc_countdown = @@gc_interval
 
     def write_gc(path)
       @@gc_countdown -= 1
       if @@gc_countdown < 0 
         @@gc_countdown = @@gc_interval
-        GC.start
+        GC.start full_mark: false, immediate_sweep: false
       end
 
       write_internal path
@@ -102,6 +102,40 @@ module VIPS
     end
   end
 
+  class WEBPWriter < Writer
+    attr_accessor :quality, :lossless
+
+    def initialize(image, options={})
+      super image
+
+      @quality = 75
+      @lossless = false
+
+      self.quality = options[:quality] if options.has_key?(:quality)
+      self.lossless = options[:lossless] if options.has_key?(:lossless)
+    end
+
+    def write(path)
+      write_gc "#{path}:#{@quality},#{@lossless ? 1 : 0}"
+    end
+
+    def quality=(quality_v)
+      unless (0..100).include?(quality_v)
+        raise ArgumentError, 'quality must be a numeric value between 0 and 100'
+      end
+
+      @quality = quality_v
+    end
+
+    def lossless=(lossless_v)
+      unless [True, False].include?(lossless_v)
+        raise ArgumentError, 'lossless must be a boolean value'
+      end
+
+      @lossless = lossless_v
+    end
+  end
+
   class PPMWriter < Writer
     attr_reader :format
 

data/ruby-vips.gemspec

@@ -2,14 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: ruby-vips 0.3.12 ruby lib
+# stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.3.9"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2014-07-17"
+  s.date = "2016-01-17"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -70,30 +73,26 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/jcupitt/ruby-vips"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--title", "ruby-vips \#{version}", "ext"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   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
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
-      s.add_development_dependency(%q<rdoc-data>, ["~> 4.0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<rdoc>, ["~> 4.1"])
-      s.add_dependency(%q<rdoc-data>, ["~> 4.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rdoc>, ["~> 4.1"])
-    s.add_dependency(%q<rdoc-data>, ["~> 4.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 0.3.9
-  prerelease: 
+  version: 0.3.12
 platform: ruby
 authors:
 - Timothy Elliott
@@ -10,86 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: rdoc-data
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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.
@@ -104,7 +79,9 @@ extra_rdoc_files:
 files:
 - CHANGELOG.md
 - Gemfile.lock
+- LICENSE
 - README.md
+- TODO
 - ext/extconf.rb
 - ext/header.c
 - ext/header.h
@@ -149,38 +126,32 @@ files:
 - lib/vips/writer.rb
 - ruby-vips.gemspec
 - ruby.supp
-- LICENSE
-- TODO
 homepage: http://github.com/jcupitt/ruby-vips
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
-- ! 'ruby-vips #{version}'
+- "--title"
+- 'ruby-vips #{version}'
 - ext
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1056499539870116090
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 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: []