fastimage_resize 2.0.2 → 2.0.3

data/README.textile

@@ -39,6 +39,8 @@ h2. Examples
 </code>
 </pre>
 
+Giving a zero value for width or height causes the image to scale proportionately.
+
 h2. Installation
 
 First check the requirements section below.

data/lib/fastimage_resize.rb

@@ -44,6 +44,8 @@ class FastImage
   #
   # FastImage Resize can resize GIF, JPEG and PNG files.
   #
+  # Giving a zero value for width or height causes the image to scale proportionately.
+  #
   # === Example
   #
   #   require 'fastimage_resize'
@@ -77,13 +79,14 @@ class FastImage
 
     if !file_out
       temp_file = Tempfile.new([name, ".#{FILE_EXTENSIONS[type_index]}"])
+      temp_file.binmode
       file_out = temp_file.path
     else
       temp_file = nil
     end
 
     in_path = file_in.respond_to?(:path) ? file_in.path : file_in
-    
+
     fast_image.resize_image(in_path, file_out.to_s, w.to_i, h.to_i, type_index, jpeg_quality.to_i)
 
     if file_in.respond_to?(:close)
@@ -101,6 +104,7 @@ class FastImage
   # returns readable tempfile
   def self.read_to_local(readable)
     temp = Tempfile.new(name)
+    temp.binmode
     temp.write(readable.read)
     temp.close
     temp.open
@@ -122,13 +126,10 @@ class FastImage
         in = fopen(filename_in, "rb");
         if (!in) return Qnil;
 
-        im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
         switch(image_type) {
           case 0: im_in = gdImageCreateFromJpeg(in);
                   break;
           case 1: im_in = gdImageCreateFromPng(in);
-                  gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
-                  gdImageSaveAlpha(im_out, 1);
                   break;
           case 2: im_in = gdImageCreateFromGif(in);
                   trans = gdImageGetTransparent(im_in);
@@ -150,6 +151,23 @@ class FastImage
                   break;
           default: return Qnil;
         }
+
+        if (w == 0 || h == 0) {
+          int originalWidth  = gdImageSX(im_in);
+          int originalHeight = gdImageSY(im_in);
+          if (w == 0) {
+            w = (int)(h * originalWidth / originalHeight);
+          } else {
+            h = (int)(w * originalHeight / originalWidth);
+          }
+        }
+
+        im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
+
+        if (image_type == 1) {
+          gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
+          gdImageSaveAlpha(im_out, 1);
+        }
         
         fclose(in);
         

data/test/test.rb

@@ -136,4 +136,26 @@ class FastImageResizeTest < Test::Unit::TestCase
     outfile = FastImage.resize(File.join(FixturePath, "test.png"), 200, 200)
     assert outfile.path =~ /\.png$/
   end
+
+  def test_zero_width_scales_proportionately
+    GoodFixtures.each do |fn, info|
+      File.open(File.join(FixturePath, fn)) do |io|
+        halfHeight = (info[1][1] / 2).round
+        outfile = FastImage.resize(io, 0, halfHeight)
+        newWidth = (halfHeight * info[1][0] / info[1][1]).round
+        assert_equal [newWidth, halfHeight], FastImage.size(outfile)
+      end
+    end
+  end
+
+  def test_zero_height_scales_proportionately
+    GoodFixtures.each do |fn, info|
+      File.open(File.join(FixturePath, fn)) do |io|
+        halfWidth =  (info[1][0] / 2).round
+        outfile = FastImage.resize(io, halfWidth, 0)
+        newHeight = (halfWidth * info[1][1] / info[1][0]).round
+        assert_equal [halfWidth, newHeight], FastImage.size(outfile)
+      end
+    end
+  end
 end

metadata

@@ -1,65 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fastimage_resize
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 2
-  version: 2.0.2
+version: !ruby/object:Gem::Version
+  version: 2.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-15 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: RubyInline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 3
-        - 8
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.8.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fastimage
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.8.2
+- !ruby/object:Gem::Dependency
+  name: fastimage
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :runtime
-  version_requirements: *id002
-description: FastImage Resize is an extremely light solution for resizing images in ruby by using libgd.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+description: FastImage Resize is an extremely light solution for resizing images in
+  ruby by using libgd.
 email: sdsykes@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - README.textile
-files: 
+files:
 - README
 - README.textile
 - Rakefile
@@ -72,39 +64,31 @@ files:
 - test/fixtures/test.jpg
 - test/fixtures/test.png
 - test/test.rb
-has_rdoc: true
 homepage: http://github.com/sdsykes/fastimage_resize
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - libgd, see www.libgd.org
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: FastImage Resize - Image resizing fast and simple
-test_files: 
+test_files:
 - test/test.rb