MC-30296: Product image is not visible if a watermark image size is larger

Author: Oleksandr Iegorov

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

@@ -442,6 +442,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             $this->_getCallback('create', $watermarkFileType, 'Unsupported watermark image format.'),
             $imagePath
         );
+        //$watermark = $this->prepareWatermark($watermark, $watermarkFileType);
 
         $merged = false;
 
@@ -599,6 +600,49 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
         $this->refreshImageDimensions();
     }
 
+    /**
+     * @param resource $watermark
+     * @param string $watermarkFileType
+     * @return resource
+     */
+    private function prepareWatermark($watermark, $watermarkFileType)
+    {
+        if (imagesx($watermark) > $this->_imageSrcWidth
+            || imagesy($watermark) > $this->_imageSrcHeight) {
+            $widthRatio = imagesx($watermark)/$this->_imageSrcWidth;
+            $heightRatio = imagesy($watermark)/$this->_imageSrcHeight;
+            $newWidth = ($widthRatio > $heightRatio)
+                ? round(imagesx($watermark)/$widthRatio) : round(imagesx($watermark)/$heightRatio);
+            $newHeight = ($widthRatio > $heightRatio)
+                ? round(imagesy($watermark)/$widthRatio) : round(imagesy($watermark)/$heightRatio);
+            $isAlpha = false;
+            $isTrueColor = false;
+            $this->_getTransparency($watermark, $watermarkFileType, $isAlpha, $isTrueColor);
+            if ($isTrueColor) {
+                $newImage = imagecreatetruecolor($newWidth, $newHeight);
+            } else {
+                $newImage = imagecreate($newWidth, $newHeight);
+            }
+            if ($isAlpha) {
+                $this->_saveAlpha($newImage);
+            }
+            imagecopyresampled(
+                $newImage,
+                $watermark,
+                0,
+                0,
+                0,
+                0,
+                $newWidth,
+                $newHeight,
+                imagesx($watermark),
+                imagesy($watermark)
+            );
+            $watermark = $newImage;
+        }
+        return $watermark;
+    }
+
     /**
      * Crop image
      *
@@ -859,6 +903,10 @@ private function imagecopymergeWithAlphaFix(
             return false;
         }
 
+        if (false === imagesavealpha($tmpImg, true)) {
+            return false;
+        }
+
         if (false === imagecopy($tmpImg, $src_im, 0, 0, 0, 0, $sizeX, $sizeY)) {
             return false;
         }
@@ -868,6 +916,14 @@ private function imagecopymergeWithAlphaFix(
             return false;
         }
 
+        if (false === imagealphablending($dst_im, true)) {
+            return false;
+        }
+
+        if (false === imagesavealpha($dst_im, true)) {
+            return false;
+        }
+
         $result = imagecopy($dst_im, $tmpImg, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);
         imagedestroy($tmpImg);