Skip to content

Commit e6f9251

Browse files
Update to zarr-java 0.1.0 and bioformats2raw 0.12.0-rc2
Requires updating the minimum Java version to 11, see glencoesoftware/bioformats2raw#294
1 parent f587a65 commit e6f9251

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ plugins {
88
group = 'com.glencoesoftware'
99
version = '0.10.0-SNAPSHOT'
1010

11-
mainClassName = 'com.glencoesoftware.pyramid.PyramidFromDirectoryWriter'
12-
sourceCompatibility = 1.8
13-
targetCompatibility = 1.8
11+
application {
12+
mainClass = 'com.glencoesoftware.pyramid.PyramidFromDirectoryWriter'
13+
}
14+
java {
15+
toolchain {
16+
languageVersion = JavaLanguageVersion.of(11)
17+
}
18+
}
1419

1520
repositories {
1621
mavenCentral()
@@ -30,11 +35,11 @@ repositories {
3035

3136
dependencies {
3237
implementation 'net.java.dev.jna:jna:5.10.0'
33-
implementation 'dev.zarr:zarr-java:0.0.10'
38+
implementation 'dev.zarr:zarr-java:0.1.0'
3439
implementation 'info.picocli:picocli:4.7.5'
3540
implementation 'me.tongfei:progressbar:0.9.0'
3641
implementation 'ome:formats-bsd:8.3.0'
37-
implementation 'com.glencoesoftware:bioformats2raw:0.12.0-rc1'
42+
implementation 'com.glencoesoftware:bioformats2raw:0.12.0-rc2'
3843
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.15'
3944
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.3.15'
4045

@@ -61,7 +66,7 @@ jar {
6166
"Implementation-Title": "raw2ometiff converter",
6267
"Implementation-Version": archiveVersion,
6368
"Implementation-Vendor": "Glencoe Software Inc.",
64-
"Main-Class": mainClassName
69+
"Main-Class": application.mainClass
6570
)
6671
}
6772
}

src/main/java/com/glencoesoftware/pyramid/PyramidFromDirectoryWriter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,9 @@ private byte[] readTile(PyramidSeries s, ResolutionDescriptor descriptor,
718718
", position = [" + pos[0] + ", " + pos[1] + ", " + pos[2] + "]");
719719
}
720720
try {
721-
ucar.ma2.Array tile = block.read(Utils.toLongArray(gridPosition), shape);
721+
ucar.ma2.Array tile = block.read(
722+
Utils.toLongArray(gridPosition),
723+
Utils.toLongArray(shape));
722724
ByteBuffer buf = tile.getDataAsByteBuffer(
723725
s.littleEndian ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
724726
byte[] bytes = new byte[buf.remaining()];

0 commit comments

Comments
 (0)