From 6b69baf2e1d4e568f329c8c332d39dc503a80d20 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sun, 5 May 2019 01:05:58 +0000 Subject: [PATCH] Bug 60656 - EMF image support in slideshows git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1858628 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java | 3 +-- src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java b/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java index 3cf7076b39..d30ba5d79c 100644 --- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java +++ b/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java @@ -51,8 +51,7 @@ public class HemfPlusRecordIterator implements Iterator { public HemfPlusRecord next() { HemfPlusRecord toReturn = currentRecord; // add the size for recordId/flags/recordSize/dataSize = 12 bytes - final boolean isEOF = (limit == -1 || (leis.getReadIndex()-startIdx)+12 >= limit); - // (currentRecord instanceof HemfPlusMisc.EmfEof) + final boolean isEOF = (limit == -1 || (leis.getReadIndex()-startIdx)+12 > limit); currentRecord = isEOF ? null : _next(); return toReturn; } diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java index 4462370350..a2a7082a35 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java @@ -271,7 +271,7 @@ public class HwmfEscape implements HwmfRecord { } // A 32-bit unsigned integer that defines this record as a WMF Comment record. - int commentIdentifier = leis.readInt(); + commentIdentifier = leis.readInt(); if (commentIdentifier != EMF_COMMENT_IDENTIFIER) { // there are some WMF implementation using this record as a MFCOMMENT or similar