Merge branch 'master' of github.com:PreibischLab/BigStitcher

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>net.preibisch</groupId>
 	<artifactId>BigStitcher</artifactId>
-	<version>1.2.16-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 
 	<name>Big Stitcher</name>
 	<description>Multiview stitching of large datasets.</description>
@@ -103,11 +103,14 @@
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
-		<bigdataviewer-core.version>10.4.12</bigdataviewer-core.version>
-		<bigdataviewer-vistools.version>1.0.0-beta-33</bigdataviewer-vistools.version>
-
-		<!-- <enforcer.skip>true</enforcer.skip> -->
-		<multiview-reconstruction.version>3.3.0</multiview-reconstruction.version>
+		<imglib2.version>7.1.0</imglib2.version>
+		<imglib2-realtransform.version>4.0.3</imglib2-realtransform.version>
+		<imglib2-cache.version>1.0.0-beta-18</imglib2-cache.version>
+		<imglib2-algorithm.version>0.15.3</imglib2-algorithm.version>
+		<imglib2-roi.version>0.15.0</imglib2-roi.version>
+		<bigdataviewer-core.version>10.6.0</bigdataviewer-core.version>
+		<bigdataviewer-vistools.version>1.0.0-beta-36</bigdataviewer-vistools.version>
+		<multiview-reconstruction.version>3.4.0</multiview-reconstruction.version>
 	</properties>
 
 	<repositories>

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()

src/main/java/net/imglib2/algorithm/phasecorrelation/deprecated/Blending.java

@@ -69,4 +69,10 @@ public RealRandomAccess<FloatType> realRandomAccess( final RealInterval interval
 	{
 		return realRandomAccess();
 	}
+
+	@Override
+	public FloatType getType()
+	{
+		return new FloatType();
+	}
 }

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;

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();
+	}
 }

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();
+	}
 }