Skip to content
Snippets Groups Projects
Commit 22b2f740 authored by Tobias Pietzsch's avatar Tobias Pietzsch
Browse files

Bump dependency version and fix compile errors

	bigdataviewer-core  -->  8.0.0
parent 37a1f269
No related branches found
No related tags found
No related merge requests found
...@@ -98,6 +98,9 @@ ...@@ -98,6 +98,9 @@
<license.licenseName>gpl_v3</license.licenseName> <license.licenseName>gpl_v3</license.licenseName>
<license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners> <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. --> <!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>deploy-to-scijava</releaseProfiles> <releaseProfiles>deploy-to-scijava</releaseProfiles>
</properties> </properties>
......
...@@ -14,16 +14,17 @@ import net.imglib2.FinalDimensions; ...@@ -14,16 +14,17 @@ import net.imglib2.FinalDimensions;
import net.imglib2.RandomAccessibleInterval; import net.imglib2.RandomAccessibleInterval;
import net.imglib2.realtransform.AffineTransform3D; import net.imglib2.realtransform.AffineTransform3D;
import net.imglib2.util.Intervals;
import org.scijava.command.Command; import org.scijava.command.Command;
import org.scijava.plugin.Plugin; import org.scijava.plugin.Plugin;
import bdv.export.ExportMipmapInfo; import bdv.export.ExportMipmapInfo;
import bdv.export.ExportScalePyramid.AfterEachPlane;
import bdv.export.ExportScalePyramid.LoopbackHeuristic;
import bdv.export.ProgressWriter; import bdv.export.ProgressWriter;
import bdv.export.ProposeMipmaps; import bdv.export.ProposeMipmaps;
import bdv.export.SubTaskProgressWriter; import bdv.export.SubTaskProgressWriter;
import bdv.export.WriteSequenceToHdf5; 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;
import bdv.ij.export.imgloader.ImagePlusImgLoader.MinMaxOption; import bdv.ij.export.imgloader.ImagePlusImgLoader.MinMaxOption;
import bdv.ij.util.PluginHelper; import bdv.ij.util.PluginHelper;
...@@ -103,7 +104,7 @@ public class ExportImagePlusPlugIn implements Command ...@@ -103,7 +104,7 @@ public class ExportImagePlusPlugIn implements Command
final int w = imp.getWidth(); final int w = imp.getWidth();
final int h = imp.getHeight(); final int h = imp.getHeight();
final int d = imp.getNSlices(); 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 // propose reasonable mipmap settings
final ExportMipmapInfo autoMipmapSettings = ProposeMipmaps.proposeMipmaps( new BasicViewSetup( 0, "", size, voxelSize ) ); final ExportMipmapInfo autoMipmapSettings = ProposeMipmaps.proposeMipmaps( new BasicViewSetup( 0, "", size, voxelSize ) );
...@@ -177,7 +178,7 @@ public class ExportImagePlusPlugIn implements Command ...@@ -177,7 +178,7 @@ public class ExportImagePlusPlugIn implements Command
if ( previousLevel < 0 ) if ( previousLevel < 0 )
return false; return false;
if ( WriteSequenceToHdf5.numElements( factorsToOriginalImg ) / WriteSequenceToHdf5.numElements( factorsToPreviousLevel ) >= 8 ) if ( Intervals.numElements( factorsToOriginalImg ) / Intervals.numElements( factorsToPreviousLevel ) >= 8 )
return true; return true;
if ( isVirtual ) if ( isVirtual )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment