image_science 1.1.3 → 1.2.0

data/History.txt

@@ -1,41 +1,70 @@
+== 1.2.0 / 2009-06-23
+
+* 7 minor enhancements:
+
+  *	Moved quick_thumb to bin/image_science_thumb and properly added.
+  * Added -s (square) flag to bin/image_science_thumb
+  * Added autorotating on image load. (choonkeat)
+  * Added ruby_inline to clean globs
+  * Added with_image_from_memory. (sumbach)
+  * Switched to minitest.
+  * Updated rakefile for now hoe capabilities.
+
+* 3 bug fixes:
+
+  * Check and convert to 24 BPP if save type is jpg. Caused by 32bpp png to jpg.
+  * Fixed 1.9isms
+  * Fixed BMP support. Tweaked whitespace.
+
 == 1.1.3 / 2007-05-30
 
 * 2 minor enhancements:
+
   * Added quick_thumb as an example to look at.
   * Error handler doesn't raise by default. Raises if $DEBUG==true.
 
 == 1.1.2 / 2007-04-18
 
 * 2 bug fixes:
+
   * reports bad height/width values for resize
   * explicitly removes ICC color profiles from PNGs (bug in freeimage).
 
 == 1.1.1 / 2007-03-08
 
 * 5 minor enhancements:
+
   * Added error handler that raises with information about what went wrong.
   * thumbnail is now pure ruby, everything now uses resize.
   * Produces cleaner JPEG files, with a small cost to file size/speed.
   * resize now uses Catmull-Rom spline filter for better quality.
   * resize copies existing ICC Profile to thumbnail, producing better color.
   * ICC Profile NOT copied for PNG as it seems to be buggy.
+
 * 1 bug fix:
+
   * Fixed rdoc
 
 == 1.1.0 / 2007-01-05
 
 * 3 major enhancements:
+
   * Added resize(width, height)
   * Added save(path)
   * All thumbnail and resize methods yield instead of saving directly.
+
 * 1 minor enhancement:
+
   * Will now try to use FreeImage from ports if /opt/local exists.
+
 * 2 bug fixes:
+
   * Fixed the linker issue on PPC.
   * Rakefile will now clean the image files created by bench.rb
 
 == 1.0.0 / 2006-12-01
 
 * 1 major enhancement
+
   * Birthday!
 

data/Manifest.txt

@@ -3,7 +3,7 @@ Manifest.txt
 README.txt
 Rakefile
 bench.rb
+bin/image_science_thumb
 lib/image_science.rb
-quick_thumb
 test/pix.png
 test/test_image_science.rb

data/README.txt

@@ -1,7 +1,7 @@
-ImageScience
-    http://seattlerb.rubyforge.org/ImageScience.html
-    http://rubyforge.org/projects/seattlerb
-    by Ryan Davis
+= ImageScience
+
+* http://seattlerb.rubyforge.org/ImageScience.html
+* http://rubyforge.org/projects/seattlerb
 
 == DESCRIPTION:
 
@@ -44,7 +44,7 @@ For more information including build steps, see http://seattlerb.rubyforge.org/
 
 (The MIT License)
 
-Copyright (c) 2006-2007 Ryan Davis, Seattle.rb
+Copyright (c) 2006-2009 Ryan Davis, Seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,16 +2,16 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/image_science.rb'
 
-Hoe.new('image_science', ImageScience::VERSION) do |p|
-  p.rubyforge_name = 'seattlerb'
-  p.description = p.paragraphs_of('README.txt', 2..3).join(" ")
-  p.summary = p.description[/^[^.]+\./]
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1].first.strip
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.extra_deps << 'RubyInline'
-  p.clean_globs << 'blah*png'
+Hoe.plugin :seattlerb
+Hoe.plugin :inline
+
+Hoe.spec 'image_science' do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
+
+  self.rubyforge_name = 'seattlerb'
+
+  clean_globs << 'blah*png' << 'images/*_thumb.*'
 end
 
 # vim: syntax=Ruby

data/{quick_thumb → bin/image_science_thumb}

@@ -1,4 +1,6 @@
-#!/usr/local/bin/ruby -w
+#!/usr/local/bin/ruby -ws
+
+$s ||= false
 
 abort "#{File.basename $0} max_length files..." unless ARGV.size > 1
 
@@ -7,11 +9,13 @@ require 'image_science'
 
 max_length = ARGV.shift.to_i
 
+msg = $s ? :cropped_thumbnail : :thumbnail
+
 ARGV.each do |file|
   begin
     result = ImageScience.with_image file do |img|
       begin
-        img.thumbnail(max_length) do |thumb|
+        img.send(msg, max_length) do |thumb|
           # add _thumb and switch from gif to png. Really. gif just sucks.
           out = file.sub(/(\.[^\.]+)$/, '_thumb\1').sub(/gif$/, 'png')
           thumb.save(out)

