Merge pull request #583 from saalfeldlab/1.13.6

fix: revert EMPTY_ACCESS special case, it has some bugs that need to …

Author: cmhulbert

src/main/java/org/janelia/saalfeldlab/paintera/data/n5/CommitCanvasN5.java

@@ -409,7 +409,8 @@ private static VolatileLabelMultisetArray downsampleVolatileLabelMultisetArrayAn
 				maxNumEntries
 		);
 
-		if (updatedAccess.isValid() && updatedAccess.getCurrentStorageArray().length == 0) {
+		boolean currentEmptyBehavior = updatedAccess.getArrayLength() == 0;
+		if (updatedAccess.isValid() && currentEmptyBehavior) {
 			n5.deleteBlock(dataset, blockPosition);
 			return null;
 		}

src/main/java/org/janelia/saalfeldlab/paintera/ui/dialogs/open/VolatileHelpers.java

@@ -5,10 +5,12 @@
 import net.imglib2.img.cell.CellGrid;
 import net.imglib2.type.label.Label;
 import net.imglib2.type.label.VolatileLabelMultisetArray;
+import net.imglib2.util.Intervals;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Arrays;
 
 public class VolatileHelpers {
 
@@ -34,10 +36,15 @@ public Cell<VolatileLabelMultisetArray> createInvalid(final Long key) throws Exc
 			final int[] cellDims = new int[cellPosition.length];
 			grid.getCellDimensions(cellPosition, cellMin, cellDims);
 
-			return new Cell<>(cellDims, cellMin, EMPTY_ACCESS);
+			return new Cell<>(cellDims, cellMin, newEmptyAccess((int)Intervals.numElements(cellDims), false));
 		}
 	}
 
-	private static final VolatileLabelMultisetArray EMPTY_ACCESS = new VolatileLabelMultisetArray(0, false, new long[]{Label.INVALID});
+	public static VolatileLabelMultisetArray newEmptyAccess(int numElements, boolean isValid) {
+
+		long[] argMaxes = new long[numElements];
+		Arrays.fill(argMaxes, Label.INVALID);
+		return new VolatileLabelMultisetArray(numElements, isValid, argMaxes);
+	}
 
 }

src/main/kotlin/org/janelia/saalfeldlab/paintera/data/n5/LabelMultisetUtils.kt

@@ -14,6 +14,7 @@ import org.janelia.saalfeldlab.n5.DatasetAttributes
 import org.janelia.saalfeldlab.n5.N5Exception
 import org.janelia.saalfeldlab.n5.N5Reader
 import org.janelia.saalfeldlab.n5.imglib2.N5LabelMultisets
+import org.janelia.saalfeldlab.paintera.ui.dialogs.open.VolatileHelpers
 import java.nio.ByteBuffer
 import java.util.function.BiFunction
 
@@ -141,12 +142,11 @@ class LabelMultisetCacheLoader(private val n5: N5Reader, private val dataset: St
 		val n = Intervals.numElements(*cellSize).toInt()
 		val access = bytes
 			?.let { LabelUtils.fromBytes(bytes, n) }
-			?: EMPTY_ACCESS
+			?: VolatileHelpers.newEmptyAccess(n, true)
 		return Cell(cellSize, cellMin, access)
 	}
 
 	companion object {
-		private val EMPTY_ACCESS = VolatileLabelMultisetArray(0, false, longArrayOf(Label.INVALID))
 
 		private fun generateCellGrid(n5: N5Reader, dataset: String): CellGrid {
 			val attributes = n5.getDatasetAttributes(dataset)