Merge pull request #1463 from magento-borg/MAGETWO-62464

[Borg] Travis fix

Author: pdohogne-magento

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Image\Adapter;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 /**
  * @magentoAppIsolation enabled
  */
@@ -547,11 +545,6 @@ public function cropDataProvider()
      */
     public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expectedColor2, $adapterType)
     {
-        if (!function_exists('imagettfbbox')
-            || (getenv('TRAVIS') && getenv('TRAVIS_PHP_VERSION') == '7.1')
-        ) {
-            $this->markTestSkipped('Workaround for problem with imagettfbbox() function on Travis');
-        }
         $adapter = $this->_getAdapter($adapterType);
 
         /** @var \Magento\Framework\Filesystem\Directory\ReadFactory readFactory */
@@ -564,9 +557,11 @@ public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expe
         $adapter->refreshImageDimensions();
 
         $color1 = $adapter->getColorAt($pixel1['x'], $pixel1['y']);
+        unset($color1['alpha']);
         $this->assertEquals($expectedColor1, $color1);
 
         $color2 = $adapter->getColorAt($pixel2['x'], $pixel2['y']);
+        unset($color2['alpha']);
         $this->assertEquals($expectedColor2, $color2);
     }
 
@@ -580,30 +575,30 @@ public function createPngFromStringDataProvider()
         return [
             [
                 ['x' => 5, 'y' => 8],
-                'expectedColor1' => ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0],
-                ['x' => 0, 'y' => 15],
-                'expectedColor2' => ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127],
+                'expectedColor1' => ['red' => 0, 'green' => 0, 'blue' => 0],
+                ['x' => 0, 'y' => 14],
+                'expectedColor2' => ['red' => 255, 'green' => 255, 'blue' => 255],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_GD2,
             ],
             [
-                ['x' => 4, 'y' => 7],
-                'expectedColor1' => ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0],
-                ['x' => 0, 'y' => 15],
-                'expectedColor2' => ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127],
+                ['x' => 5, 'y' => 12],
+                'expectedColor1' => ['red' => 0, 'green' => 0, 'blue' => 0],
+                ['x' => 0, 'y' => 20],
+                'expectedColor2' => ['red' => 255, 'green' => 255, 'blue' => 255],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_IM
             ],
             [
                 ['x' => 1, 'y' => 14],
-                'expectedColor1' => ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127],
+                'expectedColor1' => ['red' => 255, 'green' => 255, 'blue' => 255],
                 ['x' => 5, 'y' => 12],
-                'expectedColor2' => ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0],
+                'expectedColor2' => ['red' => 0, 'green' => 0, 'blue' => 0],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_GD2
             ],
             [
-                ['x' => 1, 'y' => 14],
-                'expectedColor1' => ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127],
-                ['x' => 4, 'y' => 10],
-                'expectedColor2' => ['red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0],
+                ['x' => 1, 'y' => 20],
+                'expectedColor1' => ['red' => 255, 'green' => 255, 'blue' => 255],
+                ['x' => 5, 'y' => 16],
+                'expectedColor2' => ['red' => 0, 'green' => 0, 'blue' => 0],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_IM
             ]
         ];

lib/internal/Magento/Framework/Image/Adapter/Gd2.php

@@ -737,8 +737,8 @@ protected function _createImageFromText($text)
     protected function _createImageFromTtfText($text, $font)
     {
         $boundingBox = imagettfbbox($this->_fontSize, 0, $font, $text);
-        $width = abs($boundingBox[4]) + abs($boundingBox[0]);
-        $height = abs($boundingBox[5]) + abs($boundingBox[1]);
+        $width = abs($boundingBox[4] - $boundingBox[0]);
+        $height = abs($boundingBox[5] - $boundingBox[1]);
 
         $this->_createEmptyImage($width, $height);
 
@@ -748,7 +748,7 @@ protected function _createImageFromTtfText($text, $font)
             $this->_fontSize,
             0,
             0,
-            $height - abs($boundingBox[1]),
+            $height - $boundingBox[1],
             $black,
             $font,
             $text

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

@@ -434,7 +434,8 @@ public function createPngFromString($text, $font = '')
             }
         }
 
-        $draw->setFontSize($this->_fontSize);
+        // Font size for ImageMagick is set in pixels, while the for GD2 it is in points. 3/4 is ratio between them
+        $draw->setFontSize($this->_fontSize * 4 / 3);
         $draw->setFillColor($color);
         $draw->setStrokeAntialias(true);
         $draw->setTextAntialias(true);