Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/vendor/gems/paperclip-2.3.4/lib/paperclip/geometry.rb b/vendor/gems/paperclip-2.3.4/lib/paperclip/geometry.rb
- index 2aee324..55cecde 100644
- --- a/vendor/gems/paperclip-2.3.4/lib/paperclip/geometry.rb
- +++ b/vendor/gems/paperclip-2.3.4/lib/paperclip/geometry.rb
- @@ -16,8 +16,7 @@ module Paperclip
- def self.from_file file
- file = file.path if file.respond_to? "path"
- geometry = begin
- - # Paperclip.run("identify", "-format %wx%h :file", :file => "#{file}[0]")
- - Paperclip.run("gm identify", "-format %wx%h :file", :file => "#{file}[0]")
- + Paperclip.run("identify", "-format %wx%h :file", :file => "#{file}[0]")
- rescue PaperclipCommandLineError
- ""
- end
- diff --git a/vendor/gems/paperclip-2.3.4/lib/paperclip/thumbnail.rb b/vendor/gems/paperclip-2.3.4/lib/paperclip/thumbnail.rb
- index 9297545..a158cbd 100644
- --- a/vendor/gems/paperclip-2.3.4/lib/paperclip/thumbnail.rb
- +++ b/vendor/gems/paperclip-2.3.4/lib/paperclip/thumbnail.rb
- @@ -58,8 +58,7 @@ module Paperclip
- parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
- - # success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}[0]", :dest => File.expand_path(dst.path))
- - success = Paperclip.run("gm convert", parameters, :source => "#{File.expand_path(src.path)}[0]", :dest => File.expand_path(dst.path))
- + success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}[0]", :dest => File.expand_path(dst.path))
- rescue PaperclipCommandLineError => e
- raise PaperclipError, "There was an error processing the thumbnail for #{@basename}" if @whiny
- end
- @@ -73,8 +72,7 @@ module Paperclip
- scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
- trans = []
- trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
- - # trans << "-crop" << %["#{crop}"] << "+repage" if crop
- - trans << "-crop" << %["#{crop}"] if crop
- + trans << "-crop" << %["#{crop}"] << "+repage" if crop
- trans
- end
- end
Add Comment
Please, Sign In to add comment