ENGCOM-6261: Relocate Watermark insert on image after resize. #25514 #25528

 - Merge Pull Request #25528 from Krielkip/magento2:bug/25514
 - Merged commits:
   1. 85415ef
   2. 2263d2e

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php

@@ -130,10 +130,12 @@ private function getWatermark(string $type, int $scopeId = null): array
         );
 
         if ($file) {
-            $size = $this->scopeConfig->getValue(
-                "design/watermark/{$type}_size",
-                ScopeInterface::SCOPE_STORE,
-                $scopeId
+            $size = explode(
+                'x',
+                $this->scopeConfig->getValue(
+                    "design/watermark/{$type}_size",
+                    ScopeInterface::SCOPE_STORE
+                )
             );
             $opacity = $this->scopeConfig->getValue(
                 "design/watermark/{$type}_imageOpacity",
@@ -145,8 +147,8 @@ private function getWatermark(string $type, int $scopeId = null): array
                 ScopeInterface::SCOPE_STORE,
                 $scopeId
             );
-            $width = !empty($size['width']) ? $size['width'] : null;
-            $height = !empty($size['height']) ? $size['height'] : null;
+            $width = !empty($size['0']) ? $size['0'] : null;
+            $height = !empty($size['1']) ? $size['1'] : null;
 
             return [
                 'watermark_file' => $file,

app/code/Magento/MediaStorage/Service/ImageResize.php

@@ -311,6 +311,10 @@ private function resize(array $imageParams, string $originalImagePath, string $o
             ]
         );
 
+        if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
+            $image->resize($imageParams['image_width'], $imageParams['image_height']);
+        }
+
         if (isset($imageParams['watermark_file'])) {
             if ($imageParams['watermark_height'] !== null) {
                 $image->setWatermarkHeight($imageParams['watermark_height']);
@@ -331,9 +335,6 @@ private function resize(array $imageParams, string $originalImagePath, string $o
             $image->watermark($this->getWatermarkFilePath($imageParams['watermark_file']));
         }
 
-        if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
-            $image->resize($imageParams['image_width'], $imageParams['image_height']);
-        }
         $image->save($imageAsset->getPath());
 
         if ($this->fileStorageDatabase->checkDbUsage()) {