diff --git a/pom.xml b/pom.xml index 938c1ff..ee02ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ net.preibisch BigStitcher - 1.2.16-SNAPSHOT + 1.3.1-SNAPSHOT Big Stitcher Multiview stitching of large datasets. @@ -103,11 +103,14 @@ sign,deploy-to-scijava - 10.4.12 - 1.0.0-beta-33 - - - 3.3.0 + 7.1.0 + 4.0.3 + 1.0.0-beta-18 + 0.15.3 + 0.15.0 + 10.6.0 + 1.0.0-beta-36 + 3.4.0 diff --git a/src/main/java/net/imglib2/algorithm/phasecorrelation/BlendedExtendedMirroredRandomAccesible2.java b/src/main/java/net/imglib2/algorithm/phasecorrelation/BlendedExtendedMirroredRandomAccesible2.java index b1b1e90..ef3d6b6 100644 --- a/src/main/java/net/imglib2/algorithm/phasecorrelation/BlendedExtendedMirroredRandomAccesible2.java +++ b/src/main/java/net/imglib2/algorithm/phasecorrelation/BlendedExtendedMirroredRandomAccesible2.java @@ -80,6 +80,12 @@ public FinalInterval getExtInterval() { return extDims; } + @Override + public T getType() + { + return img.getType(); + } + /** * TODO: For efficiency reasons we should implement it as a RandomAccess that actually updates the underlying * imgRA for every move. This way, the outofbounds can work very efficiently when it is iterated through Views.iterable().cursor() diff --git a/src/main/java/net/imglib2/algorithm/phasecorrelation/deprecated/Blending.java b/src/main/java/net/imglib2/algorithm/phasecorrelation/deprecated/Blending.java index e4722fe..55ee4bc 100644 --- a/src/main/java/net/imglib2/algorithm/phasecorrelation/deprecated/Blending.java +++ b/src/main/java/net/imglib2/algorithm/phasecorrelation/deprecated/Blending.java @@ -69,4 +69,10 @@ public RealRandomAccess realRandomAccess( final RealInterval interval { return realRandomAccess(); } + + @Override + public FloatType getType() + { + return new FloatType(); + } } diff --git a/src/main/java/net/preibisch/stitcher/algorithm/AveragedRandomAccessible.java b/src/main/java/net/preibisch/stitcher/algorithm/AveragedRandomAccessible.java index a01cad0..117197b 100644 --- a/src/main/java/net/preibisch/stitcher/algorithm/AveragedRandomAccessible.java +++ b/src/main/java/net/preibisch/stitcher/algorithm/AveragedRandomAccessible.java @@ -66,7 +66,13 @@ public RandomAccess< T > randomAccess(Interval interval) { return new AverageRandomAccess(numD); } - + + @Override + public T getType() + { + return randomAccessibles.isEmpty() ? null : randomAccessibles.get( 0 ).getType(); + } + class AverageRandomAccess /* extends Point */ implements RandomAccess< T > { final ArrayList< RandomAccess< T > > RAs; diff --git a/src/main/java/net/preibisch/stitcher/algorithm/RAIProxy.java b/src/main/java/net/preibisch/stitcher/algorithm/RAIProxy.java index d2513b8..4e5eaaf 100644 --- a/src/main/java/net/preibisch/stitcher/algorithm/RAIProxy.java +++ b/src/main/java/net/preibisch/stitcher/algorithm/RAIProxy.java @@ -181,4 +181,10 @@ public long dimension(int d) return rai.dimension( d ); } + @Override + public T getType() + { + loadIfNecessary(); + return rai.getType(); + } } diff --git a/src/main/java/net/preibisch/stitcher/input/JuliaRealRandomAccessible.java b/src/main/java/net/preibisch/stitcher/input/JuliaRealRandomAccessible.java index 41eedaf..d06f8c9 100644 --- a/src/main/java/net/preibisch/stitcher/input/JuliaRealRandomAccessible.java +++ b/src/main/java/net/preibisch/stitcher/input/JuliaRealRandomAccessible.java @@ -148,4 +148,10 @@ public JuliaRealRandomAccess realRandomAccess( final RealInterval interval ) { return realRandomAccess(); } + + @Override + public LongType getType() + { + return new LongType(); + } }