image_science 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f4c2bf100b9b9c8b0fc90434c2457f59ad04413
-  data.tar.gz: 27a8915d9d58366d4f780087e6518a75ba97772e
+  metadata.gz: fb44497f07164016d9a369ec83065816b3a7d837
+  data.tar.gz: 6c5fdaa3fd0a82bfb2decd4542601ab063dac965
 SHA512:
-  metadata.gz: 14f8f590cc4ff27fd8604b6dfcd6fe0ef38ec3e80ec03a896f79383e2e136d8c12418f6366afa661dbc6a83c5f7bcf17587e7c51d9df70473f37f8001fcb4799
-  data.tar.gz: 65c54429309c45b2547a278b7e0a0d109645392e17f31f7c4af12cebd44b64813624980a111fef2e0ce710f8883978f0c269f04b1c1396954140eeaf04b0737b
+  metadata.gz: 26db89c63f7a24c5b72fadc9eae287c171fe5c81e9cb5cde0af95bbffdcb92dcffb4545e3219581d940ae74845f7a7f2df617210a14161c33c2afa23e0d7bbf0
+  data.tar.gz: a3710d72afbe244c133abbde96f9794e750132c6f641cb00a3c212103447aed3f3c46c503a635000d041532642bde4d0e09936d7df3dde20575132d2dc9f35ba

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.3.0 / 2016-05-16
+
+* 1 minor enhancement:
+
+  * Add rotate method. (bhenderson)
+
+* 1 bug fix:
+
+  * Fixed error-raising behaviour. (omp)
+
 === 1.2.6 / 2014-01-15
 
 * 1 bug fix:

data/Rakefile

@@ -13,6 +13,8 @@ Hoe.plugin :isolate
 Hoe.spec 'image_science' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
+  license "MIT"
+
   clean_globs << 'blah*png' << 'images/*_thumb.*'
 end
 

data/lib/image_science.rb

@@ -11,7 +11,7 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.2.6'
+  VERSION = '1.3.0'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -52,6 +52,11 @@ class ImageScience
   #
   # :method: resize
 
+  ##
+  # Rotate the image to +angle+. Limited to 45 degree skewing only.
+  #
+  # :method: rotate
+
   ##
   # Creates a proportional thumbnail of the image scaled so its longest
   # edge is resized to +size+ and yields the new image.
@@ -105,7 +110,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);
+      static void clear_error(void);
+      static void raise_error(void);
     END
 
     builder.prefix <<-"END"
@@ -115,29 +121,19 @@ class ImageScience
 
         FreeImage_Unload(bitmap);
         DATA_PTR(self) = NULL;
-        raise_deferred(); /* raise just in case */
+        clear_error();
         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(raise_or_yield, obj, unload, obj);
+        return rb_ensure(rb_yield, obj, unload, obj);
       }
     END
 
@@ -169,15 +165,25 @@ class ImageScience
     # 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) {
