From b2b8e158cfbf5f06d8ac473a5973688b6f692e99 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Fri, 5 Apr 2024 16:25:22 +0200 Subject: [PATCH 1/3] Update to ImgLib2 v7 And add missing getType() implementations. Signed-off-by: Curtis Rueden --- pom.xml | 3 +++ .../imagej/roi/RRARIToRealMaskRealIntervalConverterTest.java | 5 +++++ .../imagej/roi/RealMaskRealIntervalToRRARIConverterTest.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 93889692..9cc8096a 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,9 @@ sign,deploy-to-scijava + 7.0.3 + 0.15.0 + 4.3.18 diff --git a/src/test/java/net/imagej/roi/RRARIToRealMaskRealIntervalConverterTest.java b/src/test/java/net/imagej/roi/RRARIToRealMaskRealIntervalConverterTest.java index ff03275a..300306bb 100644 --- a/src/test/java/net/imagej/roi/RRARIToRealMaskRealIntervalConverterTest.java +++ b/src/test/java/net/imagej/roi/RRARIToRealMaskRealIntervalConverterTest.java @@ -216,5 +216,10 @@ public RealRandomAccess realRandomAccess(final RealInterval interval) { return source.realRandomAccess(interval); } + @Override + public T getType() + { + return source.getType(); + } } } diff --git a/src/test/java/net/imagej/roi/RealMaskRealIntervalToRRARIConverterTest.java b/src/test/java/net/imagej/roi/RealMaskRealIntervalToRRARIConverterTest.java index bda9cc48..a1a37380 100644 --- a/src/test/java/net/imagej/roi/RealMaskRealIntervalToRRARIConverterTest.java +++ b/src/test/java/net/imagej/roi/RealMaskRealIntervalToRRARIConverterTest.java @@ -273,5 +273,10 @@ public RealRandomAccess realRandomAccess(final RealInterval interval) { return rra.realRandomAccess(interval); } + @Override + public B getType() + { + return rra.getType(); + } } } From 74ab67d8415c23a88a5504c908e90fc24b1c0e65 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Wed, 28 Aug 2024 12:39:24 +0200 Subject: [PATCH 2/3] POM: Bump parent to pom-scijava-38.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9cc8096a..29f7d443 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 37.0.0 + 38.0.1 From da981cd3db705a9a0d33f71715e5475c000931e3 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Wed, 28 Aug 2024 12:39:55 +0200 Subject: [PATCH 3/3] POM: Bump dependency versions: imglib2 -> 7.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29f7d443..dfddf07d 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ sign,deploy-to-scijava - 7.0.3 + 7.1.0 0.15.0 4.3.18