Merge pull request #12 from saalfeldlab/development

alpha-4 prerelease to align with N5-alpha-4

Author: cmhulbert

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>40.0.0</version>
+		<version>43.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -86,7 +86,14 @@
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
-		<n5.version>4.0.0-alpha-1</n5.version>
+		<!-- TODO remove when pom-scijava-base is updated -->
+		<scijava.jvm.version>8</scijava.jvm.version>
+		<scijava.jvm.build.version>[1.8.0-101,)</scijava.jvm.build.version>
+
+<!--		<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>-->
+		<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+
+		<n5.version>4.0.0-alpha-4</n5.version>
 	</properties>
 
 	<dependencies>

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

@@ -53,7 +53,6 @@
  */
 package org.janelia.saalfeldlab.n5.blosc;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.blosc.BufferSizes;
 import org.blosc.JBlosc;
@@ -86,54 +85,56 @@ public class BloscCompression implements Compression  {
 	@CompressionParameter
 	private final int blocksize;
 
+	@CompressionParameter
+	private final int typesize;
+
 	@CompressionParameter
 	private int nthreads;
 
 	private static final transient JBlosc blosc = new JBlosc();
 
-
 	public String getCname() {
 
 		return cname;
 	}
 
-
 	public int getClevel() {
 
 		return clevel;
 	}
 
-
 	public int getShuffle() {
 
 		return shuffle;
 	}
 
-
 	public int getBlocksize() {
 
 		return blocksize;
 	}
 
+	public int getTypesize() {
+
+		return typesize;
+	}
 
 	public int getNthreads() {
 
 		return nthreads;
 	}
 
-
 	public void setNthreads(final int nthreads) {
 
 		this.nthreads = nthreads;
 	}
 
-
 	public BloscCompression() {
 
 		this.cname = "blosclz";
 		this.clevel = 6;
 		this.shuffle = NOSHUFFLE;
 		this.blocksize = 0; // auto
+		this.typesize = 1;
 		this.nthreads = 1;
 	}
 
@@ -142,21 +143,34 @@ public BloscCompression(
 			final int clevel,
 			final int shuffle,
 			final int blocksize,
+			final int typesize,
 			final int nthreads) {
 
 		this.cname = cname;
 		this.clevel = clevel;
 		this.shuffle = shuffle;
 		this.blocksize = blocksize;
+		this.typesize = typesize;
 		this.nthreads = nthreads;
 	}
 
+	public BloscCompression(
+			final String cname,
+			final int clevel,
+			final int shuffle,
+			final int blocksize,
+			final int nthreads) {
+
+		this(cname, clevel, shuffle, blocksize, 1, nthreads);
+	}
+
 	public BloscCompression(final BloscCompression template) {
 
 		this.cname = template.cname;
 		this.clevel = template.clevel;
 		this.shuffle = template.shuffle;
 		this.blocksize = template.blocksize;
+		this.typesize = template.typesize;
 		this.nthreads = template.nthreads;
 	}
 
@@ -175,12 +189,12 @@ private byte[] decode(final byte[] data, final byte[] dstBuffer) {
 	}
 
 	@Override
-	public ReadData decode(final ReadData readData) throws IOException {
+	public ReadData decode(final ReadData readData) {
 		return ReadData.from(decode(readData.allBytes(), null));
 	}
 
 	@Override
-	public ReadData encode(final ReadData readData) throws IOException {
+	public ReadData encode(final ReadData readData) {
 		final byte[] serialized = readData.allBytes();
 		final ByteBuffer src = ByteBuffer.wrap(serialized);
 		final ByteBuffer dst = ByteBuffer.allocate(serialized.length + JBlosc.OVERHEAD);