Skip to content

Commit df6b4f7

Browse files
committed
Updates for v2 arch
1 parent cea7490 commit df6b4f7

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/java/org/hdf5javalib/datasource/TypedDataSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ public AbstractSpliterator(long start, long limit, long recordSize) {
405405

406406
// Default cacheSize and maximum buffer size (e.g., 100 MB)
407407
long defaultCacheSize = 100_000; // Default: 100,000 records
408-
long maxBufferSize = 100 * 1024 * 1024; // 100 MB
408+
long maxBufferSize = 100 * 1024L * 1024L; // 100 MB
409409

410410
// Adjust cacheSize to keep buffer size within maxBufferSize
411411
this.cacheSize = (int) Math.min(defaultCacheSize, maxBufferSize / recordSize);
@@ -415,7 +415,7 @@ public AbstractSpliterator(long start, long limit, long recordSize) {
415415

416416
// Calculate buffer size
417417
long intendedSize = (long) this.cacheSize * recordSize;
418-
int bSize = (int) Math.min(intendedSize, Integer.MAX_VALUE - 8); // Slightly below max
418+
int bSize = (int) Math.min(intendedSize, Integer.MAX_VALUE - 8L); // Slightly below max
419419
if (bSize <= 0 || intendedSize < 0) {
420420
throw new IllegalArgumentException("Invalid buffer size: " + intendedSize);
421421
}

src/main/java/org/hdf5javalib/hdffile/infrastructure/fractalheap/BitReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public long read(int numBits) {
1919
int currentBitPos = bitPosition++;
2020
int byteIndex = currentBitPos / 8;
2121
int bitIndexInByte = currentBitPos % 8;
22-
if ((data[byteIndex] & (1 << bitIndexInByte)) != 0) {
22+
if ((data[byteIndex] & 0xff & (1 << bitIndexInByte)) != 0) {
2323
value |= (1L << i);
2424
}
2525
}

0 commit comments

Comments
 (0)