Skip to content
Snippets Groups Projects
Commit 04413bee authored by Curtis Rueden's avatar Curtis Rueden
Browse files

TEMP: update to SCIFIO 0.38.x

This commit should not be necessary -- at least w.r.t. SCIFIO.
Rather, breaking changes in the SCIFIO API can be restored,
such that this project continues to work as-is.
parent 669b37bf
No related branches found
No related tags found
No related merge requests found
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
<!-- NB: Deploy releases to the ImageJ Maven repository. --> <!-- NB: Deploy releases to the ImageJ Maven repository. -->
<releaseProfiles>deploy-to-imagej</releaseProfiles> <releaseProfiles>deploy-to-imagej</releaseProfiles>
<scifio.version>0.38.0</scifio.version>
</properties> </properties>
<repositories> <repositories>
......
...@@ -90,13 +90,10 @@ public class FusionImageLoader< T extends RealType< T > > implements ImgLoader ...@@ -90,13 +90,10 @@ public class FusionImageLoader< T extends RealType< T > > implements ImgLoader
final ArrayImgFactory< T > factory; final ArrayImgFactory< T > factory;
final T type;
public ArrayImgLoader( final T type ) public ArrayImgLoader( final T type )
{ {
opener = new ImgOpener(); opener = new ImgOpener();
factory = new ArrayImgFactory<>(); factory = new ArrayImgFactory<>( type );
this.type = type;
} }
@Override @Override
...@@ -105,7 +102,7 @@ public class FusionImageLoader< T extends RealType< T > > implements ImgLoader ...@@ -105,7 +102,7 @@ public class FusionImageLoader< T extends RealType< T > > implements ImgLoader
try try
{ {
System.out.println( fn ); System.out.println( fn );
return opener.openImgs( fn, factory, type ).get( 0 ); return opener.openImgs( fn, factory ).get( 0 );
} }
catch ( final ImgIOException e ) catch ( final ImgIOException e )
{ {
......
...@@ -5,6 +5,7 @@ import java.util.HashMap; ...@@ -5,6 +5,7 @@ import java.util.HashMap;
import org.scijava.Context; import org.scijava.Context;
import org.scijava.app.AppService; import org.scijava.app.AppService;
import org.scijava.app.StatusService; import org.scijava.app.StatusService;
import org.scijava.io.location.FileLocation;
import ij.ImagePlus; import ij.ImagePlus;
import io.scif.SCIFIOService; import io.scif.SCIFIOService;
...@@ -40,8 +41,6 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho ...@@ -40,8 +41,6 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho
private final ArrayImgFactory< UnsignedShortType > factory; private final ArrayImgFactory< UnsignedShortType > factory;
private final UnsignedShortType type;
final HashMap< ViewId, String > filenames; final HashMap< ViewId, String > filenames;
private boolean useImageJOpener; private boolean useImageJOpener;
...@@ -51,8 +50,7 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho ...@@ -51,8 +50,7 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho
this.filenames = filenames; this.filenames = filenames;
this.useImageJOpener = useImageJOpener; this.useImageJOpener = useImageJOpener;
opener = useImageJOpener ? null : new ImgOpener( new Context( SCIFIOService.class, AppService.class, StatusService.class ) ); opener = useImageJOpener ? null : new ImgOpener( new Context( SCIFIOService.class, AppService.class, StatusService.class ) );
factory = new ArrayImgFactory<>(); factory = new ArrayImgFactory<>( new UnsignedShortType() );
type = new UnsignedShortType();
} }
@Override @Override
...@@ -87,7 +85,7 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho ...@@ -87,7 +85,7 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho
try try
{ {
return opener.openImg( fn, factory, type ); return opener.openImgs( new FileLocation( fn ), factory ).get( 0 );
} }
catch ( final ImgIOException e ) catch ( final ImgIOException e )
{ {
...@@ -98,6 +96,6 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho ...@@ -98,6 +96,6 @@ public class LegacyStackImageLoader implements LegacyBasicImgLoader< UnsignedSho
@Override @Override
public UnsignedShortType getImageType() public UnsignedShortType getImageType()
{ {
return type; return factory.type();
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment