Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-27 17:00:52 +01:00
Code Releases Wiki Activity

Removed redundant code in image processing.

Browse Source 
Both paths of the code here did the same thing.
This commit is contained in:
Macil Tech 2012-07-19 00:16:50 -06:00
parent f2d3e45fd3
commit 67ab3760ba
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
post.php
View File

@ -407,34 +407,12 @@ if (isset($_POST['delete'])) {
require_once 'inc/image.php'; require_once 'inc/image.php';
if ($config['thumb_method'] == 'imagick') { // find dimensions of an image using GD
// This is tricky, because Imagick won't let us find if (!$size = @getimagesize($upload)) {
// an image's dimensions without loading it all into error($config['error']['invalidimg']);
// memory first, unlike GD which provides the }
// getimagesize() to do exactly that. This section if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
// is why GD is required, even when using Imagick error($config['error']['maxsize']);
// instead. There doesn't seem to be an alternative.
// Necessary for security, as Imagick even ignores
// PHP's memory limit.
// first try GD's getimagesize()
if ($size = @getimagesize($upload)) {
if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
error($config['error']['maxsize']);
}
} else {
// GD failed
// TODO?
}
} else {
// find dimensions of an image using GD
if (!$size = @getimagesize($upload)) {
error($config['error']['invalidimg']);
}
if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
error($config['error']['maxsize']);
}
} }
// create image object // create image object