data/lib/image_science.rb

@@ -11,7 +11,7 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -19,6 +19,12 @@ class ImageScience
   def self.with_image(path) # :yields: image
   end
 
+  ##
+  # The top-level image loader, opens an image from the string +data+ and then yields the image.
+
+  def self.with_image_from_memory(data) # :yields: image
+  end
+
   ##
   # Crops an image to +left+, +top+, +right+, and +bottom+ and then
   # yields the new image.
@@ -107,8 +113,9 @@ class ImageScience
 
     builder.prefix <<-"END"
       VALUE wrap_and_yield(FIBITMAP *image, VALUE self, FREE_IMAGE_FORMAT fif) {
-        VALUE klass = fif ? self         : CLASS_OF(self);
-        VALUE type  = fif ? INT2FIX(fif) : rb_iv_get(self, "@file_type");
+        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);
@@ -120,8 +127,8 @@ class ImageScience
         FREE_IMAGE_FORMAT fif = FIX2INT(rb_iv_get(self, "@file_type"));
         if (fif != FIF_PNG && FreeImage_FIFSupportsICCProfiles(fif)) {
           FIICCPROFILE *profile = FreeImage_GetICCProfile(from);
-          if (profile && profile->data) { 
-            FreeImage_CreateICCProfile(to, profile->data, profile->size); 
+          if (profile && profile->data) {
+            FreeImage_CreateICCProfile(to, profile->data, profile->size);
           }
         }
       }
@@ -129,7 +136,6 @@ class ImageScience
 
     builder.prefix <<-"END"
       void FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message) {
-        if (! RTEST(ruby_debug)) return;
         rb_raise(rb_eRuntimeError,
                  "FreeImage exception for type %s: %s",
                   (fif == FIF_UNKNOWN) ? "???" : FreeImage_GetFormatFromFIF(fif),
@@ -141,15 +147,31 @@ class ImageScience
 
     builder.c_singleton <<-"END"
       VALUE with_image(char * input) {
-        FREE_IMAGE_FORMAT fif = FIF_UNKNOWN; 
+        FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
 
-        fif = FreeImage_GetFileType(input, 0); 
-        if (fif == FIF_UNKNOWN) fif = FreeImage_GetFIFFromFilename(input); 
-        if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsReading(fif)) { 
+        fif = FreeImage_GetFileType(input, 0);
+        if (fif == FIF_UNKNOWN) fif = FreeImage_GetFIFFromFilename(input);
+        if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsReading(fif)) {
           FIBITMAP *bitmap;
           VALUE result = Qnil;
           int 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;
+            }
+
             result = wrap_and_yield(bitmap, self, fif);
           }
           return result;
@@ -158,6 +180,36 @@ class ImageScience
       }
     END
 
+    builder.c_singleton <<-"END"
+      VALUE with_image_from_memory(VALUE image_data) {
+        FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
+
+        Check_Type(image_data, T_STRING);
+        BYTE *image_data_ptr    = (BYTE*)RSTRING_PTR(image_data);
+        DWORD image_data_length = RSTRING_LEN(image_data);
+        FIMEMORY *stream = FreeImage_OpenMemory(image_data_ptr, image_data_length);
+
+        if (NULL == stream) {
+          rb_raise(rb_eTypeError, "Unable to open image_data");
+        }
+
+        fif = FreeImage_GetFileTypeFromMemory(stream, 0);
+        if ((fif == FIF_UNKNOWN) || !FreeImage_FIFSupportsReading(fif)) {
+          rb_raise(rb_eTypeError, "Unknown file format");
+        }
+
+        FIBITMAP *bitmap = NULL;
+        VALUE result = Qnil;
+        int flags = fif == FIF_JPEG ? JPEG_ACCURATE : 0;
+        bitmap = FreeImage_LoadFromMemory(fif, stream, flags);
+        FreeImage_CloseMemory(stream);
+        if (bitmap) {
+          result = wrap_and_yield(bitmap, self, fif);
+        }
+        return result;
+      }
+    END
+
     builder.c <<-"END"
       VALUE with_crop(int l, int t, int r, int b) {
         FIBITMAP *copy;
@@ -206,11 +258,20 @@ class ImageScience
       VALUE save(char * output) {
         FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(output);
         if (fif == FIF_UNKNOWN) fif = FIX2INT(rb_iv_get(self, "@file_type"));
-        if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) { 
+        if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) {
           GET_BITMAP(bitmap);
           int flags = fif == FIF_JPEG ? JPEG_QUALITYSUPERB : 0;
+          BOOL result = 0, unload = 0;
+
           if (fif == FIF_PNG) FreeImage_DestroyICCProfile(bitmap);
-          return FreeImage_Save(fif, bitmap, output, flags) ? Qtrue : Qfalse;
+          if (fif == FIF_JPEG && FreeImage_GetBPP(bitmap) != 24)
+            bitmap = FreeImage_ConvertTo24Bits(bitmap), unload = 1; // sue me
+
+          result = FreeImage_Save(fif, bitmap, output, flags);
+
+          if (unload) FreeImage_Unload(bitmap);
+
+          return result ? Qtrue : Qfalse;
         }
         rb_raise(rb_eTypeError, "Unknown file format");
       }

