diff --git a/pom.xml b/pom.xml index 16dfbeb1..5f8c1fc5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 34.1.0 + 38.0.1 @@ -91,16 +91,12 @@ r49 3.0.0 - 10.4.6 - 0.2.0 - 2.0.0 - 6.1.0 - 0.13.2 - 0.3.1 - 1.0.0-beta-17 - 4.0.1 - 0.14.0 - 0.45.0 + 7.1.0 + 4.0.3 + 0.15.0 + 1.0.0-beta-18 + 0.15.3 + 10.6.0 @@ -283,11 +279,6 @@ imagej test - - sc.fiji - bigdataviewer-vistools - test - junit junit diff --git a/src/main/java/preview/net/imglib2/algorithm/neighborhood/NeighborhoodRandomAccessible.java b/src/main/java/preview/net/imglib2/algorithm/neighborhood/NeighborhoodRandomAccessible.java index 6fcdcea9..f0ca390a 100644 --- a/src/main/java/preview/net/imglib2/algorithm/neighborhood/NeighborhoodRandomAccessible.java +++ b/src/main/java/preview/net/imglib2/algorithm/neighborhood/NeighborhoodRandomAccessible.java @@ -60,4 +60,10 @@ public RandomAccess> randomAccess() { public RandomAccess> randomAccess(final Interval interval) { return new NeighborhoodRandomAccess(source, factory, interval); } + + @Override + public Neighborhood< T > getType() + { + return randomAccess().getType(); + } } diff --git a/src/main/java/sc/fiji/labkit/pixel_classification/classification/Trainer.java b/src/main/java/sc/fiji/labkit/pixel_classification/classification/Trainer.java index fefaaa70..1b5b3f67 100644 --- a/src/main/java/sc/fiji/labkit/pixel_classification/classification/Trainer.java +++ b/src/main/java/sc/fiji/labkit/pixel_classification/classification/Trainer.java @@ -109,7 +109,7 @@ public void trainLabeledFeatures( if (label == null) continue; LabelRegion region = regions.getLabelRegion(label); - Cursor cursor = region.cursor(); + Cursor cursor = region.inside().cursor(); while (cursor.hasNext()) { cursor.next(); ra.setPosition(cursor); diff --git a/src/main/java/sc/fiji/labkit/pixel_classification/utils/views/SimpleRAI.java b/src/main/java/sc/fiji/labkit/pixel_classification/utils/views/SimpleRAI.java index 5eff77ed..5cc46493 100644 --- a/src/main/java/sc/fiji/labkit/pixel_classification/utils/views/SimpleRAI.java +++ b/src/main/java/sc/fiji/labkit/pixel_classification/utils/views/SimpleRAI.java @@ -67,4 +67,10 @@ public RandomAccess randomAccess(Interval interval) { public int numDimensions() { return blueprint.numDimensions(); } + + @Override + public T getType() + { + return blueprint.getType(); + } }