Skip to content

Commit 1e83e61

Browse files
committed
feat: remove @NameConfig from blosc; conflicts with ZarrV3Compressions in n5-zarr
Signed-off-by: Caleb Hulbert <cmhulbert@gmail.com>
1 parent 3372863 commit 1e83e61

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>40.0.0</version>
8+
<version>43.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -90,7 +90,7 @@
9090
<scijava.jvm.version>8</scijava.jvm.version>
9191
<scijava.jvm.build.version>[1.8.0-101,)</scijava.jvm.build.version>
9292

93-
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
93+
<!-- <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>-->
9494
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
9595

9696
<n5.version>4.0.0-alpha-4-SNAPSHOT</n5.version>

src/main/java/org/janelia/saalfeldlab/n5/blosc/BloscCompression.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,13 @@
5959
import org.janelia.saalfeldlab.n5.Compression;
6060
import org.janelia.saalfeldlab.n5.Compression.CompressionType;
6161
import org.janelia.saalfeldlab.n5.readdata.ReadData;
62-
import org.janelia.saalfeldlab.n5.serialization.NameConfig;
6362

6463
/**
6564
* Compression using JBlosc (https://github.com/Blosc/JBlosc) compressors.
6665
*
6766
* @author Stephan Saalfeld &lt;saalfelds@janelia.hhmi.org&gt;
6867
*/
6968
@CompressionType("blosc")
70-
@NameConfig.Name("blosc")
7169
public class BloscCompression implements Compression {
7270

7371
public static final int NOSHUFFLE = 0;
@@ -76,27 +74,21 @@ public class BloscCompression implements Compression {
7674
public static final int AUTOSHUFFLE = -1;
7775

7876
@CompressionParameter
79-
@NameConfig.Parameter
8077
private final String cname;
8178

8279
@CompressionParameter
83-
@NameConfig.Parameter
8480
private final int clevel;
8581

8682
@CompressionParameter
87-
@NameConfig.Parameter
8883
private final int shuffle;
8984

9085
@CompressionParameter
91-
@NameConfig.Parameter
9286
private final int blocksize;
9387

9488
@CompressionParameter
95-
@NameConfig.Parameter
9689
private final int typesize;
9790

9891
@CompressionParameter
99-
@NameConfig.Parameter
10092
private int nthreads;
10193

10294
private static final transient JBlosc blosc = new JBlosc();

0 commit comments

Comments
 (0)