@@ -53,32 +53,19 @@ module Airbrush def calculate_dimensions(image_data, size) image = Magick::Image.from_blob(image_data).first - return image.columns, image.rows if clipping_required?(image, size) + return image.columns, image.rows unless clipping_required?(image, size) ratio = image.columns.to_f / image.rows.to_f - portrait image do - return [ size, size.to_f / ratio ] - end - - landscape image do - return [ ratio * size, size ] - end + return [ size, size.to_f / ratio ] if ratio > 1 # landscape + + return [ ratio * size, size ] if ratio < 1 # Portrait - # Must be a square image. - return [ size, size ] + return [ size, size ] # Square end def clipping_required?(image, size) - size > image.columns or size > image.rows - end - - def portrait(image, &block) - block.call if image.columns > image.rows - end - - def landscape(image, &block) - block.call if image.columns < image.rows + (image.columns > size) || (image.rows > size) end end lib/airbrush/processors/image/rmagick.rb 744b482ef725e49c06865bd301888e634625c07f Nicolas Marfleet nick@sct.com.au http://github.com/square-circle-triangle/airbrush/commit/cd51d2af20e6360b4cac4db8dc9b392e010b97f9 cd51d2af20e6360b4cac4db8dc9b392e010b97f9 2008-11-30T13:04:26-08:00 2008-11-30T13:04:26-08:00 flipped the clipping_required method around the other way and switched out the portrait/landscape blocks for a simple comparison on the ratio 9a68cf5a55315b092a023f34944bf502c439ea0e Nicolas Marfleet nick@sct.com.au