From ded8fa30b9ce9d12823d81fbd45aaf76e61b9e76 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sun, 21 Sep 2014 05:54:13 -0500
Subject: [PATCH] Catch a few more asserts

---
 skimage/feature/texture.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/skimage/feature/texture.py b/skimage/feature/texture.py
index fc4e6ea2..b1e1024a 100644
--- a/skimage/feature/texture.py
+++ b/skimage/feature/texture.py
@@ -89,17 +89,17 @@ def greycomatrix(image, distances, angles, levels=256, symmetric=False,
            [0, 0, 0, 0]], dtype=uint32)
 
     """
+    assert_nD(image, 2)
+    assert_nD(distances, 1, 'distances')
+    assert_nD(angles, 1, 'angles')
 
     assert levels <= 256
     image = np.ascontiguousarray(image)
-    assert image.ndim == 2
     assert image.min() >= 0
     assert image.max() < levels
     image = image.astype(np.uint8)
     distances = np.ascontiguousarray(distances, dtype=np.float64)
     angles = np.ascontiguousarray(angles, dtype=np.float64)
-    assert distances.ndim == 1
-    assert angles.ndim == 1
 
     P = np.zeros((levels, levels, len(distances), len(angles)),
                  dtype=np.uint32, order='C')
@@ -179,8 +179,8 @@ def greycoprops(P, prop='contrast'):
            [ 1.25      ,  2.75      ]])
 
     """
+    assert_nD(P, 4, 'P')
 
-    assert P.ndim == 4
     (num_level, num_level2, num_dist, num_angle) = P.shape
     assert num_level == num_level2
     assert num_dist > 0