Fixed padding when current height is greater than target hight

TwinEngineLabs-Engineering · Jul 10, 2011 · fa30791 · fa30791
1 parent 9369e7f
commit fa30791
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/paperclip-ffmpeg.rb b/lib/paperclip-ffmpeg.rb
@@ -80,8 +80,12 @@ def make
               width = target_width.to_i
               height = (width.to_f / (@meta[:aspect].to_f)).to_i
               # We should add half the delta as a padding offset Y
-              pad_y = (target_height.to_f - height.to_f).abs.to_i / 2
-              @convert_options[:vf] = "scale=#{width}:-1,pad=#{width.to_i}:#{target_height.to_i}:0:#{pad_y}:black"
+              pad_y = (target_height.to_f - height.to_f) / 2
+              if pad_y > 0
+                @convert_options[:vf] = "scale=#{width}:-1,pad=#{width.to_i}:#{target_height.to_i}:0:#{pad_y}:black"
+              else
+                @convert_options[:vf] = "scale=#{width}:-1,crop=#{width.to_i}:#{height.to_i}"
+              end
             else
               # Keep aspect ratio
               width = target_width.to_i

diff --git a/paperclip-ffmpeg.gemspec b/paperclip-ffmpeg.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "paperclip-ffmpeg"
-  s.version     = '0.6.3'
+  s.version     = '0.6.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Omar Abdel-Wahab"]
   s.email       = ["owahab@gmail.com"]