Fix binary problems with JAR files.

gomoob · Aug 9, 2016 · 2258cf3 · 2258cf3
1 parent 0651127
commit 2258cf3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -13,3 +13,8 @@
 /phpunit.xml export-ignore
 
 * text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.gif binary
+*.png binary
+*.jpg binary
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ install:
   - composer install
 
 script:
-  - ls /home/travis/build/gomoob/php-metadata-extractor/src/main/resources/jars/metadata-extractor-2.9.1.jar
+  - ls /home/travis/build/gomoob/php-metadata-extractor/src/main/resources/jars
   - java -classpath '/home/travis/build/gomoob/php-metadata-extractor/src/main/resources/jars/metadata-extractor-2.9.1.jar' com.drew.imaging.ImageMetadataReader '/home/travis/build/gomoob/php-metadata-extractor/src/test/resources/elephant.jpg'
   - java -classpath /home/travis/build/gomoob/php-metadata-extractor/src/main/resources/jars/metadata-extractor-2.9.1.jar com.drew.imaging.ImageMetadataReader '/home/travis/build/gomoob/php-metadata-extractor/src/test/resources/elephant.jpg'
   - grunt

diff --git a/src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php b/src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php
@@ -92,7 +92,8 @@ public static function readMetadata($file)
 
                 // Otherwise create and configure a new directory
                 if (!$directory) {
-                    var_dump($directoryName);
+
+                	// var_dump($directoryName);
 
                     $directory = static::createDirectoryWithName($directoryName);
 
@@ -182,7 +183,7 @@ private static function addTagToDirectory(Directory $directory, $tagLine)
                     break;
                 case 'Y Resolution':
                     $directory->setRational(
-                        ExifIFD0Directory::TAG_X_RESOLUTION,
+                        ExifIFD0Directory::TAG_Y_RESOLUTION,
                         new Rational(intval(static::parseDotsString($nameAndDescription[1])), 1)
                     );
                     break;

diff --git a/src/main/resources/jars/metadata-extractor-2.9.1.jar b/src/main/resources/jars/metadata-extractor-2.9.1.jar
diff --git a/src/test/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader/NikonE990Test.php b/src/test/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader/NikonE990Test.php
@@ -33,6 +33,10 @@ public function testReadMetadata()
         $this->assertSame(300, $rational->getNumerator());
         $this->assertSame(1, $rational->getDenominator());
 
+        $rational = $directory->getRational(ExifIFD0Directory::TAG_Y_RESOLUTION);
+        $this->assertSame(300, $rational->getNumerator());
+        $this->assertSame(1, $rational->getDenominator());
+
         // TODO: Continue testing
     }
 }