This should fix png files with transparency in the Xls reader (#2155)

* This should fix png files with transparency in the Xls reader
PHPOffice · Jun 11, 2021 · 9c2ce22 · 9c2ce22
1 parent 05466e9
commit 9c2ce22
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2775,11 +2775,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Reader/Xls.php
 
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\MemoryDrawing\\:\\:setImageResource\\(\\) expects GdImage\\|resource, resource\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xls.php
-
 		-
 			message: "#^Parameter \\#1 \\$pValue of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\BaseDrawing\\:\\:setOffsetX\\(\\) expects int, float\\|int given\\.$#"
 			count: 1

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
@@ -17,6 +17,7 @@
 use PhpOffice\PhpSpreadsheet\Shared\OLE;
 use PhpOffice\PhpSpreadsheet\Shared\OLERead;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Shared\Xls as SharedXls;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
@@ -1102,12 +1103,12 @@ public function load(string $pFilename, int $flags = 0)
                     $endOffsetX = $spContainer->getEndOffsetX();
                     $endOffsetY = $spContainer->getEndOffsetY();
 
-                    $width = \PhpOffice\PhpSpreadsheet\Shared\Xls::getDistanceX($this->phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
-                    $height = \PhpOffice\PhpSpreadsheet\Shared\Xls::getDistanceY($this->phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
+                    $width = SharedXls::getDistanceX($this->phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
+                    $height = SharedXls::getDistanceY($this->phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
 
                     // calculate offsetX and offsetY of the shape
-                    $offsetX = $startOffsetX * \PhpOffice\PhpSpreadsheet\Shared\Xls::sizeCol($this->phpSheet, $startColumn) / 1024;
-                    $offsetY = $startOffsetY * \PhpOffice\PhpSpreadsheet\Shared\Xls::sizeRow($this->phpSheet, $startRow) / 256;
+                    $offsetX = $startOffsetX * SharedXls::sizeCol($this->phpSheet, $startColumn) / 1024;
+                    $offsetY = $startOffsetY * SharedXls::sizeRow($this->phpSheet, $startRow) / 256;
 
                     switch ($obj['otObjType']) {
                         case 0x19:
@@ -1143,31 +1144,35 @@ public function load(string $pFilename, int $flags = 0)
                                 // need check because some blip types are not supported by Escher reader such as EMF
                                 if ($blip = $BSE->getBlip()) {
                                     $ih = imagecreatefromstring($blip->getData());
-                                    $drawing = new MemoryDrawing();
-                                    $drawing->setImageResource($ih);
-
-                                    // width, height, offsetX, offsetY
-                                    $drawing->setResizeProportional(false);
-                                    $drawing->setWidth($width);
-                                    $drawing->setHeight($height);
-                                    $drawing->setOffsetX($offsetX);
-                                    $drawing->setOffsetY($offsetY);
-
-                                    switch ($blipType) {
-                                        case BSE::BLIPTYPE_JPEG:
-                                            $drawing->setRenderingFunction(MemoryDrawing::RENDERING_JPEG);
-                                            $drawing->setMimeType(MemoryDrawing::MIMETYPE_JPEG);
-
-                                            break;
-                                        case BSE::BLIPTYPE_PNG:
-                                            $drawing->setRenderingFunction(MemoryDrawing::RENDERING_PNG);
-                                            $drawing->setMimeType(MemoryDrawing::MIMETYPE_PNG);
-
-                                            break;
-                                    }
+                                    if ($ih !== false) {
+                                        $drawing = new MemoryDrawing();
+                                        $drawing->setImageResource($ih);
+
+                                        // width, height, offsetX, offsetY
+                                        $drawing->setResizeProportional(false);
+                                        $drawing->setWidth($width);
+                                        $drawing->setHeight($height);
+                                        $drawing->setOffsetX($offsetX);
+                                        $drawing->setOffsetY($offsetY);
+
+                                        switch ($blipType) {
+                                            case BSE::BLIPTYPE_JPEG:
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_JPEG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_JPEG);
+
+                                                break;
+                                            case BSE::BLIPTYPE_PNG:
+                                                imagealphablending($ih, false);
+                                                imagesavealpha($ih, true);
+                                                $drawing->setRenderingFunction(MemoryDrawing::RENDERING_PNG);
+                                                $drawing->setMimeType(MemoryDrawing::MIMETYPE_PNG);
+
+                                                break;
+                                        }
 
-                                    $drawing->setWorksheet($this->phpSheet);
-                                    $drawing->setCoordinates($spContainer->getStartCoordinates());
+                                        $drawing->setWorksheet($this->phpSheet);
+                                        $drawing->setCoordinates($spContainer->getStartCoordinates());
+                                    }
                                 }
                             }