Merge pull request 'EXIF: add special handling for Pentax Model/Make pollution' (#44) from pentax-exif into master
Reviewed-on: #44 Reviewed-by: Bart Schuurmans <bart@minnozz.com>
This commit is contained in:
commit
8eabc494d9
@ -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']);
|
||||||
|
Loading…
Reference in New Issue
Block a user