ruby-vips 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7ceeea5a7f3ba540d67ff5940b75229c55195b
-  data.tar.gz: 15ab5c034633a329a591b7db148ab5f2de294442
+  metadata.gz: 614489c8022d27d06892f9980c0df0cca00d7598
+  data.tar.gz: 9c0332039d753a99a4eb526f6b424d6a432c4b6b
 SHA512:
-  metadata.gz: 7a5f515a544a0a09cd68b4faafe23b5e10d06207855826e5a1a09cf0791a1ebf28ba5f2282a1bdc2301aaa21bab39e160c7a11bb76fbbf36370d7551b0b47f45
-  data.tar.gz: d483450c4931f687a7b219890f0ce49ada8f4a56334718b0c123a60a8cafc27aa3c45d5085cb4c2dd394e3bec037b10ac54e3fc595ea8250ca5188bd2a8030a5
+  metadata.gz: c9f73109c2116d56f607e9cee9a01b8bce41d380b223f0e734576a4066184cab9162e514759fcbf36750c6adc30df86467ed1755b9904b6469c66063efee1542
+  data.tar.gz: 12f7e4f9e3af5ead044a1fd9e46a2e080f0e612b34216fe26966c734501dd2633a66417a25144644b96e00440970345939e591503ca660fa76837b6ff365f85d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # master 
 
+# Version 1.0.6
+
+* remove lazy load, fixing a race with fork() [felixbuenemann]
+* make `Image#to_a` much faster [John Cupitt]
+* remove the `at_exit` handler [John Cupitt]
+
 # Version 1.0.5
 
 * fix `_const` for libvips 8.5 [John Cupitt]

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.6

data/lib/vips.rb

@@ -32,6 +32,9 @@ module Vips
     # about as crude as you could get
     $vips_debug = false
 
+    # allow to skip GI autoload
+    $vips_skip_autoload ||= false
+
     # Turn debug logging on and off.
     #
     # @param dbg [Boolean] Set true to print debug log messages
@@ -41,38 +44,8 @@ module Vips
 
     class << self
         # @private
-        def const_missing(name)
-            log "Vips::const_missing: #{name}"
-        
-            init()
-            if const_defined?(name)
-                const_get(name)
-            else
-              super
-            end
-        end
-
-        # @private
-        def method_missing(name, *args, &block)
-            log "Vips::method_missing: #{name}, #{args}, #{block}"
-
-            init()
-            if respond_to?(name)
-                __send__(name, *args, &block)
-            else
-                super
-            end
-        end
-
-        # @private
-        def init(*argv)
-            log "Vips::init: #{argv}"
-
-            class << self
-                remove_method(:init)
-                remove_method(:const_missing)
-                remove_method(:method_missing)
-            end
+        def load_gi_module(*argv)
+            log "Vips::load_gi_module: #{argv}"
 
             loader = Loader.new(self, argv)
             begin
@@ -92,6 +65,11 @@ module Vips
             require 'vips/call'
             require 'vips/image'
             require 'vips/version'
+
+            # Make sure we only get called once.
+            def self.load_gi_module; false; end
+
+            true
         end
     end
 
@@ -139,13 +117,12 @@ module Vips
     end
 end
 
-at_exit {
-    Vips::shutdown if Vips.respond_to? :shutdown
-}
-
 # this makes vips keep a list of all active objects which we can print out
 Vips::leak_set true if $vips_debug
 
+# Initialize GI
+Vips::load_gi_module unless $vips_skip_autoload
+
 # @private
 def showall 
     if $vips_debug

data/lib/vips/image.rb

@@ -982,19 +982,40 @@ module Vips
             end
         end
 
-        # Convert to an Array. This will be very slow for large images. 
+        # Convert to an Array. This will be slow for large images. 
         #
         # @return [Array] array of Fixnum
         def to_a
-            ar = Array.new(height)
-            for y in 0...height
-                ar[y] = Array.new(width)
-                    for x in 0...width
-                        ar[y][x] = getpoint(x, y)
-                    end
-            end
-
-            return ar
+            # we render the image to a big string, then unpack 
+            # as a Ruby array of the correct type
+            memory = write_to_memory.pack('c*')
+
+            # make the template for unpack
+            template = {
+                :char => 'c',
+                :uchar => 'C',
+                :short => 's_',
+                :ushort => 'S_',
+                :int => 'i_',
+                :uint => 'I_',
+                :float => 'f',
+                :double => 'd',
+                :complex => 'f',
+                :dpcomplex => 'd'
+            }[format.nick.to_sym] + '*'
+
+            # and unpack into something like [1, 2, 3, 4 ..]
+            array = memory.unpack(template)
+
+            # gather band elements together
+            pixel_array = []
+            array.each_slice(bands) {|pixel| pixel_array << pixel}
+
+            # build rows 
+            row_array = []
+            pixel_array.each_slice(width) {|row| row_array << row}
+
+            return row_array
         end
 
         # Return the largest integral value not greater than the argument.

data/lib/vips/version.rb

@@ -1,4 +1,4 @@
 module Vips
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - John Cupitt