svn commit: r1466775 - in /tika/trunk/tika-parsers: pom.xml src/main/java/org/apache/tika/parser/pdf/PDFParser.java

[dmeikle]

Author: dmeikle
Date: Thu Apr 11 07:10:14 2013
New Revision: 1466775

URL: http://svn.apache.org/r1466775
Log:
TIKA-1104 - Upgraded PDFBox to 1.8.1

Modified:
    tika/trunk/tika-parsers/pom.xml
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java

Modified: tika/trunk/tika-parsers/pom.xml
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1466775&r1=1466774&r2=1466775&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Thu Apr 11 07:10:14 2013
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
-      <version>1.7.1</version>
+      <version>1.8.1</version>
     </dependency>
     <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
          as optional, but we prefer to have them always to avoid

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java?rev=1466775&r1=1466774&r2=1466775&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java 
(original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java 
Thu Apr 11 07:10:14 2013
@@ -36,6 +36,7 @@ import org.apache.pdfbox.pdmodel.PDDocum
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
 import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
+import org.apache.pdfbox.pdmodel.common.COSObjectable;
 import 
org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
 import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
 import org.apache.tika.exception.TikaException;
@@ -177,10 +178,10 @@ public class PDFParser extends AbstractP
                     embeddedExtractor = new 
ParsingEmbeddedDocumentExtractor(context);
                 }
 
-                Map<String,Object> embeddedFileNames = 
embeddedFiles.getNames();
+                Map<String, COSObjectable> embeddedFileNames = 
embeddedFiles.getNames();
 
                 if (embeddedFileNames != null) {
-                    for (Map.Entry<String,Object> ent : 
embeddedFileNames.entrySet()) {
+                    for (Map.Entry<String,COSObjectable> ent : 
embeddedFileNames.entrySet()) {
                         PDComplexFileSpecification spec = 
(PDComplexFileSpecification) ent.getValue();
                         PDEmbeddedFile file = spec.getEmbeddedFile();
 
@@ -278,8 +279,8 @@ public class PDFParser extends AbstractP
      */
     private void addMetadata(Metadata metadata, String name, COSBase value) {
         if(value instanceof COSArray) {
-            for(COSBase v : ((COSArray)value).toList()) {
-                addMetadata(metadata, name, v);
+            for(Object v : ((COSArray)value).toList()) {
+                addMetadata(metadata, name, ((COSBase) v));
             }
         } else if(value instanceof COSString) {
             addMetadata(metadata, name, ((COSString)value).getString());