Skip to content

Use php image type detection in openImage() method #14

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use php image type detection in openImage() method #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 29 additions & 21 deletions php_image_magician.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2354,34 +2354,42 @@ private function openImage($file)

if (!file_exists($file) && !$this->checkStringStartsWith('http://', $file)) { if ($this->debug) { die('Image not found.'); }else{ die(); }};

// *** Get extension
$extension = strrchr($file, '.');
$extension = strtolower($extension);
$img = false;

switch($extension)
{
case '.jpg':
case '.jpeg':
$img = @imagecreatefromjpeg($file);
break;
case '.gif':
$img = @imagecreatefromgif($file);
break;
case '.png':
$img = @imagecreatefrompng($file);
break;
case '.bmp':
$info = getimagesize($file);
switch ($info[2]) {
case IMAGETYPE_JPEG:
$img = @imagecreatefromjpeg($file);
break;
case IMAGETYPE_PNG:
$img = @imagecreatefrompng($file);
break;
case IMAGETYPE_GIF:
$img = @imagecreatefromgif($file);
break;
case IMAGETYPE_WBMP:
$img = @$this->imagecreatefrombmp($file);
break;
default:
$img = false;
break;
}

if (!$img) {
// *** Get extension
$extension = strrchr($file, '.');
$extension = fix_strtolower($extension);
switch ($extension) {
case '.bmp':
$img = @$this->imagecreatefrombmp($file);
break;
case '.psd':
case '.psd':
$img = @$this->imagecreatefrompsd($file);
break;

// ... etc

default:
default:
$img = false;
break;
}
}

return $img;
Expand Down