ruby-vips 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977fd4194df253aca0b38025de9dcf563e9050fb
-  data.tar.gz: 6f675830bc3809d3e9b73656607ebc688d8e2cb8
+  metadata.gz: 778544294cf437d6ec6b1e98451846c0a3d6f529
+  data.tar.gz: da2043e2d35d9ecb2186baafd8b4fdd0191d90ee
 SHA512:
-  metadata.gz: ee2eed6adc45832a11c316b136076df8b6a0d7032b9d96cde61ef2fbd21829022e84f8a9b290df432bd36369914f58d92e2edb4c136f3f96fe4d1c1aeb5ec636
-  data.tar.gz: dc22e1b1fdec424250c77f7a08953d5a77c085e116ee875f29cbba8f71d98b1649199f5c7b6d41bb7fa8aef101be187fec55683d3df43d0b19e358e8e04b2bcc
+  metadata.gz: 9c0e6b38cf8210d107113133c6d326f79b1acc12a393c30a094f5625a510081d4f444875d19836cabfd89aa09fe7f1d15b2bd633c9a29ed0ae3c3b09138ea524
+  data.tar.gz: 40017a9f53fb333671758bac8dfd0c1beae876b811962fe1d188044b404bbbfb91070404807fdd5b8327a37cb1aef92d1a3c48bea44b4d87eeec72bdf4a4e06d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## Version 2.0.7 (2017-09-08)
+
+* disable the logging for now, it could deadlock
+
 ## Version 2.0.6 (2017-09-02)
 
 * improve get() behaviour on error with older libvipses

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

data/lib/vips.rb

@@ -71,7 +71,7 @@ module GLib
     end
 
     def self.remove_log_handler
-        if @glib_log_handler_id and @glib_log_domain
+        if @glib_log_handler_id != 0 and @glib_log_domain
             g_log_remove_handler @glib_log_domain, @glib_log_handler_id
             @glib_log_handler_id = nil
         end
@@ -84,15 +84,25 @@ module GLib
 
         # forward all glib logging output from this domain to a Ruby logger
         if @glib_log_domain
-            @glib_log_handler_id = g_log_set_handler @glib_log_domain,
-                LOG_LEVEL_DEBUG | 
-                LOG_LEVEL_INFO | 
-                LOG_LEVEL_MESSAGE | 
-                LOG_LEVEL_WARNING | 
-                LOG_LEVEL_ERROR | 
-                LOG_LEVEL_CRITICAL | 
-                LOG_FLAG_FATAL | LOG_FLAG_RECURSION,
-                LOG_HANDLER, nil
+            # disable this feature for now
+            #
+            # libvips background worker threads can issue warnings, and 
+            # since the main thread is blocked waiting for libvips to come back
+            # from an ffi call, you get a deadlock on the GIL
+            #
+            # to fix this, we need a way for g_log() calls from libvips workers 
+            # to be returned via the main thread
+            #
+
+#             @glib_log_handler_id = g_log_set_handler @glib_log_domain,
+#                 LOG_LEVEL_DEBUG | 
+#                 LOG_LEVEL_INFO | 
+#                 LOG_LEVEL_MESSAGE | 
+#                 LOG_LEVEL_WARNING | 
+#                 LOG_LEVEL_ERROR | 
+#                 LOG_LEVEL_CRITICAL | 
+#                 LOG_FLAG_FATAL | LOG_FLAG_RECURSION,
+#                 LOG_HANDLER, nil
 
             # we must remove any handlers on exit, since libvips may log stuff 
             # on shutdown and we don't want LOG_HANDLER to be invoked 
@@ -366,17 +376,18 @@ require 'vips/gvalue'
 #
 # # Logging
 #
-# The wrapper uses `logger` to log debug, info, warning, and error messages. By
-# default, it will send messages of level `Logger::WARN` and above to `STDOUT`.
+# Libvips uses g_log() to log warning, debug, info and (some) error messages. 
 #
-# You can use the {GLib::logger} accessor to change the log level, or to
-# redirect logging somewhere else. For example:
+# https://developer.gnome.org/glib/stable/glib-Message-Logging.html
+#
+# You can disable wanrings by defining the `VIPS_WARNING` environment variable.
+# You can enable info output by defining `VIPS_INFO`. 
+#
+# # Exceptions
+#
+# The wrapper spots errors from vips operations and raises the {Vips::Error}
+# exception. You can catch it in the usual way. 
 #
-# ```ruby
-# GLib.logger.level = Logger::ERROR
-# GLib.logger = Rails.logger
-# ```
-# 
 # # Automatic YARD documentation
 #
 # The bulk of these API docs are generated automatically by 
@@ -388,11 +399,6 @@ require 'vips/gvalue'
 # docs](https://jcupitt.github.io/libvips/API/current) 
 # for more detail.
 #
-# # Exceptions
-#
-# The wrapper spots errors from vips operations and raises the {Vips::Error}
-# exception. You can catch it in the usual way. 
-#
 # # Enums
 #
 # The libvips enums, such as `VipsBandFormat` appear in ruby-vips as Symbols

data/lib/vips/version.rb

@@ -1,4 +1,4 @@
 module Vips
-    VERSION = "2.0.6"
+    VERSION = "2.0.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - John Cupitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-03 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi