Skip to content

Commit e7343ed

Browse files
authored
Merge pull request #121 from alancutter/matrixCrash
Fix incorrect error value in decomposeMatrix().
2 parents 628aff4 + 0d17d49 commit e7343ed

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/matrix-decomposition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
}
122122

123123
if (determinant(perspectiveMatrix) === 0) {
124-
return false;
124+
return null;
125125
}
126126

127127
var rhs = [];

test/js/matrix-interpolation.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@ suite('matrix interpolation', function() {
3939
var evaluatedInterp = interpolatedMatrix(0.5);
4040
compareMatrices(evaluatedInterp, [1, -0.1, 0, 1, 0, 0], 6);
4141

42+
var interpolatedMatrix = webAnimations1.propertyInterpolation(
43+
'transform',
44+
'matrix(0, 0, 0, 0, 0, 0)',
45+
'matrix(1, 0, 0, 1, 0, 0)');
46+
var evaluatedInterp = interpolatedMatrix(0.25);
47+
compareMatrices(evaluatedInterp, [0, 0, 0, 0, 0, 0], 6);
48+
evaluatedInterp = interpolatedMatrix(0.75);
49+
compareMatrices(evaluatedInterp, [1, 0, 0, 1, 0, 0], 6);
50+
4251
interpolatedMatrix = webAnimations1.propertyInterpolation(
4352
'transform',
4453
'matrix(1, 0, 0, 1, 0, 0)',

0 commit comments

Comments
 (0)