image_science 1.2.5 → 1.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f4c2bf100b9b9c8b0fc90434c2457f59ad04413
+  data.tar.gz: 27a8915d9d58366d4f780087e6518a75ba97772e
+SHA512:
+  metadata.gz: 14f8f590cc4ff27fd8604b6dfcd6fe0ef38ec3e80ec03a896f79383e2e136d8c12418f6366afa661dbc6a83c5f7bcf17587e7c51d9df70473f37f8001fcb4799
+  data.tar.gz: 65c54429309c45b2547a278b7e0a0d109645392e17f31f7c4af12cebd44b64813624980a111fef2e0ce710f8883978f0c269f04b1c1396954140eeaf04b0737b

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.6 / 2014-01-15
+
+* 1 bug fix:
+
+  * Defer raising exception until wrapped by rb_ensure. (nocode)
+
 === 1.2.5 / 2013-06-20
 
 * 1 bug fix:

data/Rakefile

@@ -8,13 +8,17 @@ Hoe.add_include_dirs("../../RubyInline/dev/lib",
 
 Hoe.plugin :seattlerb
 Hoe.plugin :inline
+Hoe.plugin :isolate
 
 Hoe.spec 'image_science' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  self.rubyforge_name = 'seattlerb'
-
   clean_globs << 'blah*png' << 'images/*_thumb.*'
 end
 
+task :debug => :isolate do
+  file = ENV["F"]
+  ruby "-Ilib bin/image_science_thumb 100 #{file}"
+end
+
 # vim: syntax=Ruby

data/lib/image_science.rb

@@ -11,7 +11,7 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -104,6 +104,8 @@ class ImageScience
 
     builder.prefix <<-"END"
       #define GET_BITMAP(name) Data_Get_Struct(self, FIBITMAP, (name)); if (!(name)) rb_raise(rb_eTypeError, "Bitmap has already been freed");
+      static ID err_key; /* used as thread-local key */
+      static void raise_deferred(void);
     END
 
     builder.prefix <<-"END"
@@ -113,18 +115,29 @@ class ImageScience
 
         FreeImage_Unload(bitmap);
         DATA_PTR(self) = NULL;
+        raise_deferred(); /* raise just in case */
         return Qnil;
       }
     END
 
     builder.prefix <<-"END"
+      static VALUE raise_or_yield(VALUE obj) {
+        /*
+         * check for FreeImage routines which may warn or error out,
+         * do not run user code if there are warnings/errors here:
+         */
+        raise_deferred();
+
+        return rb_yield(obj);
+      }
+
       VALUE wrap_and_yield(FIBITMAP *image, VALUE self, FREE_IMAGE_FORMAT fif) {
         unsigned int self_is_class = rb_type(self) == T_CLASS;
         VALUE klass = self_is_class ? self         : CLASS_OF(self);
         VALUE type  = self_is_class ? INT2FIX(fif) : rb_iv_get(self, "@file_type");
         VALUE obj = Data_Wrap_Struct(klass, NULL, NULL, image);
         rb_iv_set(obj, "@file_type", type);
-        return rb_ensure(rb_yield, obj, unload, obj);
+        return rb_ensure(raise_or_yield, obj, unload, obj);
       }
     END
 
@@ -140,12 +153,28 @@ class ImageScience
       }
     END
 