+      static void raise_error(void) {
         VALUE err = rb_thread_local_aref(rb_thread_current(), err_key);
-        if (!NIL_P(err)) {
+        if (NIL_P(err)) {
+          rb_raise(rb_eRuntimeError, "FreeImage exception");
+        } else {
           rb_thread_local_aset(rb_thread_current(), err_key, Qnil);
           rb_raise(rb_eRuntimeError, "%s", StringValueCStr(err));
         }
       }
     END
 
+    builder.prefix <<-"END"
+      static void clear_error(void) {
+        if (!NIL_P(rb_thread_local_aref(rb_thread_current(), err_key))) {
+          rb_thread_local_aset(rb_thread_current(), err_key, Qnil);
+        }
+      }
+    END
+
     builder.prefix <<-"END"
       FIBITMAP* ReOrient(FIBITMAP *bitmap) {
         FITAG *tagValue = NULL;
@@ -216,11 +222,11 @@ class ImageScience
           FIBITMAP *bitmap;
           VALUE result = Qnil;
           flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
-          if ((bitmap = FreeImage_Load(fif, input, flags))) {
-            bitmap = ReOrient(bitmap);
-            result = wrap_and_yield(bitmap, self, fif);
-          }
-          raise_deferred();
+
+          if (!(bitmap = FreeImage_Load(fif, input, flags))) raise_error();
+          if (!(bitmap = ReOrient(bitmap))) raise_error();
+
+          result = wrap_and_yield(bitmap, self, fif);
           return result;
         }
         rb_raise(rb_eTypeError, "Unknown file format");
@@ -249,17 +255,18 @@ class ImageScience
 
         fif = FreeImage_GetFileTypeFromMemory(stream, 0);
         if ((fif == FIF_UNKNOWN) || !FreeImage_FIFSupportsReading(fif)) {
+          FreeImage_CloseMemory(stream);
           rb_raise(rb_eTypeError, "Unknown file format");
         }
 
         flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
         bitmap = FreeImage_LoadFromMemory(fif, stream, flags);
         FreeImage_CloseMemory(stream);
-        if (bitmap) {
-          bitmap = ReOrient(bitmap);
-          result = wrap_and_yield(bitmap, self, fif);
-        }
-        raise_deferred();
+
+        if (!bitmap) raise_error();
+        if (!(bitmap = ReOrient(bitmap))) raise_error();
+
+        result = wrap_and_yield(bitmap, self, fif);
         return result;
       }
     END
@@ -267,15 +274,12 @@ class ImageScience
     builder.c <<-"END"
       VALUE with_crop(int l, int t, int r, int b) {
         FIBITMAP *copy, *bitmap;
-        VALUE result = Qnil;
         GET_BITMAP(bitmap);
 
-        if ((copy = FreeImage_Copy(bitmap, l, t, r, b))) {
-          copy_icc_profile(self, bitmap, copy);
-          result = wrap_and_yield(copy, self, 0);
-        }
-        raise_deferred();
-        return result;
+        if (!(copy = FreeImage_Copy(bitmap, l, t, r, b))) raise_error();
+
+        copy_icc_profile(self, bitmap, copy);
+        return wrap_and_yield(copy, self, 0);
       }
     END
 
@@ -303,12 +307,25 @@ class ImageScience
         if (w <= 0) rb_raise(rb_eArgError, "Width <= 0");
         if (h <= 0) rb_raise(rb_eArgError, "Height <= 0");
         GET_BITMAP(bitmap);
+
         image = FreeImage_Rescale(bitmap, w, h, FILTER_CATMULLROM);
+        if (!image) raise_error();
+
+        copy_icc_profile(self, bitmap, image);
+        return wrap_and_yield(image, self, 0);
+      }
+    END
+
+    builder.c <<-"END"
+      VALUE rotate(int angle) {
+        FIBITMAP *bitmap, *image;
+        if ((angle % 45) != 0) rb_raise(rb_eArgError, "Angle must be 45 degree skew");
+        GET_BITMAP(bitmap);
+        image = FreeImage_RotateClassic(bitmap, angle);
         if (image) {
           copy_icc_profile(self, bitmap, image);
           return wrap_and_yield(image, self, 0);
         }
-        raise_deferred();
         return Qnil;
       }
     END
@@ -325,15 +342,16 @@ class ImageScience
           flags = fif == FIF_JPEG ? JPEG_QUALITYSUPERB : 0;
 
           if (fif == FIF_PNG) FreeImage_DestroyICCProfile(bitmap);
-          if (fif == FIF_JPEG && FreeImage_GetBPP(bitmap) != 24)
+          if (fif == FIF_JPEG && FreeImage_GetBPP(bitmap) != 24) {
             bitmap = FreeImage_ConvertTo24Bits(bitmap), unload = 1; // sue me
+            if (!bitmap) raise_error();
+          }
 
           result = FreeImage_Save(fif, bitmap, output, flags);
-
           if (unload) FreeImage_Unload(bitmap);
+          if (!result) raise_error();
 
-          raise_deferred();
-          return result ? Qtrue : Qfalse;
+          return Qtrue;
         }
         rb_raise(rb_eTypeError, "Unknown file format");
         return Qnil;

