wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-23 13:10:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

raise exception if matrix and implicit parameter arguments provided

Browse Source
This commit is contained in:
Johannes Schönberger
2012-08-12 10:13:29 +02:00
parent 08f4379e0e
commit 4541146561
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/transform/_geometric.py
+16 -8
View File
@@ -271,12 +271,16 @@ class AffineTransform(ProjectiveTransform):
def __init__(self, matrix=None, scale=None, rotation=None, shear=None,
translation=None):
if matrix is not None and matrix.shape != (3, 3):
raise ValueError("invalid shape of transformation matrix")
self._matrix = matrix
params = any(param is not None
for param in (scale, rotation, shear, translation))
params = (scale, rotation, shear, translation)
if any(param is not None for param in params):
if params and matrix is not None:
raise ValueError("You cannot specify the transformation matrix and "
"the implicit parameters at the same time.")
elif matrix is not None and matrix.shape != (3, 3):
raise ValueError("Invalid shape of transformation matrix.")
elif params:
if scale is None:
scale = (1, 1)
if rotation is None:
@@ -344,12 +348,16 @@ class SimilarityTransform(ProjectiveTransform):
def __init__(self, matrix=None, scale=None, rotation=None,
translation=None):
if matrix is not None and matrix.shape != (3, 3):
raise ValueError("invalid shape of transformation matrix")
self._matrix = matrix
params = any(param is not None
for param in (scale, rotation, translation))
params = (scale, rotation, translation)
if any(param is not None for param in params):
if params and matrix is not None:
raise ValueError("You cannot specify the transformation matrix and "
"the implicit parameters at the same time.")
elif matrix is not None and matrix.shape != (3, 3):
raise ValueError("Invalid shape of transformation matrix.")
elif params:
if scale is None:
scale = 1
if rotation is None: