Author: fanningpj
Date: Sun Jul 17 09:30:21 2022
New Revision: 1902803
URL: http://svn.apache.org/viewvc?rev=1902803&view=rev
Log:
[github-348] tidy up number casting
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java?rev=1902803&r1=1902802&r2=1902803&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
Sun Jul 17 09:30:21 2022
@@ -92,7 +92,7 @@ public abstract class XSSFBParser {
b2 &= ~(1<<7); //unset highest bit (if it exists?)
recordId = ((int)b2 << 7)+(int)b1;
} else {
- recordId = (int)b1;
+ recordId = b1;
}
long recordLength = 0;
@@ -102,7 +102,7 @@ public abstract class XSSFBParser {
byte b = is.readByte();
halt = (b >> 7 & 1) == 0; //if highest bit !=1 then continue
b &= ~(1<<7);
- recordLength += (int)b << (i*7); //multiply by 128^i
+ recordLength += (long) (int)b << (i*7); //multiply by 128^i
i++;
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java?rev=1902803&r1=1902802&r2=1902803&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
Sun Jul 17 09:30:21 2022
@@ -101,8 +101,8 @@ public class ContinuableRecordInput impl
((long)b5 << 40) +
((long)b4 << 32) +
((long)b3 << 24) +
- (b2 << 16) +
- (b1 << 8) +
+ ((long)b2 << 16) +
+ ((long)b1 << 8) +
(b0));
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java?rev=1902803&r1=1902802&r2=1902803&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
Sun Jul 17 09:30:21 2022
@@ -172,11 +172,11 @@ public abstract class ChunkedCipherInput
private void nextChunk() throws GeneralSecurityException, IOException {
if (chunkSize != -1) {
- int index = (int)(pos >> chunkBits);
+ int index = (int) (pos >> chunkBits);
initCipherForBlock(cipher, index);
if (lastIndex != index) {
- long skipN = (index - lastIndex) << chunkBits;
+ long skipN = ((long) index - lastIndex) << chunkBits;
if (super.skip(skipN) < skipN) {
throw new EOFException("buffer underrun");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
