Author: fanningpj
Date: Fri Aug 19 09:02:15 2022
New Revision: 1903560
URL: http://svn.apache.org/viewvc?rev=1903560&view=rev
Log:
more int narrowing
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java?rev=1903560&r1=1903559&r2=1903560&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
Fri Aug 19 09:02:15 2022
@@ -709,7 +709,7 @@ public class HemfPlusBrush {
// that appears at the center point of the brush. The color of the
brush changes gradually from the
// boundary color to the center color as it moves from the
boundary to the center point.
centerColor = readARGB(leis.readInt());
- int size = 3*LittleEndianConsts.INT_SIZE;
+ long size = 3*LittleEndianConsts.INT_SIZE;
if (wrapMode == null) {
return size;
@@ -785,7 +785,7 @@ public class HemfPlusBrush {
size += 3*LittleEndianConsts.INT_SIZE;
}
- return size;
+ return Math.toIntExact(size);
}
@Override
@@ -846,7 +846,7 @@ public class HemfPlusBrush {
// across a shape, when the image is smaller than the area being
filled.
wrapMode = EmfPlusWrapMode.valueOf(leis.readInt());
- int size = 2*LittleEndianConsts.INT_SIZE;
+ long size = 2*LittleEndianConsts.INT_SIZE;
if (TRANSFORM.isSet(dataFlags)) {
size += readXForm(leis, (brushTransform = new
AffineTransform()));
@@ -856,7 +856,7 @@ public class HemfPlusBrush {
size += (image = new EmfPlusImage()).init(leis, dataSize-size,
EmfPlusObjectType.IMAGE, 0);
}
- return size;
+ return Math.toIntExact(size);
}
@Override
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java?rev=1903560&r1=1903559&r2=1903560&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
Fri Aug 19 09:02:15 2022
@@ -174,7 +174,7 @@ public class HemfPlusObject {
EmfPlusObjectType objectType = getObjectType();
assert (objectType != null);
- int size = 0;
+ long size = 0;
totalObjectSize = 0;
int dataSize2 = (int) dataSize;
@@ -192,7 +192,7 @@ public class HemfPlusObject {
objectData = objectType.constructor.get();
size += objectData.init(leis, dataSize2, objectType, flags);
- return size;
+ return Math.toIntExact(size);
}
@Override
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java?rev=1903560&r1=1903559&r2=1903560&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
Fri Aug 19 09:02:15 2022
@@ -533,7 +533,7 @@ public class HemfPlusPen {
@SuppressWarnings("unused")
private long initCustomCap(Consumer<EmfPlusCustomLineCap> setter,
LittleEndianInputStream leis) throws IOException {
int CustomStartCapSize = leis.readInt();
- int size = LittleEndianConsts.INT_SIZE;
+ long size = LittleEndianConsts.INT_SIZE;
EmfPlusGraphicsVersion version = new EmfPlusGraphicsVersion();
size += version.init(leis);
@@ -547,13 +547,13 @@ public class HemfPlusPen {
setter.accept(cap);
- return size;
+ return Math.toIntExact(size);
}
@Override
public void applyObject(HemfGraphics ctx, List<? extends
EmfPlusObjectData> continuedObjectData) {
final HemfDrawProperties prop = ctx.getProperties();
- // TOOD:
+ // TODO:
// - set width according unit type
// - provide logic for different start and end cap
// - provide standard caps like diamond
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java?rev=1903560&r1=1903559&r2=1903560&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
Fri Aug 19 09:02:15 2022
@@ -281,19 +281,10 @@ public final class SlideShowDumper {
if (recordLen == 8 && atomLen > 8) {
// Assume it has children, rather than being corrupted
walkEscherDDF((indent + 3), pos + 8, (int) atomLen);
-
- // Wind on our length + our header
- pos += atomLen;
- pos += 8;
- len -= atomLen;
- len -= 8;
- } else {
- // No children, wind on our real length
- pos += atomLen;
- pos += 8;
- len -= atomLen;
- len -= 8;
}
+ // Wind on our length + our header
+ pos = Math.toIntExact(pos + atomLen) + 8;
+ len = Math.toIntExact(len - atomLen) - 8;
// Move on to the next one, if we're not at the end yet
if (len >= 8) {
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java?rev=1903560&r1=1903559&r2=1903560&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
Fri Aug 19 09:02:15 2022
@@ -113,7 +113,7 @@ public class HSLFEscherClientDataRecord
_childRecords.add(r);
}
long rlen = LittleEndian.getUInt(remainingData,offset+4);
- offset += 8 + rlen;
+ offset = Math.toIntExact(offset + 8 + rlen);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
