Fix compile errors with OpenJDK version of javac

Author: ctrueden

imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/fft/FFTFunctions.java

@@ -651,7 +651,9 @@ final private static <T extends Type<T>> void rearrangeQuadrantFFTDimZeroSingleD
 		final int halfSizeDim = sizeDim / 2;
 		final int sizeDimMinus1 = sizeDim - 1;
 
-		final T buffer = Util.getTypeFromInterval( fftImage ).createVariable();
+		// HACK: Explicit assignment is needed for OpenJDK javac.
+		final T fftImageType = Util.getTypeFromInterval( fftImage );
+		final T buffer = fftImageType.createVariable();
 
 		final RandomAccess<T> cursor1 = fftImage.randomAccess();
 		final RandomAccess<T> cursor2 = fftImage.randomAccess(); 
@@ -713,7 +715,9 @@ public void run()
 					final int halfSizeDim = sizeDim / 2;
 					final int sizeDimMinus1 = sizeDim - 1;
 
-					final T buffer = Util.getTypeFromInterval( fftImage ).createVariable();
+					// HACK: Explicit assignment is needed for OpenJDK javac.
+					final T fftImageType = Util.getTypeFromInterval( fftImage );
+					final T buffer = fftImageType.createVariable();
 
 					final RandomAccess<T> cursor1 = fftImage.randomAccess(); 
 					final RandomAccess<T> cursor2 = fftImage.randomAccess(); 
@@ -805,7 +809,9 @@ public void run()
 					final int sizeDim = (int)fftImage.dimension( dim );
 					final int halfSizeDim = sizeDim / 2;
 
-					final T buffer = Util.getTypeFromInterval( fftImage ).createVariable();
+					// HACK: Explicit assignment is needed for OpenJDK javac.
+					final T fftImageType = Util.getTypeFromInterval( fftImage );
+					final T buffer = fftImageType.createVariable();
 
 					final RandomAccess<T> cursor1 = fftImage.randomAccess(); 
 					final RandomAccess<T> cursor2 = fftImage.randomAccess(); 
@@ -897,8 +903,10 @@ public void run()
 					final int sizeDimMinus1 = sizeDim - 1;
 					final int halfSizeDim = sizeDim / 2;
 
-					final T buffer1 = Util.getTypeFromInterval( fftImage ).createVariable();
-					final T buffer2 = Util.getTypeFromInterval( fftImage ).createVariable();
+					// HACK: Explicit assignment is needed for OpenJDK javac.
+					final T fftImageType = Util.getTypeFromInterval( fftImage );
+					final T buffer1 = fftImageType.createVariable();
+					final T buffer2 = fftImageType.createVariable();
 
 					final RandomAccess<T> cursor1 = fftImage.randomAccess(); 
 					final RandomAccess<T> cursor2 = fftImage.randomAccess(); 

imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/fft/FourierConvolution.java

@@ -270,7 +270,10 @@ public boolean process()
 			// instaniate real valued kernel template
 			// which is of the same container type as the image
 			// so that the computation is easy
-			final Img<S> kernelTemplate = kernelImgFactory.create( kernelTemplateDim, Util.getTypeFromInterval( kernel ).createVariable() );
+
+			// HACK: Explicit assignment is needed for OpenJDK javac.
+			S kernelType = Util.getTypeFromInterval( kernel );
+			final Img<S> kernelTemplate = kernelImgFactory.create( kernelTemplateDim, kernelType.createVariable() );
 
 			// copy the kernel into the kernelTemplate,
 			// the key here is that the center pixel of the kernel (e.g. 13,13,13)

imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/fft/PhaseCorrelation.java

@@ -30,6 +30,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import net.imglib2.Cursor;
+import net.imglib2.ExtendedRandomAccessibleInterval;
 import net.imglib2.algorithm.Algorithm;
 import net.imglib2.algorithm.Benchmark;
 import net.imglib2.algorithm.MultiThreaded;
