lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# WARNING: head commit changed in the meantime

Browse Source 
Restore file for travis
This commit is contained in:
Laurent Destailleur 2019-12-06 08:11:23 +01:00
parent 2e2c9562e8
commit f74e1f8fa3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/images.lib.php
View File

@ -325,7 +325,6 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
if (function_exists('exif_read_data')) { if (function_exists('exif_read_data')) {
$exif = exif_read_data($fileSource); $exif = exif_read_data($fileSource);
if ($exif && isset($exif['Orientation'])) { if ($exif && isset($exif['Orientation'])) {
$infoImg = getimagesize($fileSource); // Get image infos $infoImg = getimagesize($fileSource); // Get image infos
$orientation = $exif['Orientation']; $orientation = $exif['Orientation'];
@ -531,12 +530,13 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
$extImg = '.bmp'; $extImg = '.bmp';
break; break;
} }
if (! is_resource($img)) if (! is_resource($img))
{ {
dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
return 0; return 0;
} }
$exifAngle = false; $exifAngle = false;
if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) { if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
switch($ort) switch($ort)