fix for newer scikit-image version

UU-SCMB · Nov 30, 2023 · a377e99 · a377e99
1 parent 85cf3d5
commit a377e99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/scm_confocal/__init__.py b/scm_confocal/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '1.7.3'
+__version__ = '1.7.4'
 
 from .sp8 import sp8_lif,sp8_image,sp8_series
 from .visitech import visitech_series,visitech_faststack

diff --git a/scm_confocal/util.py b/scm_confocal/util.py
@@ -118,12 +118,11 @@ def align_stack(images,startim=0,threshold=0,binning=1,smooth=0,upsample=1,
     #start going backwards from startim to first image
     for i in reversed(range(0,startim)):
         print('\raligning image {:>{w}} of {:>{w}}'.format(i,n-1,w=len(str(n-1))),end='')
-        shifts = phase_cross_correlation(
+        shifts,*_ = phase_cross_correlation(
             alignim[i+1],
             alignim[i],
             upsample_factor=upsample,
             normalization=None,
-            return_error=False
         )
         imshift[i] = imshift[i+1] + [binning*s for s in shifts]
         if apply_shift and trim != 'full':
@@ -137,12 +136,11 @@ def align_stack(images,startim=0,threshold=0,binning=1,smooth=0,upsample=1,
     #then continue from startim to end
     for i in range(startim+1,n):
         print('\raligning image {:>{w}} of {:>{w}}'.format(i,n-1,w=len(str(n-1))),end='')
-        shifts = phase_cross_correlation(
+        shifts,*_ = phase_cross_correlation(
             alignim[i-1],
             alignim[i],
             upsample_factor=upsample,
             normalization=None,
-            return_error=False
         )
         imshift[i] = imshift[i-1] + [binning*s for s in shifts]
         if apply_shift and trim != 'full':

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="scm_confocal",
-    version="1.7.3",
+    version="1.7.4",
     author="Maarten Bransen",
     author_email="m.bransen@uu.nl",
     license='GNU General Public License v3.0',