data/test/test_image_science.rb

@@ -30,7 +30,7 @@ class TestImageScience < Minitest::Test
       assert img.save(@tmppath)
     end
 
-    assert File.exists?(@tmppath)
+    assert File.exist?(@tmppath)
 
     ImageScience.with_image @tmppath do |img|
       assert_kind_of ImageScience, img
@@ -65,7 +65,7 @@ class TestImageScience < Minitest::Test
       assert img.save(@tmppath)
     end
 
-    assert File.exists?(@tmppath)
+    assert File.exist?(@tmppath)
 
     ImageScience.with_image @tmppath do |img|
       assert_kind_of ImageScience, img
@@ -89,7 +89,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    assert File.exists?(@tmppath)
+    assert File.exist?(@tmppath)
 
     ImageScience.with_image @tmppath do |img|
       assert_kind_of ImageScience, img
@@ -105,7 +105,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    assert File.exists?(@tmppath)
+    assert File.exist?(@tmppath)
 
     ImageScience.with_image @tmppath do |img|
       assert_kind_of ImageScience, img
@@ -123,7 +123,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    refute File.exists?(@tmppath)
+    refute File.exist?(@tmppath)
 
     assert_raises ArgumentError do
       ImageScience.with_image @path do |img|
@@ -133,7 +133,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    refute File.exists?(@tmppath)
+    refute File.exist?(@tmppath)
   end
 
   def test_resize_negative
@@ -145,7 +145,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    refute File.exists?(@tmppath)
+    refute File.exist?(@tmppath)
 
     assert_raises ArgumentError do
       ImageScience.with_image @path do |img|
@@ -155,7 +155,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    refute File.exists?(@tmppath)
+    refute File.exist?(@tmppath)
   end
 
   def test_thumbnail
@@ -165,7 +165,7 @@ class TestImageScience < Minitest::Test
       end
     end
 
-    assert File.exists?(@tmppath)
+    assert File.exist?(@tmppath)
 
     ImageScience.with_image @tmppath do |img|
       assert_kind_of ImageScience, img
@@ -188,4 +188,23 @@ class TestImageScience < Minitest::Test
       assert_equal 38, img.width
     end
   end
+
+  def test_rotate
+    ImageScience.with_image "test/portrait.jpg" do |image|
+      image.rotate 90 do |img|
+        assert_equal 50, img.width
+        assert_equal 38, img.height
+      end
+    end
+  end
+
+  def test_rotate_not_45
+    e = assert_raises ArgumentError do
+      ImageScience.with_image "test/portrait.jpg" do |image|
+        image.rotate 44
+      end
+    end
+
+    assert_equal 'Angle must be 45 degree skew', e.message
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_science
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTEzMDkxNjIzMDQxMloXDTE0MDkxNjIzMDQxMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQCFZ7JTzoy1gcG4d8A6dmOJy7ygtO5MFpRIz8HuKCF5566nOvpy7aHhDDzFmQuu
-  FX3zDU6ghx5cQIueDhf2SGOncyBmmJRRYawm3wI0o1MeN6LZJ/3cRaOTjSFy6+S6
-  zqDmHBp8fVA2TGJtO0BLNkbGVrBJjh0UPmSoGzWlRhEVnYC33TpDAbNA+u39UrQI
-  ynwhNN7YbnmSR7+JU2cUjBFv2iPBO+TGuWC+9L2zn3NHjuc6tnmSYipA9y8Hv+As
-  Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
-  xx3n58i0lQkBE1EpKE0lFu/y
+  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
+  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
+  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
+  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
+  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
+  NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RubyInline
@@ -45,20 +45,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
-  prerelease: false
-  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
@@ -79,14 +65,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.15'
 description: |-
   ImageScience is a clean and happy Ruby library that generates
   thumbnails -- and kicks the living crap out of RMagick. Oh, and it
@@ -103,7 +89,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
-- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -135,11 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: image_science
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
 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
+test_files: []