Skip to content

Commit 74c4b5a

Browse files
authored
Merge pull request #7430 from magento-amigos/AC-1356
AC-1356: Integration test crashes php when using GD library 2.3.3
2 parents 57b0fd3 + 3b2ceae commit 74c4b5a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function _prepareData($data)
6363
*/
6464
protected function _getFixtureImageSize()
6565
{
66-
return [311, 162];
66+
return [311, 175];
6767
}
6868

6969
/**
@@ -595,7 +595,7 @@ protected function _prepareColor($pixel, $position, $adapter)
595595
break;
596596
case \Magento\Framework\Image\Adapter\AbstractAdapter::POSITION_TOP_LEFT:
597597
$pixel['x'] = 1;
598-
$pixel['y'] = 1;
598+
$pixel['y'] = 10;
599599
break;
600600
case \Magento\Framework\Image\Adapter\AbstractAdapter::POSITION_TOP_RIGHT:
601601
$pixel['x'] = $adapter->getOriginalWidth() - 1;
Loading

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function save($destination = null, $newName = null)
163163
*/
164164
protected function _applyOptions()
165165
{
166-
$this->_imageHandler->setImageCompressionQuality($this->quality());
166+
$this->_imageHandler->setImageCompressionQuality((int)$this->quality());
167167
$this->_imageHandler->setImageCompression(\Imagick::COMPRESSION_JPEG);
168168
$this->_imageHandler->setImageUnits(\Imagick::RESOLUTION_PIXELSPERINCH);
169169
$this->_imageHandler->setImageResolution(

0 commit comments

Comments
 (0)