Skip to content

Fix new iTxt && zTxt segment creation for PNG image XMP && IPTC segments #29475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 15, 2020
Merged

Fix new iTxt && zTxt segment creation for PNG image XMP && IPTC segments #29475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bb1ba14
Fix new iTxt segment creation for PNG image XMP segment
Nazar65 Aug 11, 2020
a156298
write PNG metadata chunks before IEND chunk
Nazar65 Aug 11, 2020
f7e9830
Correct variable names
Nazar65 Aug 11, 2020
dd9a41f
Merge branch '2.4-develop' into ASI-1743
Nazar65 Aug 11, 2020
f165c8f
Code review improvements
Nazar65 Aug 13, 2020
e0f3252
Merge branch 'ASI-1743' of https://github.com/Nazar65/magento2 into A…
Nazar65 Aug 13, 2020
f3d831d
Fix typos
Nazar65 Aug 13, 2020
a9fda1e
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
Nazar65 Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
]);
}

Expand All @@ -89,6 +87,24 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
]);
}

/**
* Insert IPTC segment to image png segments before IEND chunk
*
* @param SegmentInterface[] $segments
* @param SegmentInterface $iptcSegment
* @return SegmentInterface[]
*/
private function insertPngIptcSegment(array $segments, SegmentInterface $iptcSegment): array
{
$iendSegmentIndex = count($segments) - 1;

return array_merge(
array_slice($segments, 0, $iendSegmentIndex),
[$iptcSegment],
array_slice($segments, $iendSegmentIndex)
);
}

/**
* Create new zTXt segment with metadata
*
Expand Down
9 changes: 7 additions & 2 deletions app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,20 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
}

/**
* Insert XMP segment to image png segments (at position 1)
* 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, 2), [$xmpSegment], array_slice($segments, 2));
$iendSegmentIndex = count($segments) - 1;
return array_merge(
array_slice($segments, 0, $iendSegmentIndex),
[$xmpSegment],
array_slice($segments, $iendSegmentIndex)
);
}

/**
Expand Down