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

Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal

Browse Source 
Fix warning introduce by my #12605 PR #12622
This commit is contained in:
Laurent Destailleur 2019-12-09 15:57:24 +01:00 committed by GitHub
commit c8f457f303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)
{
if (function_exists('exif_read_data')) {
$exif = exif_read_data($fileSource);
$exif = @exif_read_data($fileSource);
if ($exif && isset($exif['Orientation'])) {
$infoImg = getimagesize($fileSource); // Get image infos
@ -456,7 +456,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
$ort = false;
if (function_exists('exif_read_data')) {
$exif = exif_read_data($filetoread);
$exif = @exif_read_data($filetoread);
if ($exif && !empty($exif['Orientation'])) {
$ort = $exif['Orientation'];
}