write PNG metadata chunks before IEND chunk

Author: Nazar65

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php

@@ -71,11 +71,9 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         }
 
         if (empty($pngIptcSegments)) {
-            $segments[] =  $this->createPngIptcSegment($metadata);
-
             return $this->fileFactory->create([
                 'path' => $file->getPath(),
-                'segments' => $segments
+                'segments' => $this->insertPngIptcSegment($segments, $this->createPngIptcSegment($metadata))
             ]);
         }
 
@@ -89,6 +87,22 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         ]);
     }
 
+    /**
+     * Insert IPTC segment to image png segments before IEND chunk
+     *
+     * @param SegmentInterface[] $segments
+     * @param SegmentInterface $xmpSegment
+     * @return SegmentInterface[]
+     */
+    private function insertPngIptcSegment(array $segments, SegmentInterface $xmpSegment): array
+    {
+        return array_merge(
+            array_slice($segments, 0, count($segments) - 1),
+            [$xmpSegment],
+            array_slice($segments, count($segments) - 1)
+        );
+    }
+
     /**
      * Create new  zTXt segment with metadata
      *

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php

@@ -80,11 +80,9 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         }
 
         if (empty($pngXmpSegments)) {
-            $segments[] = $this->createPngXmpSegment($metadata);
-
             return $this->fileFactory->create([
                 'path' => $file->getPath(),
-                'segments' => $segments
+                'segments' => $this->insertPngXmpSegment($segments, $this->createPngXmpSegment($metadata))
             ]);
         }
 
@@ -98,6 +96,22 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         ]);
     }
 
+    /**
+     * Insert XMP segment to image png segments before IEND chunk
+     *
+     * @param SegmentInterface[] $segments
+     * @param SegmentInterface $xmpSegment
+     * @return SegmentInterface[]
+     */
+    private function insertPngXmpSegment(array $segments, SegmentInterface $xmpSegment): array
+    {
+        return array_merge(
+            array_slice($segments, 0, count($segments) - 1),
+            [$xmpSegment],
+            array_slice($segments, count($segments) - 1)
+        );
+    }
+
     /**
      * Write new png segment  metadata
      *