Merge pull request #19 from wasinger/master

Remove unneeded code in getOrientation,  add new test image and fixes for it

Author: Miljar

lib/PHPExif/Exif.php

@@ -451,28 +451,6 @@ public function getOrientation()
             return false;
         }
 
-        $value = $this->data[self::ORIENTATION];
-
-        // normalize exiftool strings to raw integer values
-        switch ($value) {
-            case 'Horizontal (normal)':
-                return 1;
-            case 'Mirror horizontal':
-                return 2;
-            case 'Rotate 180':
-                return 3;
-            case 'Mirror vertical':
-                return 4;
-            case 'Mirror horizontal and rotate 270 CW':
-                return 5;
-            case 'Rotate 90 CW':
-                return 6;
-            case 'Mirror horizontal and rotate 90 CW':
-                return 7;
-            case 'Rotate 270 CW':
-                return 8;
-            default:
-                return $value;
-        }
+        return $this->data[self::ORIENTATION];
     }
 }

lib/PHPExif/Reader/Adapter/Native.php

@@ -251,6 +251,17 @@ public function mapData(array $source)
             $vertResolution = (int)reset($resolutionParts);
         }
 
+        $exposureTime = false;
+        if (isset($source['ExposureTime'])) {
+            // normalize ExposureTime
+            // on one test image, it reported "10/300" instead of "1/30"
+            list($counter, $denominator) = explode('/', $source['ExposureTime']);
+            if (intval($counter) !== 1) {
+                $denominator /= $counter;
+            }
+            $exposureTime = '1/' . round($denominator);
+        }
+
         return array(
             Exif::APERTURE              => (!isset($source[self::SECTION_COMPUTED]['ApertureFNumber'])) ? false : $source[self::SECTION_COMPUTED]['ApertureFNumber'],
             Exif::AUTHOR                => (!isset($source['Artist'])) ? false : $source['Artist'],
@@ -260,7 +271,7 @@ public function mapData(array $source)
             Exif::COPYRIGHT             => (!isset($source[self::SECTION_IPTC]['copyright'])) ? false : $source[self::SECTION_IPTC]['copyright'],
             Exif::CREATION_DATE         => (!isset($source['DateTimeOriginal'])) ? false : DateTime::createFromFormat('Y:m:d H:i:s', $source['DateTimeOriginal']),
             Exif::CREDIT                => (!isset($source[self::SECTION_IPTC]['credit'])) ? false : $source[self::SECTION_IPTC]['credit'],
-            Exif::EXPOSURE              => (!isset($source['ExposureTime'])) ? false : $source['ExposureTime'],
+            Exif::EXPOSURE              => $exposureTime,
             Exif::FILESIZE              => (!isset($source[Exif::FILESIZE]) ? false : $source[Exif::FILESIZE]),
             Exif::FOCAL_LENGTH          => $focalLength,
             Exif::FOCAL_DISTANCE        => (!isset($source[self::SECTION_COMPUTED]['FocusDistance'])) ? false : $source[self::SECTION_COMPUTED]['FocusDistance'],
@@ -272,7 +283,7 @@ public function mapData(array $source)
             Exif::KEYWORDS              => (!isset($source[self::SECTION_IPTC]['keywords'])) ? false : $source[self::SECTION_IPTC]['keywords'],
             Exif::MIMETYPE              => (!isset($source[Exif::MIMETYPE]) ? false : $source[Exif::MIMETYPE]),
             Exif::ORIENTATION           => (!isset($source[Exif::ORIENTATION]) ? false : $source[Exif::ORIENTATION]),
-            Exif::SOFTWARE              => (!isset($source['Software'])) ? false : $source['Software'],
+            Exif::SOFTWARE              => (!isset($source['Software'])) ? false : trim($source['Software']),
             Exif::SOURCE                => (!isset($source[self::SECTION_IPTC]['source'])) ? false : $source[self::SECTION_IPTC]['source'],
             Exif::TITLE                 => (!isset($source[self::SECTION_IPTC]['title'])) ? false : $source[self::SECTION_IPTC]['title'],
             Exif::VERTICAL_RESOLUTION   => $vertResolution,

tests/PHPExif/ExifTest.php

@@ -392,40 +392,6 @@ public function testGetOrientation()
         $data[\PHPExif\Exif::ORIENTATION] = $expected;
         $this->exif->setRawData($data);
         $this->assertEquals($expected, $this->exif->getOrientation());
-
-        // test normalization of exiftool strings to raw integer values
-        $expected = 1;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Horizontal (normal)';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 2;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Mirror horizontal';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 3;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Rotate 180';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 4;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Mirror vertical';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 5;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Mirror horizontal and rotate 270 CW';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 6;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Rotate 90 CW';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 7;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Mirror horizontal and rotate 90 CW';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
-        $expected = 8;
-        $data[\PHPExif\Exif::ORIENTATION] = 'Rotate 270 CW';
-        $this->exif->setRawData($data);
-        $this->assertEquals($expected, $this->exif->getOrientation());
     }
 
     /**
@@ -435,25 +401,30 @@ public function testAdapterConsistency()
     {
         $reflClass = new \ReflectionClass('\PHPExif\Exif');
         $methods = $reflClass->getMethods(ReflectionMethod::IS_PUBLIC);
-        $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
+        $testfiles = array(
+            PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg',
+            PHPEXIF_TEST_ROOT . '/files/dsc_5794.jpg'
+        );
 
         $adapter_exiftool = new \PHPExif\Reader\Adapter\Exiftool();
         $adapter_native = new \PHPExif\Reader\Adapter\Native();
 
-        $result_exiftool = $adapter_exiftool->getExifFromFile($file);
-        $result_native = $adapter_native->getExifFromFile($file);
-
-        // find all Getter methods on the results and compare its output
-        foreach ($methods as $method) {
-            $name = $method->getName();
-            if (strpos($name, 'get') !== 0 || $name == 'getRawData') {
-                continue;
+        foreach ($testfiles as $file) {
+            $result_exiftool = $adapter_exiftool->getExifFromFile($file);
+            $result_native = $adapter_native->getExifFromFile($file);
+
+            // find all Getter methods on the results and compare its output
+            foreach ($methods as $method) {
+                $name = $method->getName();
+                if (strpos($name, 'get') !== 0 || $name == 'getRawData') {
+                    continue;
+                }
+                $this->assertEquals(
+                    call_user_func(array($result_native, $name)),
+                    call_user_func(array($result_exiftool, $name)),
+                    'Adapter difference detected in method "' . $name . '" on image "' . basename($file) . '"'
+                );
             }
-            $this->assertEquals(
-                call_user_func(array($result_native, $name)),
-                call_user_func(array($result_exiftool, $name)),
-                'Adapter difference in method ' . $name
-            );
         }
     }
 }