Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7D2CF17AF1 for ; Mon, 23 Mar 2015 17:52:26 +0000 (UTC) Received: (qmail 87097 invoked by uid 500); 23 Mar 2015 17:51:52 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 87077 invoked by uid 500); 23 Mar 2015 17:51:52 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 87064 invoked by uid 99); 23 Mar 2015 17:51:52 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2015 17:51:52 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 02FFBAC0154 for ; Mon, 23 Mar 2015 17:51:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1668690 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Date: Mon, 23 Mar 2015 17:51:51 -0000 To: commits@pdfbox.apache.org From: lehmi@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150323175152.02FFBAC0154@hades.apache.org> Author: lehmi Date: Mon Mar 23 17:51:51 2015 New Revision: 1668690 URL: http://svn.apache.org/r1668690 Log: PDFBOX-2679: don't replace the xref table entries with the brute force results but merge them. Fixed the offset calculation Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1668690&r1=1668689&r2=1668690&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Mon Mar 23 17:51:51 2015 @@ -1172,7 +1172,6 @@ public class COSParser extends BaseParse if (bfSearchCOSObjectKeyOffsets != null && !bfSearchCOSObjectKeyOffsets.isEmpty()) { LOG.debug("Replaced read xref table with the results of a brute force search"); - xrefOffset.clear(); xrefOffset.putAll(bfSearchCOSObjectKeyOffsets); } } @@ -1288,7 +1287,7 @@ public class COSParser extends BaseParse } if (objectID != null) { - bfSearchCOSObjectKeyOffsets.put(new COSObjectKey(objectID, genID), tempOffset); + bfSearchCOSObjectKeyOffsets.put(new COSObjectKey(objectID, genID), tempOffset+1); } } }