BUGFIX: Catch values not being arrays despite being standardized as such

neos · Nov 7, 2018 · 8605a1a · 8605a1a
1 parent 5d41675
commit 8605a1a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Classes/Domain/Extractor/ExifExtractor.php b/Classes/Domain/Extractor/ExifExtractor.php
@@ -60,6 +60,7 @@ class ExifExtractor extends AbstractExtractor
         'UndefinedTag:0xA433' => 'LensMake',
         'UndefinedTag:0xA434' => 'LensModel',
         'UndefinedTag:0xA435' => 'LensSerialNumber',
+        'UndefinedTag:0xA500' => 'Gamma',
     ];
 
     /**
@@ -178,8 +179,15 @@ public function extractMetaData(FlowResource $resource, MetaDataCollection $meta
 
         foreach (static::$rationalArrayProperties as $rationalArrayProperty) {
             if (isset($exifData[$rationalArrayProperty])) {
-                foreach ($exifData[$rationalArrayProperty] as $key => $value) {
-                    $exifData[$rationalArrayProperty][$key] = NumberConverter::convertRationalToFloat($value);
+                // Although defined as an array, some implementations only use one rational
+                if (\is_array($exifData[$rationalArrayProperty])) {
+                    foreach ($exifData[$rationalArrayProperty] as $key => $value) {
+                        $exifData[$rationalArrayProperty][$key] = NumberConverter::convertRationalToFloat($value);
+                    }
+                } else {
+                    $exifData[$rationalArrayProperty] = NumberConverter::convertRationalToFloat(
+                        $exifData[$rationalArrayProperty]
+                    );
                 }
             }
         }