DefaultDatasetService: fix non-NativeType wrapping

When wrapping an ImgLib2 image whose type is not a NativeType,
the image factory heuristic was barfing. Here is an example
failure seen with the latest imagej-common + imagej-legacy:

    java.lang.IllegalArgumentException: Cannot create factory for non-Img RAI of non-native-type: class net.imglib2.type.logic.BoolType
	at net.imagej.DefaultDatasetService.wrapToImg(DefaultDatasetService.java:329)
	at net.imagej.DefaultDatasetService.wrapToImgPlus(DefaultDatasetService.java:316)
	at net.imagej.DefaultDatasetService.create(DefaultDatasetService.java:209)
	at net.imagej.legacy.convert.roi.RealMaskRealIntervalToImageRoiConverter.convert(RealMaskRealIntervalToImageRoiConverter.java:119)
	at net.imagej.legacy.convert.roi.RealMaskRealIntervalToImageRoiConverter.convert(RealMaskRealIntervalToImageRoiConverter.java:1)
	at net.imagej.legacy.convert.roi.AbstractMaskPredicateToRoiConverter.convert(AbstractMaskPredicateToRoiConverter.java:73)
	at org.scijava.convert.AbstractConvertService.convert(AbstractConvertService.java:128)
	at net.imagej.legacy.convert.roi.RealMaskRealIntervalToImageRoiConverterTest.testConversion(RealMaskRealIntervalToImageRoiConverterTest.java:92)

Fortunately, ImgLib2 5.1.0 has a shiny new utility method for
creating the most appropriate ImgFactory for different scenarios.
In this case, it will now fall back to ListImgFactory.

Author: ctrueden

Diff for: pom.xml

@@ -145,7 +145,7 @@ Institute of Molecular Cell Biology and Genetics.</license.copyrightOwners>
 		<releaseProfiles>deploy-to-imagej</releaseProfiles>
 
 		<scijava-common.version>2.73.0</scijava-common.version>
-		<imglib2.version>5.0.0</imglib2.version>
+		<imglib2.version>5.1.0</imglib2.version>
 		<imglib2-roi.version>0.5.0</imglib2-roi.version>
 	</properties>
 

Diff for: src/main/java/net/imagej/DefaultDatasetService.java

@@ -43,7 +43,6 @@
 import net.imglib2.img.Img;
 import net.imglib2.img.ImgFactory;
 import net.imglib2.img.ImgView;
-import net.imglib2.img.array.ArrayImgFactory;
 import net.imglib2.img.cell.CellImgFactory;
 import net.imglib2.img.planar.PlanarImgFactory;
 import net.imglib2.type.NativeType;
@@ -59,7 +58,6 @@
 import net.imglib2.type.numeric.integer.UnsignedShortType;
 import net.imglib2.type.numeric.real.DoubleType;
 import net.imglib2.type.numeric.real.FloatType;
-import net.imglib2.util.Intervals;
 import net.imglib2.util.Util;
 
 import org.scijava.log.LogService;
@@ -320,27 +318,13 @@ private <T extends RealType<T>> Img<T> wrapToImg(
 		final RandomAccessibleInterval<T> rai)
 	{
 		if (rai instanceof Img) return (Img<T>) rai;
-		// NB: In order to synthesize an ImgFactory here, the RAI
-		// type must extend NativeType. So let's check!
-		final T type = Util.getTypeFromInterval(rai);
-		if (!(type instanceof NativeType)) {
-			throw new IllegalArgumentException(
-				"Cannot create factory for non-Img RAI of non-native-type: " + //
-					type.getClass());
-		}
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		final ImgFactory<T> imgFactory = imgFactory((RandomAccessibleInterval) rai);
-		return ImgView.wrap(rai, imgFactory);
+		return ImgView.wrap(rai, imgFactory(rai));
 	}
 
-	private <T extends NativeType<T>> ImgFactory<T> imgFactory(
+	private <T> ImgFactory<T> imgFactory(
 		final RandomAccessibleInterval<T> rai)
 	{
-		// TODO: Call create.imgFactory op instead. As things stand, we cannot,
-		// because imagej-common cannot depend on imagej-ops. Perhaps this
-		// "wrapToImgPlus" logic should not live here? Consider best approach.
 		final T type = Util.getTypeFromInterval(rai);
-		return rai == null || Intervals.numElements(rai) <= Integer.MAX_VALUE
-			? new ArrayImgFactory<>(type) : new CellImgFactory<>(type);
+		return Util.getSuitableImgFactory(rai, type);
 	}
 }