+    # we defer raising the error until it we find a safe point to do so
+    # We cannot use rb_ensure in these cases because FreeImage may internally
+    # make allocations via which our code will never see.
     builder.prefix <<-"END"
       void FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message) {
-        rb_raise(rb_eRuntimeError,
+        VALUE err = rb_sprintf(
                  "FreeImage exception for type %s: %s",
                   (fif == FIF_UNKNOWN) ? "???" : FreeImage_GetFormatFromFIF(fif),
                   message);
+        rb_thread_local_aset(rb_thread_current(), err_key, err);
+      }
+    END
+
+    # do not call this until necessary variables are wrapped up for GC
+    # otherwise there will be leaks
+    builder.prefix <<-"END"
+      static void raise_deferred(void) {
+        VALUE err = rb_thread_local_aref(rb_thread_current(), err_key);
+        if (!NIL_P(err)) {
+          rb_thread_local_aset(rb_thread_current(), err_key, Qnil);
+          rb_raise(rb_eRuntimeError, "%s", StringValueCStr(err));
+        }
       }
     END
 
@@ -174,6 +203,7 @@ class ImageScience
     END
 
     builder.add_to_init "FreeImage_SetOutputMessage(FreeImageErrorHandler);"
+    builder.add_to_init 'err_key = rb_intern("__FREE_IMAGE_ERROR");'
 
     builder.c_singleton <<-"END"
       VALUE with_image(char * input) {
@@ -190,6 +220,7 @@ class ImageScience
             bitmap = ReOrient(bitmap);
             result = wrap_and_yield(bitmap, self, fif);
           }
+          raise_deferred();
           return result;
         }
         rb_raise(rb_eTypeError, "Unknown file format");
@@ -228,6 +259,7 @@ class ImageScience
           bitmap = ReOrient(bitmap);
           result = wrap_and_yield(bitmap, self, fif);
         }
+        raise_deferred();
         return result;
       }
     END
@@ -242,6 +274,7 @@ class ImageScience
           copy_icc_profile(self, bitmap, copy);
           result = wrap_and_yield(copy, self, 0);
         }
+        raise_deferred();
         return result;
       }
     END
@@ -275,6 +308,7 @@ class ImageScience
           copy_icc_profile(self, bitmap, image);
           return wrap_and_yield(image, self, 0);
         }
+        raise_deferred();
         return Qnil;
       }
     END
@@ -298,6 +332,7 @@ class ImageScience
 
           if (unload) FreeImage_Unload(bitmap);
 
+          raise_deferred();
           return result ? Qtrue : Qfalse;
         }
         rb_raise(rb_eTypeError, "Unknown file format");

metadata

@@ -1,24 +1,18 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: image_science
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 5
-  version: 1.2.5
+version: !ruby/object:Gem::Version
+  version: 1.2.6
 platform: ruby
-authors: 
+authors:
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTEzMDkxNjIzMDQxMloXDTE0MDkxNjIzMDQxMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -28,93 +22,88 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
+  AQCFZ7JTzoy1gcG4d8A6dmOJy7ygtO5MFpRIz8HuKCF5566nOvpy7aHhDDzFmQuu
+  FX3zDU6ghx5cQIueDhf2SGOncyBmmJRRYawm3wI0o1MeN6LZJ/3cRaOTjSFy6+S6
+  zqDmHBp8fVA2TGJtO0BLNkbGVrBJjh0UPmSoGzWlRhEVnYC33TpDAbNA+u39UrQI
+  ynwhNN7YbnmSR7+JU2cUjBFv2iPBO+TGuWC+9L2zn3NHjuc6tnmSYipA9y8Hv+As
+  Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
+  xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-
-date: 2013-06-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: RubyInline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 9
-        version: "3.9"
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 5
-        - 0
-        version: "5.0"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 6
-        version: "3.6"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.8'
 description: |-
   ImageScience is a clean and happy Ruby library that generates
   thumbnails -- and kicks the living crap out of RMagick. Oh, and it
   doesn't leak memory like a sieve. :)
-  
+
   For more information including build steps, see http://seattlerb.rubyforge.org/
-email: 
+email:
 - ryand-ruby@zenspider.com
-executables: 
+executables:
 - image_science_thumb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
+- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -125,40 +114,32 @@ files:
 - test/pix.png
 - test/portrait.jpg
 - test/test_image_science.rb
-- .gemtest
 homepage: http://seattlerb.rubyforge.org/ImageScience.html
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: seattlerb
-rubygems_version: 1.8.25
+rubyforge_project: image_science
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: ImageScience is a clean and happy Ruby library that generates thumbnails -- and kicks the living crap out of RMagick
-test_files: 
+specification_version: 4
+summary: ImageScience is a clean and happy Ruby library that generates thumbnails
+  -- and kicks the living crap out of RMagick
+test_files:
 - test/test_image_science.rb