ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed masking of image extensions' exceptions

Browse source
This commit is contained in:
rr- 2015-09-06 22:57:53 +02:00
parent 48bb4fc803
commit 180252cc64
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Services/ImageManipulation/GdImageManipulator.php
View file

@ -5,14 +5,7 @@ class GdImageManipulator implements IImageManipulator
{ {
public function loadFromBuffer($source) public function loadFromBuffer($source)
{ {
try return imagecreatefromstring($source);
{
return imagecreatefromstring($source);
}
catch (\Exception $e)
{
return null;
}
} }
public function getImageWidth($imageResource) public function getImageWidth($imageResource)

17
src/Services/ImageManipulation/ImagickImageManipulator.php
View file

@ -5,18 +5,11 @@ class ImagickImageManipulator implements IImageManipulator
{ {
public function loadFromBuffer($source) public function loadFromBuffer($source)
{ {
try $image = new \Imagick();
{ $image->readImageBlob($source);
$image = new \Imagick(); if ($image->getImageFormat() == 'GIF')
$image->readImageBlob($source); $image = $image->coalesceImages();
if ($image->getImageFormat() == 'GIF') return $image;
$image = $image->coalesceImages();
return $image;
}
catch (\Exception $e)
{
return null;
}
} }
public function getImageWidth($imageResource) public function getImageWidth($imageResource)