image_science 1.2.3 → 1.2.4

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.4 / 2012-11-23
+
+* 1 minor enhancement:
+
+  * Extract out orientation logic and add it to with_image_from_memory. (bhenderson)
+
 === 1.2.3 / 2012-05-07
 
 * 2 bug fixes:

data/Manifest.txt

@@ -6,4 +6,5 @@ bench.rb
 bin/image_science_thumb
 lib/image_science.rb
 test/pix.png
+test/portrait.jpg
 test/test_image_science.rb

data/lib/image_science.rb

@@ -11,7 +11,7 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -149,6 +149,27 @@ class ImageScience
       }
     END
 
+    builder.prefix <<-"END"
+      FIBITMAP* ReOrient(FIBITMAP *bitmap) {
+          FITAG *tagValue = NULL;
+          FreeImage_GetMetadata(FIMD_EXIF_MAIN, bitmap, "Orientation", &tagValue);
+          switch (tagValue == NULL ? 0 : *((short *) FreeImage_GetTagValue(tagValue))) {
+            case 6:
+              bitmap = FreeImage_RotateClassic(bitmap, 270);
+              break;
+            case 3:
+              bitmap = FreeImage_RotateClassic(bitmap, 180);
+              break;
+            case 8:
+              bitmap = FreeImage_RotateClassic(bitmap, 90);
+              break;
+            default:
+             break;
+          }
+          return bitmap;
+      }
+    END
+
     builder.add_to_init "FreeImage_SetOutputMessage(FreeImageErrorHandler);"
 
     builder.c_singleton <<-"END"
@@ -163,22 +184,7 @@ class ImageScience
           VALUE result = Qnil;
           flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
           if ((bitmap = FreeImage_Load(fif, input, flags))) {
-            FITAG *tagValue = NULL;
-            FreeImage_GetMetadata(FIMD_EXIF_MAIN, bitmap, "Orientation", &tagValue); 
-            switch (tagValue == NULL ? 0 : *((short *) FreeImage_GetTagValue(tagValue))) {
-              case 6:
-                bitmap = FreeImage_RotateClassic(bitmap, 270);
-                break;
-              case 3:
-                bitmap = FreeImage_RotateClassic(bitmap, 180);
-                break;
-              case 8:
-                bitmap = FreeImage_RotateClassic(bitmap, 90);
-                break;
-              default:
-               break;
-            }
-
+            bitmap = ReOrient(bitmap);
             result = wrap_and_yield(bitmap, self, fif);
           }
           return result;
@@ -216,6 +222,7 @@ class ImageScience
         bitmap = FreeImage_LoadFromMemory(fif, stream, flags);
         FreeImage_CloseMemory(stream);
         if (bitmap) {
+          bitmap = ReOrient(bitmap);
           result = wrap_and_yield(bitmap, self, fif);
         }
         return result;

data/test/test_image_science.rb

@@ -174,4 +174,18 @@ class TestImageScience < MiniTest::Unit::TestCase
     end
   end
 
+  def test_auto_rotate_from_file
+    ImageScience.with_image "test/portrait.jpg" do |img|
+      assert_equal 50, img.height
+      assert_equal 38, img.width
+    end
+  end
+
+  def test_auto_rotate_from_memory
+    data = File.new("test/portrait.jpg").binmode.read
+    ImageScience.with_image_from_memory data do |img|
+      assert_equal 50, img.height
+      assert_equal 38, img.width
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_science
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-05-07 00:00:00 Z
+date: 2012-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RubyInline
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 4
+        - 3
+        version: "4.3"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -91,11 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id004
 description: |-
@@ -123,6 +123,7 @@ files:
 - bin/image_science_thumb
 - lib/image_science.rb
 - test/pix.png
+- test/portrait.jpg
 - test/test_image_science.rb
 - .gemtest
 homepage: http://seattlerb.rubyforge.org/ImageScience.html
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 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