carrierwave-vips 0.9.1 → 0.9.9

data/lib/carrierwave/vips.rb

@@ -181,40 +181,36 @@ module CarrierWave
   private
     
     def resize_image(image, width, height, min_or_max = :min)
-      
       ratio = get_ratio image, width, height, min_or_max
-
       if jpeg? # find the shrink ratio for loading
-        shrink_factors = [8,4,2,1]
-        shrink_factor = nil
-        shrink_factors.each { |sf| shrink_factor = sf if ratio < 1.0 / sf }
-        shrink_factor ||= shrink_factors[-1]
-        image = VIPS::Image.jpeg current_path, shrink_factor: shrink_factor, sequential: true
+        shrink_factor = [8, 4, 2, 1].find {|sf| 1.0 / ratio >= sf }
+        shrink_factor = 1 if shrink_factor == nil
+        image = VIPS::Image.jpeg current_path, 
+            :shrink_factor => shrink_factor, :sequential => true
         ratio = get_ratio image, width, height, min_or_max
       elsif png?
         image = VIPS::Image.png current_path, :sequential => true
       end
-      
       if ratio > 1
         image = image.affinei_resize :nearest, ratio
-      elsif ratio < 1
+      else
         if ratio <= 0.5
-          image = image.shrink((1/ratio).floor)
+          factor = (1.0 / ratio).floor
+          image = image.shrink(factor)
+          image = image.tile_cache(image.x_size, 1, 30)
           ratio = get_ratio image, width, height, min_or_max
         end
         image = image.affinei_resize :bilinear, ratio unless ratio == 1
-        image = image.tile_cache(image.x_size, 1, 30)
         image = image.conv SHARPEN_MASK
       end
-      
       image
-    
     end
     
     def get_ratio(image, width,height, min_or_max = :min)
       width_ratio = width.to_f / image.x_size
       height_ratio = height.to_f / image.y_size
-      [width_ratio, height_ratio].send(min_or_max)
+      ratio = [width_ratio, height_ratio].send(min_or_max)
+      ratio
     end
 
     def jpeg?(path = current_path)
@@ -224,7 +220,6 @@ module CarrierWave
     def png?(path = current_path)
       path =~ /.*png$/i
     end
-    
 
   end # Vips
 end # CarrierWave

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-vips
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Adds VIPS support to CarrierWave
 email: eltiare@github.com