diff --git a/pom.xml b/pom.xml index ecad4f267..08f733f3b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 37.0.0 + 38.0.1 @@ -256,7 +256,11 @@ sign,deploy-to-scijava - 2.98.0 + 7.1.0 + 4.0.3 + 0.15.0 + 0.15.3 + 2.1.1 diff --git a/src/main/java/net/imagej/ops/coloc/ShuffledView.java b/src/main/java/net/imagej/ops/coloc/ShuffledView.java index b41f762bd..164fc2868 100644 --- a/src/main/java/net/imagej/ops/coloc/ShuffledView.java +++ b/src/main/java/net/imagej/ops/coloc/ShuffledView.java @@ -134,6 +134,12 @@ public RandomAccess randomAccess(final Interval interval) { return randomAccess(); // FIXME } + @Override + public T getType() + { + return image.getType(); + } + private class ShuffledRandomAccess extends Point implements RandomAccess { private final RandomAccess imageRA; private final long[] blockPos; diff --git a/src/main/java/net/imagej/ops/geom/geom3d/DefaultInertiaTensor3D.java b/src/main/java/net/imagej/ops/geom/geom3d/DefaultInertiaTensor3D.java index 7f5970ee7..ac5da2ede 100644 --- a/src/main/java/net/imagej/ops/geom/geom3d/DefaultInertiaTensor3D.java +++ b/src/main/java/net/imagej/ops/geom/geom3d/DefaultInertiaTensor3D.java @@ -66,7 +66,7 @@ public void initialize() { @Override public RealMatrix calculate(final IterableRegion input) { final BlockRealMatrix output = new BlockRealMatrix(3, 3); - Cursor c = input.localizingCursor(); + Cursor c = input.inside().localizingCursor(); double[] pos = new double[3]; double[] computedCentroid = new double[3]; centroid.calculate(input).localize(computedCentroid); @@ -87,7 +87,7 @@ public RealMatrix calculate(final IterableRegion input) { output.setEntry(2, 1, output.getEntry(1, 2)); } - final double size = input.size(); + final double size = input.inside().size(); output.setEntry(0, 0, output.getEntry(0, 0) / size); output.setEntry(0, 1, output.getEntry(0, 1) / size); output.setEntry(0, 2, output.getEntry(0, 2) / size); diff --git a/src/main/java/net/imagej/ops/image/watershed/Watershed.java b/src/main/java/net/imagej/ops/image/watershed/Watershed.java index 57f66b4aa..4cf558690 100644 --- a/src/main/java/net/imagej/ops/image/watershed/Watershed.java +++ b/src/main/java/net/imagej/ops/image/watershed/Watershed.java @@ -137,7 +137,7 @@ public void compute(final RandomAccessibleInterval in, final ImgLabeling imiList = new ArrayList<>(); if (mask != null) { - final Cursor c = Regions.iterable(mask).localizingCursor(); + final Cursor c = Regions.iterable(mask).inside().localizingCursor(); while (c.hasNext()) { c.next(); imiList.add(IntervalIndexer.positionToIndex(c, in)); diff --git a/src/main/java/net/imagej/ops/labeling/MergeLabeling.java b/src/main/java/net/imagej/ops/labeling/MergeLabeling.java index a2d2b1499..27ddf7310 100644 --- a/src/main/java/net/imagej/ops/labeling/MergeLabeling.java +++ b/src/main/java/net/imagej/ops/labeling/MergeLabeling.java @@ -92,7 +92,7 @@ public void compute(final ImgLabeling input1, { if (mask != null) { final IterableRegion iterable = Regions.iterable(mask); - final IterableInterval> sample = Regions.sample(iterable, + final IterableInterval> sample = Regions.sample(iterable.inside(), output); final RandomAccess> randomAccess = input1.randomAccess(); final RandomAccess> randomAccess2 = input2.randomAccess();