Index: src/core/SkScalerContext.cpp |
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp |
index 85e8994f4f19daca34885fdaba3152834b18d857..ecac82a34c8a110c0e809f61ef285db9ff3d892d 100644 |
--- a/src/core/SkScalerContext.cpp |
+++ b/src/core/SkScalerContext.cpp |
@@ -687,7 +687,7 @@ void SkScalerContextRec::getSingleMatrix(SkMatrix* m) const { |
m->postConcat(deviceMatrix); |
} |
-void SkScalerContextRec::computeMatrices(PreMatrixScale preMatrixScale, SkVector* s, SkMatrix* sA, |
+bool SkScalerContextRec::computeMatrices(PreMatrixScale preMatrixScale, SkVector* s, SkMatrix* sA, |
SkMatrix* GsA, SkMatrix* G_inv, SkMatrix* A_out) |
{ |
// A is the 'total' matrix. |
@@ -723,7 +723,7 @@ void SkScalerContextRec::computeMatrices(PreMatrixScale preMatrixScale, SkVector |
if (G_inv) { |
G_inv->reset(); |
} |
- return; |
+ return false; |
} |
// GA is the matrix A with rotation removed. |
@@ -803,6 +803,8 @@ void SkScalerContextRec::computeMatrices(PreMatrixScale preMatrixScale, SkVector |
// G is rotational so reorders with the scale. |
GsA->preScale(SkScalarInvert(s->fX), SkScalarInvert(s->fY)); |
} |
+ |
+ return true; |
} |
SkAxisAlignment SkScalerContext::computeAxisAlignmentForHText() { |