From 74797d62057b1525a22feb381409b670819379b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <hannesschoenberger@gmail.com>
Date: Sat, 1 Sep 2012 09:17:16 +0200
Subject: [PATCH] Fix decision whether to use warping or fast warping

---
 skimage/transform/_geometric.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py
index 270198aa..44bc8651 100644
--- a/skimage/transform/_geometric.py
+++ b/skimage/transform/_geometric.py
@@ -832,6 +832,8 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
     ishape = np.array(image.shape)
     bands = ishape[2]
 
+    out = None
+
     # use fast Cython version for specific interpolation orders
     if order in range(4) and not map_args:
         matrix = None
@@ -851,7 +853,7 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
             if orig_ndim == 2:
                 out = out[..., 0]
 
-    else: # use ndimage.map_coordinates
+    if out is None: # use ndimage.map_coordinates
 
         if output_shape is None:
             output_shape = ishape