You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/05/05 01:05:58 UTC
svn commit: r1858628 - in /poi/trunk/src/scratchpad/src/org/apache/poi:
hemf/record/emfplus/HemfPlusRecordIterator.java hwmf/record/HwmfEscape.java
Author: kiwiwings
Date: Sun May 5 01:05:58 2019
New Revision: 1858628
URL: http://svn.apache.org/viewvc?rev=1858628&view=rev
Log:
Bug 60656 - EMF image support in slideshows
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java?rev=1858628&r1=1858627&r2=1858628&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java Sun May 5 01:05:58 2019
@@ -51,8 +51,7 @@ public class HemfPlusRecordIterator impl
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;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java?rev=1858628&r1=1858627&r2=1858628&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java Sun May 5 01:05:58 2019
@@ -271,7 +271,7 @@ public class HwmfEscape implements HwmfR
}
// 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org