@@ -498,8 +499,11 @@ protected ArrayList<PhaseCorrelationPeak> extractPhaseCorrelationPeaks( final Im
 			peakList.add( new PhaseCorrelationPeak( new long[ numDimensions ], -Float.MAX_VALUE) );
 
 		final Cursor<FloatType> cursor = invPCM.cursor();
+
+		// HACK: Explicit assignment is needed for OpenJDK javac.
+		ExtendedRandomAccessibleInterval<FloatType, Img<FloatType>> extendedInvPCM = Views.extendPeriodic(invPCM);
 		final LocalNeighborhoodCursor<FloatType> localCursor =
-			new LocalNeighborhoodCursor<FloatType>( Views.extendPeriodic(invPCM).randomAccess(), 1 );
+			new LocalNeighborhoodCursor<FloatType>( extendedInvPCM.randomAccess(), 1 );
 
 		final int[] originalOffset1 = fft1.getOriginalOffset();
 		final int[] originalOffset2 = fft2.getOriginalOffset();

imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/pde/ExplicitDiffusionScheme2D.java

@@ -3,6 +3,7 @@
 import java.util.Vector;
 
 import net.imglib2.Cursor;
+import net.imglib2.ExtendedRandomAccessibleInterval;
 import net.imglib2.RandomAccess;
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.algorithm.MultiThreadedBenchmarkAlgorithm;
@@ -87,8 +88,14 @@ public boolean process() {
 				@Override
 				public void run() {
 
-					OutOfBoundsRandomAccess<T> ura 			= Views.extendMirrorSingle(input).randomAccess();
-					OutOfBoundsRandomAccess<FloatType> dra 	= Views.extendMirrorSingle(D).randomAccess();
+					// HACK: Explicit assignment is needed for OpenJDK javac.
+					ExtendedRandomAccessibleInterval<T, Img<T>> extendedInput = Views.extendMirrorSingle(input);
+					OutOfBoundsRandomAccess<T> ura = extendedInput.randomAccess();
+
+					// HACK: Explicit assignment is needed for OpenJDK javac.
+					ExtendedRandomAccessibleInterval<FloatType, RandomAccessibleInterval<FloatType>> extendedD = Views.extendMirrorSingle(D);
+					OutOfBoundsRandomAccess<FloatType> dra 	= extendedD.randomAccess();
+
 					Cursor<FloatType> incrementCursor 		= increment.localizingCursor();
 
 					long[] position = new long[input.numDimensions()];

imglib2/algorithms/gpl/src/main/java/net/imglib2/algorithm/pde/PeronaMalikAnisotropicDiffusion.java

@@ -28,6 +28,7 @@
 import java.util.Vector;
 
 import net.imglib2.Cursor;
+import net.imglib2.ExtendedRandomAccessibleInterval;
 import net.imglib2.RandomAccess;
 import net.imglib2.algorithm.MultiThreadedBenchmarkAlgorithm;
 import net.imglib2.algorithm.region.localneighborhood.LocalNeighborhoodCursor;
@@ -168,7 +169,10 @@ public void run() {
 					long[] position = new long[image.numDimensions()];
 					Cursor<FloatType> incrementCursor = increment.localizingCursor();
 					RandomAccess<T> ra = image.randomAccess();
-					LocalNeighborhoodCursor<T> neighborhoodCursor = new LocalNeighborhoodCursor<T>(Views.extendMirrorSingle(image), centralPosition);
+
+					// HACK: Explicit assignment is needed for OpenJDK javac.
+					ExtendedRandomAccessibleInterval<T, Img<T>> extendedImage = Views.extendMirrorSingle(image);
+					LocalNeighborhoodCursor<T> neighborhoodCursor = new LocalNeighborhoodCursor<T>(extendedImage, centralPosition);
 
 					incrementCursor.jumpFwd(chunk.getStartPosition());