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

Fix exif_read_data fatal error

Browse Source
This commit is contained in:
John Botella 2019-12-09 14:44:37 +01:00
parent 655574262b
commit e1cf93d9a9
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

@ -323,7 +323,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'])) {
$infoImg = getimagesize($fileSource); // Get image infos $infoImg = getimagesize($fileSource); // Get image infos
@ -456,7 +456,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
$ort = false; $ort = false;
if (function_exists('exif_read_data')) { if (function_exists('exif_read_data')) {
$exif = exif_read_data($filetoread); $exif = @exif_read_data($filetoread);
if ($exif && !empty($exif['Orientation'])) { if ($exif && !empty($exif['Orientation'])) {
$ort = $exif['Orientation']; $ort = $exif['Orientation'];
} }