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,7 +442,6 @@ 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;
 
@@ -600,49 +599,6 @@ 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
      *
@@ -866,8 +822,9 @@ protected function _createEmptyImage($width, $height)
      * @param int $src_w
      * @param int $src_h
      * @param int $pct
-     *
      * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function imagecopymergeWithAlphaFix(
         $dst_im,