Joost/pics
1
0
Fork 0
forked from Public/pics
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'EXIF: add special handling for Pentax Model/Make pollution' (#44) from pentax-exif into master

Browse Source 
Reviewed-on: Public/pics#44
Reviewed-by: Bart Schuurmans <bart@minnozz.com>
This commit is contained in:
Bart Schuurmans 2024-01-13 17:22:44 +01:00
commit 8eabc494d9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/EXIF.php
View File

@ -90,7 +90,9 @@ class EXIF
if (!empty($exif['Model'])) if (!empty($exif['Model']))
{ {
if (!empty($exif['Make']) && strpos($exif['Model'], $exif['Make']) === false) if (strpos($exif['Model'], 'PENTAX') !== false)
$meta['camera'] = trim($exif['Model']);
elseif (!empty($exif['Make']) && strpos($exif['Model'], $exif['Make']) === false)
$meta['camera'] = trim($exif['Make']) . ' ' . trim($exif['Model']); $meta['camera'] = trim($exif['Make']) . ' ' . trim($exif['Model']);
else else
$meta['camera'] = trim($exif['Model']); $meta['camera'] = trim($exif['Model']);