Merge pull request #561 from scuben/fix-upscale-size

fix upscale size not being calculated correctly

Imagine/Filter/Loader/UpscaleFilterLoader.php

@@ -34,7 +34,7 @@ public function load(ImageInterface $image, array $options = array())
 
             $ratio = $widthRatio > $heightRatio ? $widthRatio : $heightRatio;
 
-            $filter = new Resize(new Box($origWidth * $ratio, $origHeight * $ratio));
+            $filter = new Resize(new Box(round($origWidth * $ratio), round($origHeight * $ratio)));
 
             return $filter->apply($image);
         }

Tests/Imagine/Filter/Loader/FloatToIntCastByRoundUpscaleFilterLoaderTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Liip\ImagineBundle\Tests\Filter;
+
+use Imagine\Gd\Image;
+use Imagine\Gd\Imagine;
+use Liip\ImagineBundle\Imagine\Filter\Loader\UpscaleFilterLoader;
+use Liip\ImagineBundle\Tests\AbstractTest;
+
+/**
+ * @covers Liip\ImagineBundle\Imagine\Filter\Loader\UpscaleFilterLoader
+ *
+ * Due to int casting in Imagine\Image\Box which can lead to wrong pixel
+ * numbers ( e.g. float(201) casted to int(200) ). Solved by round the
+ * floating number before passing to the Box constructor.
+ */
+class FloatToIntCastByRoundUpscaleFilterLoaderTest extends AbstractTest
+{
+    public function testLoad()
+    {
+        $loader = new UpscaleFilterLoader();
+        $imagine = new Imagine();
+        $image = $imagine->open(__DIR__.'/../../../Fixtures/assets/square-50x50.png');
+
+        $options = array(
+            'min' => array(201, 201),
+        );
+
+        $image = $loader->load($image, $options);
+        $size = $image->getSize();
+
+        $this->assertEquals($options['min'], array($size->getWidth(), $size->getHeight()));
+    }
+}