From 1c65667ed59738feed62b42872e458f208ee38a3 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Tue, 26 Mar 2024 19:24:16 +0100 Subject: [PATCH 1/3] POM: Bump dependency version imglib2-7.0.0 --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index d1fb9bb..64322a3 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,8 @@ Jean-Yves Tinevez and Michael Zinsmaier. sign,deploy-to-scijava + + 7.0.0 From a881ee98ed27db3e726ad38752d5f1f7ebb825b6 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Tue, 26 Mar 2024 19:24:54 +0100 Subject: [PATCH 2/3] Add getType where necessary --- .../net/imglib2/realtransform/PositionRandomAccessible.java | 6 ++++++ .../realtransform/RealPositionRealRandomAccessible.java | 6 ++++++ .../realtransform/RealTransformRandomAccessible.java | 6 ++++++ .../realtransform/RealTransformRealRandomAccessible.java | 6 ++++++ .../imglib2/realtransform/StackingRealRandomAccessible.java | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java b/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java index b84ae89..8c72acd 100644 --- a/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java @@ -97,4 +97,10 @@ public RandomAccess< LongType > randomAccess( final Interval interval ) { return randomAccess(); } + + @Override + public LongType getType() + { + return new LongType(); + } } diff --git a/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java b/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java index c96ed3d..f80a07d 100644 --- a/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java @@ -97,4 +97,10 @@ public RealPositionRealRandomAccess realRandomAccess( final RealInterval interva { return realRandomAccess(); } + + @Override + public DoubleType getType() + { + return new DoubleType(); + } } diff --git a/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java b/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java index 3c632c3..583cb8c 100644 --- a/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java @@ -127,4 +127,10 @@ public RealTransformRandomAccess randomAccess( final Interval interval ) { return randomAccess(); } + + @Override + public T getType() + { + return source.getType(); + } } diff --git a/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java b/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java index 74a7365..741c411 100644 --- a/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java @@ -149,4 +149,10 @@ public R getTransformToSource() { return transformToSource; } + + @Override + public T getType() + { + return source.getType(); + } } diff --git a/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java b/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java index 1934bf8..1af2cd8 100644 --- a/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java @@ -364,4 +364,10 @@ public int numDimensions() { return numDimensions; } + + @Override + public T getType() + { + return source.getType(); + } } From 91bba923ef82bb0c82a905050af6bcedc692b70e Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Tue, 26 Mar 2024 19:29:39 +0100 Subject: [PATCH 3/3] Add more getType where it makes sense --- .../net/imglib2/realtransform/PositionRandomAccessible.java | 6 ++++++ .../realtransform/RealPositionRealRandomAccessible.java | 6 ++++++ .../realtransform/RealTransformRandomAccessible.java | 6 ++++++ .../realtransform/RealTransformRealRandomAccessible.java | 6 ++++++ .../imglib2/realtransform/StackingRealRandomAccessible.java | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java b/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java index 8c72acd..30e5367 100644 --- a/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/PositionRandomAccessible.java @@ -73,6 +73,12 @@ public LongType get() return t; } + @Override + public LongType getType() + { + return t; + } + @Override public PositionRandomAccess copy() { diff --git a/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java b/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java index f80a07d..c958a68 100644 --- a/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/RealPositionRealRandomAccessible.java @@ -73,6 +73,12 @@ public DoubleType get() return t; } + @Override + public DoubleType getType() + { + return t; + } + @Override public RealPositionRealRandomAccess copy() { diff --git a/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java b/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java index 583cb8c..f1204d7 100644 --- a/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/RealTransformRandomAccessible.java @@ -100,6 +100,12 @@ public T get() return sourceAccess.get(); } + @Override + public T getType() + { + return sourceAccess.getType(); + } + @Override public RealTransformRandomAccess copy() { diff --git a/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java b/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java index 741c411..8978a8a 100644 --- a/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/RealTransformRealRandomAccessible.java @@ -97,6 +97,12 @@ public T get() return sourceAccess.get(); } + @Override + public T getType() + { + return sourceAccess.getType(); + } + @Override public RealTransformRealRandomAccess copy() { diff --git a/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java b/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java index 1af2cd8..aadc114 100644 --- a/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java +++ b/src/main/java/net/imglib2/realtransform/StackingRealRandomAccessible.java @@ -284,6 +284,12 @@ public T get() return sourceAccess.get(); } + @Override + public T getType() + { + return sourceAccess.getType(); + } + @Override public StackingRealRandomAccess copy() {