Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/changes/1.2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
- ODPresentation Reader : Read differents units for margin by [@Progi1984](https://github.com/Progi1984) fixing [#830](https://github.com/PHPOffice/PHPPresentation/pull/830) in [#847](https://github.com/PHPOffice/PHPPresentation/pull/847)
- PowerPoint2007 Reader : Fixed loading of fonts by [@ag3202](https://github.com/ag3202) and [@Progi1984](https://github.com/Progi1984) in [#851](https://github.com/PHPOffice/PHPPresentation/pull/851)
- PhpOffice\PhpPresentation\Style\TextStyle : Fixed typo for default indent by [@Progi1984](https://github.com/Progi1984) in [#857](https://github.com/PHPOffice/PHPPresentation/pull/857)
- Fixed adding custom SVGs by [@seanlynchwv](http://github.com/seanlynchwv) in [#881](https://github.com/PHPOffice/PHPPresentation/pull/881)

## Miscellaneous
- CI: Added ODFValidator by [@Progi1984](https://github.com/Progi1984) fixing [#678](https://github.com/PHPOffice/PHPWord/issues/678) in [#653](https://github.com/PHPOffice/PHPWord/pull/653)
Expand Down
11 changes: 8 additions & 3 deletions src/PhpPresentation/Writer/PowerPoint2007/ContentTypes.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ public function render(): ZipInterface
// XML
$this->writeDefaultContentType($objWriter, 'xml', 'application/xml');

// SVG
$this->writeDefaultContentType($objWriter, 'svg', 'image/svg+xml');
// SVG will pre-register in $aMediaContentTypes

// Presentation
$this->writeOverrideContentType($objWriter, '/ppt/presentation.xml', 'application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml');
Expand Down Expand Up @@ -106,11 +105,12 @@ public function render(): ZipInterface
// Add media content-types
$aMediaContentTypes = [];

// GIF, JPEG, PNG
// GIF, JPEG, PNG, SVG
$aMediaContentTypes['gif'] = 'image/gif';
$aMediaContentTypes['jpg'] = 'image/jpeg';
$aMediaContentTypes['jpeg'] = 'image/jpeg';
$aMediaContentTypes['png'] = 'image/png';
$aMediaContentTypes['svg'] = 'image/svg+xml';
foreach ($aMediaContentTypes as $key => $value) {
$this->writeDefaultContentType($objWriter, $key, $value);
}
Expand All @@ -133,6 +133,11 @@ public function render(): ZipInterface
$extension = strtolower($shapeIndex->getExtension());
$mimeType = $shapeIndex->getMimeType();

// Normalize any odd returns (some environments report "image/svg")
if ($extension === 'svg') {
$mimeType = 'image/svg+xml';
}

if (!isset($aMediaContentTypes[$extension])) {
$aMediaContentTypes[$extension] = $mimeType;

Expand Down
Loading