hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

check if tech_datas has Width & Height key

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-11 16:30:53 +01:00
parent 187bff5c18
commit bd986fade3
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/classes/binaryAdapter/image/resize/gd.class.php
View File

@@ -93,13 +93,19 @@ class binaryAdapter_image_resize_gd extends binaryAdapter_processorAbstract
$size = $this->options['size']; $size = $this->options['size'];
if (!is_null($size) && !$origine->is_raw_image() if (
&& $tech_datas[system_file::TC_DATAS_WIDTH] < $size && $tech_datas[system_file::TC_DATAS_HEIGHT] < $size) !is_null($size)
&& isset($tech_datas[system_file::TC_DATAS_WIDTH])
&& isset($tech_datas[system_file::TC_DATAS_HEIGHT])
&& !$origine->is_raw_image()
&& $tech_datas[system_file::TC_DATAS_WIDTH] < $size
&& $tech_datas[system_file::TC_DATAS_HEIGHT] < $size
)
{ {
$size = max($tech_datas[system_file::TC_DATAS_WIDTH], $tech_datas[system_file::TC_DATAS_HEIGHT]); $size = max($tech_datas[system_file::TC_DATAS_WIDTH], $tech_datas[system_file::TC_DATAS_HEIGHT]);
} }
switch($origine->get_mime()) switch ($origine->get_mime())
{ {
case "image/jpeg" : case "image/jpeg" :
$imag_original = imagecreatefromjpeg($origine->getPathname()); $imag_original = imagecreatefromjpeg($origine->getPathname());
@@ -134,8 +140,7 @@ class binaryAdapter_image_resize_gd extends binaryAdapter_processorAbstract
$w_sub = (int) (($w_doc / $h_doc) * ($h_sub = $size)); $w_sub = (int) (($w_doc / $h_doc) * ($h_sub = $size));
$img_mini = imagecreatetruecolor($w_sub, $h_sub); $img_mini = imagecreatetruecolor($w_sub, $h_sub);
imagecopyresampled($img_mini, $imag_original, 0, 0, 0, 0, imagecopyresampled($img_mini, $imag_original, 0, 0, 0, 0, $w_sub, $h_sub, $w_doc, $h_doc);
$w_sub, $h_sub, $w_doc, $h_doc);
} }
if ($this->options['autorotate']) if ($this->options['autorotate'])