core/includes/image.inc | 34 ++++----- core/modules/image/image.effects.inc | 6 +- core/modules/image/image.test | 130 ++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 23 deletions(-) diff --git a/core/includes/image.inc b/core/includes/image.inc index 8dc36b9..d696725 100644 --- a/core/includes/image.inc +++ b/core/includes/image.inc @@ -192,8 +192,8 @@ function image_scale_and_crop(stdClass $image, $width, $height) { * The target height, in pixels. This value is omitted then the scaling will * based only on the width value. * @param $upscale - * Boolean indicating that files smaller than the dimensions will be scaled - * up. This generally results in a low quality image. + * Boolean indicating that images smaller than the target dimensions will be + * scaled up. This generally results in a low quality image. * * @return * TRUE if $dimensions was modified, FALSE otherwise. @@ -203,31 +203,27 @@ function image_scale_and_crop(stdClass $image, $width, $height) { function image_dimensions_scale(array &$dimensions, $width = NULL, $height = NULL, $upscale = FALSE) { $aspect = $dimensions['height'] / $dimensions['width']; - if ($upscale) { - // Set width/height according to aspect ratio if either is empty. - $width = !empty($width) ? $width : $height / $aspect; - $height = !empty($height) ? $height : $width / $aspect; + // Calculate one of the dimensions from the other target dimension, + // ensuring the same aspect ratio as the source dimensions. If one of the + // target dimensions is missing, that is the one that is calculated. If both + // are specified then the dimension is chosen that would otherwise be bigger + // than it's target. + if (($width && !$height) || ($width && $height && $aspect < $height / $width)) { + $height = (int) round($width * $aspect); } else { - // Set impossibly large values if the width and height aren't set. - $width = !empty($width) ? $width : 9999999; - $height = !empty($height) ? $height : 9999999; + $width = (int) round($height / $aspect); + } + if (!$upscale) { // Don't scale up. - if (round($width) >= $dimensions['width'] && round($height) >= $dimensions['height']) { + if ($width >= $dimensions['width'] && $height >= $dimensions['height']) { return FALSE; } } - if ($aspect < $height / $width) { - $dimensions['width'] = $width; - $dimensions['height'] = (int) round($width * $aspect); - } - else { - $dimensions['width'] = (int) round($height / $aspect); - $dimensions['height'] = $height; - } - + $dimensions['width'] = $width; + $dimensions['height'] = $height; return TRUE; } diff --git a/core/modules/image/image.effects.inc b/core/modules/image/image.effects.inc index ea898f9..35a6a74 100644 --- a/core/modules/image/image.effects.inc +++ b/core/modules/image/image.effects.inc @@ -124,13 +124,11 @@ function image_resize_dimensions(array &$dimensions, array $data) { function image_scale_effect(&$image, $data) { // Set sane default values. $data += array( + 'width' => NULL, + 'height' => NULL, 'upscale' => FALSE, ); - // Set impossibly large values if the width and height aren't set. - $data['width'] = empty($data['width']) ? PHP_INT_MAX : $data['width']; - $data['height'] = empty($data['height']) ? PHP_INT_MAX : $data['height']; - if (!image_scale($image, $data['width'], $data['height'], $data['upscale'])) { watchdog('image', 'Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); return FALSE; diff --git a/core/modules/image/image.test b/core/modules/image/image.test index a29b4f3..3bb905c 100644 --- a/core/modules/image/image.test +++ b/core/modules/image/image.test @@ -1129,3 +1129,133 @@ class ImageDimensionsUnitTest extends DrupalWebTestCase { $this->assertEqual($img_tag, '', t('Expected img tag was found.')); } } + +/** + * Tests image_dimensions_scale(). + */ +class ImageDimensionsScaleTestCase extends DrupalUnitTestCase { + public static function getInfo() { + return array( + 'name' => 'image_dimensions_scale()', + 'description' => 'Tests all control flow branches in image_dimensions_scale().', + 'group' => 'Image', + ); + } + + /** + * Tests all control flow branches in image_dimensions_scale(). + */ + function testImageDimensionsScale() { + + // no height + // don't scale up, don't need to scale up + $tests[] = array( + 'input' => array( + 'dimensions' => array( + 'width' => 1000, + 'height' => 800, + ), + 'width' => 200, + 'height' => NULL, + 'upscale' => FALSE, + ), + 'output' => array( + 'dimensions' => array( + 'width' => 200, + 'height' => 160, + ), + 'return_value' => TRUE, + ), + ); + + // no width + // scale up, don't need to scale up + $tests[] = array( + 'input' => array( + 'dimensions' => array( + 'width' => 1000, + 'height' => 800, + ), + 'width' => NULL, + 'height' => 140, + 'upscale' => TRUE, + ), + 'output' => array( + 'dimensions' => array( + 'width' => 175, + 'height' => 140, + ), + 'return_value' => TRUE, + ), + ); + + // keep width + // scale up, need to scale up + $tests[] = array( + 'input' => array( + 'dimensions' => array( + 'width' => 100, + 'height' => 50, + ), + 'width' => 200, + 'height' => 140, + 'upscale' => TRUE, + ), + 'output' => array( + 'dimensions' => array( + 'width' => 200, + 'height' => 100, + ), + 'return_value' => TRUE, + ), + ); + + // keep height + $tests[] = array( + 'input' => array( + 'dimensions' => array( + 'width' => 1000, + 'height' => 800, + ), + 'width' => 200, + 'height' => 140, + 'upscale' => FALSE, + ), + 'output' => array( + 'dimensions' => array( + 'width' => 175, + 'height' => 140, + ), + 'return_value' => TRUE, + ), + ); + + // don't scale up, need to scale up + $tests[] = array( + 'input' => array( + 'dimensions' => array( + 'width' => 100, + 'height' => 50, + ), + 'width' => 200, + 'height' => 140, + 'upscale' => FALSE, + ), + 'output' => array( + 'dimensions' => array( + 'width' => 100, + 'height' => 50, + ), + 'return_value' => FALSE, + ), + ); + + foreach ($tests as $test) { + $return_value = image_dimensions_scale($test['input']['dimensions'], $test['input']['width'], $test['input']['height'], $test['input']['upscale']); + + $this->assertEqual($test['output']['dimensions']['width'], $test['input']['dimensions']['width'], t('Correct width.')); + $this->assertEqual($test['output']['dimensions']['height'], $test['input']['dimensions']['height'], t('Correct height.')); + $this->assertEqual($test['output']['return_value'], $return_value, t('Correct return value.')); + } + } +}