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

Fix if exif not available

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-04 22:19:35 +01:00
parent 553bb728c6
commit a7571054f0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,7 +322,7 @@ function dolRotateImage($file_path)
*/ */
function correctExifImageOrientation($fileSource, $fileDest, $quality = 95) 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'])) {
@ -455,13 +455,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
$imgWidth = $infoImg[0]; // Largeur de l'image $imgWidth = $infoImg[0]; // Largeur de l'image
$imgHeight = $infoImg[1]; // Hauteur de l'image $imgHeight = $infoImg[1]; // Hauteur de l'image
$exif = exif_read_data($filetoread); $ort = false;
$ort= false; if (function_exists('exif_read_data')) {
if ($exif && !empty($exif['Orientation'])) { $exif = exif_read_data($filetoread);
$ort = $exif['Orientation']; if ($exif && !empty($exif['Orientation'])) {
$ort = $exif['Orientation'];
}
} }
if ($maxWidth == -1) $maxWidth=$infoImg[0]; // If size is -1, we keep unchanged if ($maxWidth == -1) $maxWidth=$infoImg[0]; // If size is -1, we keep unchanged
if ($maxHeight == -1) $maxHeight=$infoImg[1]; // If size is -1, we keep unchanged if ($maxHeight == -1) $maxHeight=$infoImg[1]; // If size is -1, we keep unchanged
@ -535,6 +536,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
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)
@ -557,7 +559,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
} }
} }
if($exifAngle) if ($exifAngle)
{ {
$rotated = false; $rotated = false;
@ -581,8 +583,6 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
} }
} }
// Initialisation des dimensions de la vignette si elles sont superieures a l'original // Initialisation des dimensions de la vignette si elles sont superieures a l'original
if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; } if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; }
if($maxHeight > $imgHeight){ $maxHeight = $imgHeight; } if($maxHeight > $imgHeight){ $maxHeight = $imgHeight; }