ImgMath: Compute.intoArrayImg properly returns an ArrayImg

rather than a RandomAccessibleInterval.

Author: acardona

src/main/java/net/imglib2/algorithm/math/Compute.java

@@ -55,17 +55,18 @@ public Compute( final IFunction operation )
 		this.params = Compute.validate( this.operation );
 	}
 
-	public < O extends RealType< O > & NativeType< O > > RandomAccessibleInterval< O >
+	public < O extends RealType< O > & NativeType< O > > ArrayImg< O, ? >
 	intoArrayImg()
 	{
 		@SuppressWarnings("unchecked")
 		final RandomAccessibleInterval< O > rai = ( RandomAccessibleInterval< O > )Util.findImg( operation ).iterator().next();
 		final ArrayImg< O, ? > target = new ArrayImgFactory< O >( rai.randomAccess().get().createVariable() ).create( rai );
 		this.params.compatible_iteration_order = Util.compatibleIterationOrder( Arrays.asList( rai, target ) );
-		return this.into( target );
+		this.into( target );
+		return target;
 	}
 
-	public < O extends RealType< O > & NativeType< O >, C  extends RealType< C > & NativeType< C > > RandomAccessibleInterval< O >
+	public < O extends RealType< O > & NativeType< O >, C  extends RealType< C > & NativeType< C > > ArrayImg< O, ? >
 	intoArrayImg( final C computeType, final O outputType )
 	{
 		final Set< RandomAccessibleInterval< ? > > imgs = Util.findImg( operation );
@@ -84,10 +85,11 @@ public Compute( final IFunction operation )
 		final ArrayImg< O, ? > target = new ArrayImgFactory< O >( outputType ).create( interval );
 		ls.add( target );
 		this.params.compatible_iteration_order = Util.compatibleIterationOrder( ls );
-		return this.into( target, null, computeType, null );
+		this.into( target, null, computeType, null );
+		return target;
 	}
 
-	public < O extends RealType< O > & NativeType< O >, C  extends RealType< C > > RandomAccessibleInterval< O >
+	public < O extends RealType< O > & NativeType< O >, C  extends RealType< C > > ArrayImg< O, ? >
 	intoArrayImg( final O outputType )
 	{
 		return intoArrayImg( outputType.createVariable(), outputType );

src/test/java/net/imglib2/algorithm/math/ImgMathTest.java

@@ -811,7 +811,6 @@ static private final < T extends RealType< T > > boolean same( final Img< T > im
 		  return true;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void test10Logical() {
 		System.out.println("test10Logical");
@@ -842,18 +841,18 @@ public void test10Logical() {
 									  img4 = into4x4Img( pixels4 );
 
 		// AND
-		assertTrue( same( img1, ( Img< UnsignedByteType > )compute(AND(img1, img2)).intoArrayImg() ) );
+		assertTrue( same( img1, compute(AND(img1, img2)).intoArrayImg( new UnsignedByteType() ) ) );
 		// OR
-		assertTrue( same( img2, ( Img< UnsignedByteType > )compute(OR(img1, img2)).intoArrayImg() ) );
+		assertTrue( same( img2, compute(OR(img1, img2)).intoArrayImg( new UnsignedByteType() ) ) );
 		// XOR
-		assertTrue( same( img3, ( Img< UnsignedByteType > )compute(XOR(img1, img2)).intoArrayImg() ) );
+		assertTrue( same( img3, compute(XOR(img1, img2)).intoArrayImg( new UnsignedByteType() ) ) );
 		// NOT
-		assertTrue( same( img4, ( Img< UnsignedByteType > )compute(NOT(img1)).intoArrayImg() ) );
+		assertTrue( same( img4, compute(NOT(img1)).intoArrayImg( new UnsignedByteType() ) ) );
 
 		// Test LogicalAndBoolean
 		final Img< UnsignedByteType> imgIFAND = ( Img< UnsignedByteType> )compute(IF(AND(LT(img1, 1), LT(img2, 1)),
 		                     THEN(1),
-		                     ELSE(0))).intoArrayImg();
+		                     ELSE(0))).intoArrayImg( new UnsignedByteType() );
 
 		final byte[] pixels5 = new byte[ pixels1.length ];
 		for ( int i = 0; i < pixels1.length; ++i )