diff --git a/pom.xml b/pom.xml index c9bb6ef304eb4e50fe7c3aec19fd265686c89eec..d4919c47f1b1169b6307a21984a82bfd1a862ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,9 @@ <license.licenseName>gpl_v3</license.licenseName> <license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners> + <imglib2.version>5.8.0</imglib2.version> + <bigdataviewer-core.version>8.0.0</bigdataviewer-core.version> + <!-- NB: Deploy releases to the SciJava Maven repository. --> <releaseProfiles>deploy-to-scijava</releaseProfiles> </properties> diff --git a/src/main/java/bdv/ij/ExportImagePlusPlugIn.java b/src/main/java/bdv/ij/ExportImagePlusPlugIn.java index 1a3c90b3accd850c4726df23aa990ea73cfab0e1..0312a164f4ff7107343bf8ebc2f6312bbda7dc5f 100644 --- a/src/main/java/bdv/ij/ExportImagePlusPlugIn.java +++ b/src/main/java/bdv/ij/ExportImagePlusPlugIn.java @@ -14,16 +14,17 @@ import net.imglib2.FinalDimensions; import net.imglib2.RandomAccessibleInterval; import net.imglib2.realtransform.AffineTransform3D; +import net.imglib2.util.Intervals; import org.scijava.command.Command; import org.scijava.plugin.Plugin; import bdv.export.ExportMipmapInfo; +import bdv.export.ExportScalePyramid.AfterEachPlane; +import bdv.export.ExportScalePyramid.LoopbackHeuristic; import bdv.export.ProgressWriter; import bdv.export.ProposeMipmaps; import bdv.export.SubTaskProgressWriter; import bdv.export.WriteSequenceToHdf5; -import bdv.export.WriteSequenceToHdf5.AfterEachPlane; -import bdv.export.WriteSequenceToHdf5.LoopbackHeuristic; import bdv.ij.export.imgloader.ImagePlusImgLoader; import bdv.ij.export.imgloader.ImagePlusImgLoader.MinMaxOption; import bdv.ij.util.PluginHelper; @@ -103,7 +104,7 @@ public class ExportImagePlusPlugIn implements Command final int w = imp.getWidth(); final int h = imp.getHeight(); final int d = imp.getNSlices(); - final FinalDimensions size = new FinalDimensions( new int[] { w, h, d } ); + final FinalDimensions size = new FinalDimensions( w, h, d ); // propose reasonable mipmap settings final ExportMipmapInfo autoMipmapSettings = ProposeMipmaps.proposeMipmaps( new BasicViewSetup( 0, "", size, voxelSize ) ); @@ -177,7 +178,7 @@ public class ExportImagePlusPlugIn implements Command if ( previousLevel < 0 ) return false; - if ( WriteSequenceToHdf5.numElements( factorsToOriginalImg ) / WriteSequenceToHdf5.numElements( factorsToPreviousLevel ) >= 8 ) + if ( Intervals.numElements( factorsToOriginalImg ) / Intervals.numElements( factorsToPreviousLevel ) >= 8 ) return true; if ( isVirtual )