From e2dec8339c48df7be006ce224f9ae96bc20b8415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <hannesschoenberger@gmail.com>
Date: Sat, 6 Oct 2012 15:21:26 +0200
Subject: [PATCH] Fix bug in warp which caused 1 pixel images not to be clipped

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

diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py
index 6e04a271..1179811d 100644
--- a/skimage/transform/_geometric.py
+++ b/skimage/transform/_geometric.py
@@ -1015,7 +1015,8 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
     if mode == 'constant' and not (0 <= cval <= 1):
         clipped[out == cval] = cval
 
-    if clipped.shape[0] == 1 or clipped.shape[1] == 1:
+    if clipped.ndim == 3 and orig_ndim == 2:
+        # remove singleton dim introduced by atleast_3d
+        return clipped[..., 0]
+    else:
         return clipped
-    else:  # remove singleton dim introduced by atleast_3d
-        return clipped.squeeze()