Merge branch 'image_sizing' of https://github.com/themgt/engine into themgt-image_sizing

2011-03-17 17:54:59 +01:00 · 2011-03-17 17:54:59 +01:00 · 630577658d
commit 630577658d
parent 38f828a83a e7b33c807a
1 changed files with 2 additions and 1 deletions
--- a/app/uploaders/asset_uploader.rb
+++ b/app/uploaders/asset_uploader.rb
@ -54,7 +54,8 @@ class AssetUploader < CarrierWave::Uploader::Base

  def set_width_and_height
    if model.image?
-      model.width, model.height = `identify -format "%wx%h" #{file.path}`.split(/x/).collect(&:to_i)
+      magick = ::Magick::Image.read(current_path).first
+      model.width, model.height = magick.columns, magick.rows
    end
  end