Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 60656 - EMF image support in slideshows 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1858628 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2019-05-05 01:05:58 +00:00
parent ea0e01acc1
commit 6b69baf2e1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
View File

@ -51,8 +51,7 @@ public class HemfPlusRecordIterator implements Iterator<HemfPlusRecord> {
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;
}

2
src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
View File

@ -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