Merge branch 'master' of github.com:Retrospring/retrospring

This commit is contained in:
Yuki 2015-07-21 07:44:39 +05:30
commit a192082a2b
2 changed files with 3 additions and 4 deletions

View File

@ -18,4 +18,4 @@ Guidelines for Pull Requests and general information about how you can help us i
## License ## License
AGPLv3. [AGPLv3](https://github.com/Retrospring/retrospring/blob/master/LICENSE).

View File

@ -16,12 +16,11 @@ module Paperclip
if target.cropping? if target.cropping?
case @attachment.name case @attachment.name
when :profile_picture when :profile_picture
['-crop', "'#{target.crop_w.to_i}x#{target.crop_h.to_i}+#{target.crop_x.to_i}+#{target.crop_y.to_i}'"] ['-auto-orient', '-strip', '+repage', '-crop', "'#{target.crop_w.to_i}x#{target.crop_h.to_i}+#{target.crop_x.to_i}+#{target.crop_y.to_i}'"]
when :profile_header when :profile_header
['-crop', "'#{target.crop_h_w.to_i}x#{target.crop_h_h.to_i}+#{target.crop_h_x.to_i}+#{target.crop_h_y.to_i}'"] ['-auto-orient', '-strip', '+repage', '-crop', "'#{target.crop_h_w.to_i}x#{target.crop_h_h.to_i}+#{target.crop_h_x.to_i}+#{target.crop_h_y.to_i}'"]
end end
end end
end end
end end
end end