[tika] branch master updated: Fix for TIKA-2954 contributed by chriszappia (#284)

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new 375caca  Fix for TIKA-2954 contributed by chriszappia (#284)
375caca is described below

commit 375cacaac06ca079535499085db84493f0f9ea35
Author: Chris <chriszap...@users.noreply.github.com>
AuthorDate: Thu Oct 24 05:10:02 2019 +1100

    Fix for TIKA-2954 contributed by chriszappia (#284)
---
 .../java/org/apache/tika/parser/image/ImageMetadataExtractor.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
 
b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
index 1e293c0..aeb0223 100644
--- 
a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
+++ 
b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
@@ -41,6 +41,7 @@ import com.drew.lang.Rational;
 import com.drew.metadata.Directory;
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.Tag;
+import com.drew.metadata.exif.ExifDirectoryBase;
 import com.drew.metadata.exif.ExifIFD0Directory;
 import com.drew.metadata.exif.ExifReader;
 import com.drew.metadata.exif.ExifSubIFDDirectory;
@@ -301,10 +302,8 @@ public class ImageMetadataExtractor {
 
         public void handle(Directory directory, Metadata metadata)
                 throws MetadataException {
-            //TODO: after upgrading metadataextractor, swap out
-            //magic number with ExifDirectoryBase.TAG_PAGE_NUMBER
-            if (directory.containsTag(297)) {
-                int[] pageNums = directory.getIntArray(297);
+            if (directory.containsTag(ExifDirectoryBase.TAG_PAGE_NUMBER)) {
+                int[] pageNums = 
directory.getIntArray(ExifDirectoryBase.TAG_PAGE_NUMBER);
                 //pages can be in any order, take the max
                 if (pageNums != null && pageNums.length > 1) {
                     Integer curr = metadata.getInt(TIFF.EXIF_PAGE_COUNT);