lib/carrierwave/processing/mini_magick.rb in carrierwave-0.5.0 vs lib/carrierwave/processing/mini_magick.rb in carrierwave-0.5.1

@@ -247,14 +247,14 @@
     # === Raises
     #
     # [CarrierWave::ProcessingError] if manipulation failed.
     #
     def manipulate!
-      image = ::MiniMagick::Image.from_file(current_path)
+      image = ::MiniMagick::Image.open(current_path)
       image = yield(image)
       image.write(current_path)
-      ::MiniMagick::Image.from_file(current_path)
-    rescue ::MiniMagick::Error => e
+      ::MiniMagick::Image.open(current_path)
+    rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
       raise CarrierWave::ProcessingError.new("Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: #{e}")
     end
 
   end # MiniMagick
 end # CarrierWave