image_science 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,9 @@
+== 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:

data/Manifest.txt

@@ -4,3 +4,5 @@ README.txt
 Rakefile
 bench.rb
 lib/image_science.rb
+test/pix.png
+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.1.1'
+  VERSION = '1.1.2'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -181,11 +181,16 @@ class ImageScience
     END
 
     builder.c <<-"END"
-      VALUE resize(int w, int h) {
+      VALUE resize(long w, long h) {
+        if (w <= 0) rb_raise(rb_eArgError, "Width <= 0");
+        if (h <= 0) rb_raise(rb_eArgError, "Height <= 0");
         GET_BITMAP(bitmap);
         FIBITMAP *image = FreeImage_Rescale(bitmap, w, h, FILTER_CATMULLROM);
-        copy_icc_profile(self, bitmap, image);
-        return wrap_and_yield(image, self, 0);
+        if (image) {
+          copy_icc_profile(self, bitmap, image);
+          return wrap_and_yield(image, self, 0);
+        }
+        return Qnil;
       }
     END
 
@@ -196,6 +201,7 @@ class ImageScience
         if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) { 
           GET_BITMAP(bitmap);
           int flags = fif == FIF_JPEG ? JPEG_QUALITYSUPERB : 0;
+          if (fif == FIF_PNG) FreeImage_DestroyICCProfile(bitmap);
           return FreeImage_Save(fif, bitmap, output, flags) ? Qtrue : Qfalse;
         }
         rb_raise(rb_eTypeError, "Unknown file format");

data/test/test_image_science.rb

@@ -0,0 +1,124 @@
+require 'test/unit/testcase'
+require 'test/unit' if $0 == __FILE__
+require 'image_science'
+
+class TestImageScience < Test::Unit::TestCase
+  def deny x; assert ! x; end
+
+  def setup
+    @path = 'test/pix.png'
+    @tmppath = 'test/pix-tmp.png'
+    @h = @w = 50
+  end
+
+  def teardown
+    File.unlink @tmppath if File.exist? @tmppath
+  end
+
+  def test_class_with_image
+    ImageScience.with_image @path 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_missing
+    assert_raises TypeError do
+      ImageScience.with_image @path + "nope" do |img|
+        flunk
+      end
+    end
+  end
+
+  def test_class_with_image_missing_with_img_extension
+    assert_nil ImageScience.with_image("nope#{@path}") do |img|
+      flunk
+    end
+  end
+
+  def test_resize
+    ImageScience.with_image @path do |img|
+      img.resize(25, 25) do |thumb|
+        assert thumb.save(@tmppath)
+      end
+    end
+
+    assert File.exists?(@tmppath)
+
+    ImageScience.with_image @tmppath do |img|
+      assert_kind_of ImageScience, img
+      assert_equal 25, img.height
+      assert_equal 25, img.width
+    end
+  end
+
+  def test_resize_floats
+    ImageScience.with_image @path do |img|
+      img.resize(25.2, 25.7) do |thumb|
+        assert thumb.save(@tmppath)
+      end
+    end
+
+    assert File.exists?(@tmppath)
+
+    ImageScience.with_image @tmppath do |img|
+      assert_kind_of ImageScience, img
+      assert_equal 25, img.height
+      assert_equal 25, img.width
+    end
+  end
+
+  def test_resize_zero
+    assert_raises ArgumentError do
+      ImageScience.with_image @path do |img|
+        img.resize(0, 25) do |thumb|
+          assert thumb.save(@tmppath)
+        end
+      end
+    end
+
+    deny File.exists?(@tmppath)
+
+    assert_raises ArgumentError do
+      ImageScience.with_image @path do |img|
+        img.resize(25, 0) do |thumb|
+          assert thumb.save(@tmppath)
+        end
+      end
+    end
+
+    deny File.exists?(@tmppath)
+  end
+
+  def test_resize_negative
+    assert_raises ArgumentError do
+      ImageScience.with_image @path do |img|
+        img.resize(-25, 25) do |thumb|
+          assert thumb.save(@tmppath)
+        end
+      end
+    end
+
+    deny File.exists?(@tmppath)
+
+    assert_raises ArgumentError do
+      ImageScience.with_image @path do |img|
+        img.resize(25, -25) do |thumb|
+          assert thumb.save(@tmppath)
+        end
+      end
+    end
+
+    deny File.exists?(@tmppath)
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0.9
 specification_version: 1
 name: image_science
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-03-08 00:00:00 -08:00
+  version: 1.1.2
+date: 2007-04-18 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
@@ -35,8 +35,10 @@ files:
 - Rakefile
 - bench.rb
 - lib/image_science.rb
-test_files: []
-
+- test/pix.png
+- test/test_image_science.rb
+test_files: 
+- test/test_image_science.rb
 rdoc_options: []
 
 extra_rdoc_files: []