data/test/test_image_science.rb

@@ -1,10 +1,17 @@
-require 'test/unit/testcase'
-require 'test/unit' if $0 == __FILE__
-require 'image_science'
+dir = File.expand_path "~/.ruby_inline"
+if test ?d, dir then
+  require 'fileutils'
+  puts "nuking #{dir}"
+  # force removal, Windoze is bitching at me, something to hunt later...
+  FileUtils.rm_r dir, :force => true
+end
 
-class TestImageScience < Test::Unit::TestCase
-  def deny x; assert ! x; end
+require 'rubygems'
+require 'minitest/unit'
+require 'minitest/autorun' if $0 == __FILE__
+require 'image_science'
 
+class TestImageScience < MiniTest::Unit::TestCase
   def setup
     @path = 'test/pix.png'
     @tmppath = 'test/pix-tmp.png'
@@ -46,6 +53,33 @@ class TestImageScience < Test::Unit::TestCase
     end
   end
 
+  def test_class_with_image_from_memory
+    data = File.new(@path).binmode.read
+
+    ImageScience.with_image_from_memory data do |img|
+      assert_kind_of ImageScience, img
+      assert_equal @h, img.height
+      assert_equal @w, img.width
+      assert img.save(@tmppath)
+    end
+
+    assert File.exists?(@tmppath)
+
+    ImageScience.with_image @tmppath do |img|
+      assert_kind_of ImageScience, img
+      assert_equal @h, img.height
+      assert_equal @w, img.width
+    end
+  end
+
+  def test_class_with_image_from_memory_empty_string
+    assert_raises TypeError do
+      ImageScience.with_image_from_memory "" do |img|
+        flunk
+      end
+    end
+  end
+
   def test_resize
     ImageScience.with_image @path do |img|
       img.resize(25, 25) do |thumb|
@@ -87,7 +121,7 @@ class TestImageScience < Test::Unit::TestCase
       end
     end
 
-    deny File.exists?(@tmppath)
+    refute File.exists?(@tmppath)
 
     assert_raises ArgumentError do
       ImageScience.with_image @path do |img|
@@ -97,7 +131,7 @@ class TestImageScience < Test::Unit::TestCase
       end
     end
 
-    deny File.exists?(@tmppath)
+    refute File.exists?(@tmppath)
   end
 
   def test_resize_negative
@@ -109,7 +143,7 @@ class TestImageScience < Test::Unit::TestCase
       end
     end
 
-    deny File.exists?(@tmppath)
+    refute File.exists?(@tmppath)
 
     assert_raises ArgumentError do
       ImageScience.with_image @path do |img|
@@ -119,6 +153,6 @@ class TestImageScience < Test::Unit::TestCase
       end
     end
 
-    deny File.exists?(@tmppath)
+    refute File.exists?(@tmppath)
   end
 end

metadata

@@ -1,74 +1,102 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: image_science
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
-date: 2007-05-30 00:00:00 -04:00
-summary: ImageScience is a clean and happy Ruby library that generates thumbnails -- and kicks the living crap out of RMagick.
-require_paths: 
-- lib
-email: ryand-ruby@zenspider.com
-homepage: http://seattlerb.rubyforge.org/ImageScience.html
-rubyforge_project: seattlerb
-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/
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.2.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ryan Davis
+autorequire: 
+bindir: bin
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  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
+  -----END CERTIFICATE-----
+
+date: 2009-06-23 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+    version: 
+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: 
+- ryand-ruby@zenspider.com
+executables: 
+- image_science_thumb
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
 - bench.rb
+- bin/image_science_thumb
 - lib/image_science.rb
-- quick_thumb
 - test/pix.png
 - test/test_image_science.rb
-test_files: 
-- test/test_image_science.rb
+has_rdoc: true
+homepage: http://seattlerb.rubyforge.org/ImageScience.html
+licenses: []
+
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: RubyInline
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.1
-    version: 
+rubyforge_project: seattlerb
+rubygems_version: 1.3.4
+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: 
+- test/test_image_science.rb

metadata.gz.sig

@@ -0,0 +1,4 @@
+#
+���
+�'��6�@�[ߺk~�V;t��7�����hG��I�q�j_�#�IH�������%���T'���0O������
+(r%��$