From 22b2f740e58cc26284c0cea94b35e812e2171b90 Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Fri, 6 Sep 2019 17:31:58 +0200
Subject: [PATCH] Bump dependency version and fix compile errors
bigdataviewer-core --> 8.0.0
---
pom.xml | 3 +++
src/main/java/bdv/ij/ExportImagePlusPlugIn.java | 9 +++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index c9bb6ef..d4919c4 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 1a3c90b..0312a16 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 )
--
GitLab