fix png processing

OpenVK · Jan 10, 2025 · d18c2bb · d18c2bb
1 parent dbd254a
commit d18c2bb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php
@@ -97,19 +97,26 @@ private function saveImageResizedCopies(?\Imagick $image, string $filename, stri
 
     protected function saveFile(string $filename, string $hash): bool
     {
-        $image = new \Imagick;
-        $image->readImage($filename);
-        $h = $image->getImageHeight();
-        $w = $image->getImageWidth();
+        $input_image = new \Imagick;
+        $input_image->readImage($filename);
+        $h = $input_image->getImageHeight();
+        $w = $input_image->getImageWidth();
         if(($h >= ($w * Photo::ALLOWED_SIDE_MULTIPLIER)) || ($w >= ($h * Photo::ALLOWED_SIDE_MULTIPLIER)))
             throw new ISE("Invalid layout: image is too wide/short");
 
+        # gif fix 10.01.2025
+        if($input_image->getImageFormat() === 'GIF')
+            $input_image->setIteratorIndex(0);
+
+        # png workaround (transparency to white)
+        $image = new \Imagick();
+        $bg = new \ImagickPixel('white');
+        $image->newImage($w, $h, $bg);
+        $image->compositeImage($input_image, \Imagick::COMPOSITE_OVER, 0, 0);
+
         $sizes = Image::calculateSize(
             $image->getImageWidth(), $image->getImageHeight(), 8192, 4320, Image::SHRINK_ONLY | Image::FIT
         );
-        # gif fix 10.01.2025
-        if($image->getImageFormat() === 'GIF')
-            $image->setIteratorIndex(0);
 
         $image->resizeImage($sizes[0], $sizes[1], \Imagick::FILTER_HERMITE, 1);
         $image->writeImage($this->pathFromHash($hash));

diff --git a/Web/Presenters/DocumentsPresenter.php b/Web/Presenters/DocumentsPresenter.php
@@ -118,6 +118,8 @@ function renderUpload()
             $this->flashFail("err", tr("forbidden"), tr("error_file_preview"), null, $isAjax);
         } catch(\ValueError $e) {
             $this->flashFail("err", tr("forbidden"), $e->getMessage(), null, $isAjax);
+        } catch(\ImagickException $e) {
+            $this->flashFail("err", tr("forbidden"), tr("error_file_preview"), null, $isAjax);
         }
 
         if(!$isAjax) {