aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-08-24 12:01:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-24 12:01:31 -0700
commite55131c186116c0fe3ff8775f2a9d684174316bb (patch)
tree80620d4a48db3c6888397fca8097655680ffa20b
parent531191fefebb5bed6177946e2e227ddff292cff2 (diff)
s/invertable/invertible
English orthography is often made difficult by poor phonology. TBR=oxford-english-dictionary,mtklein Review-Url: https://codereview.chromium.org/2272083002
-rw-r--r--src/core/SkScalerContext.h2
-rw-r--r--src/ports/SkFontHost_mac.cpp4
-rw-r--r--tests/MatrixTest.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index 87d022a8ee..48ec0624cf 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -146,7 +146,7 @@ struct SkScalerContextRec {
* @param remainingWithoutRotation apply after scale to apply the total matrix sans rotation.
* @param remainingRotation apply after remainingWithoutRotation to apply the total matrix.
* @param total the total matrix.
- * @return false if the matrix was singular. The output will be valid but not invertable.
+ * @return false if the matrix was singular. The output will be valid but not invertible.
*/
bool computeMatrices(PreMatrixScale preMatrixScale,
SkVector* scale, SkMatrix* remaining,
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index d3e7ab0a06..0c2e5c2628 100644
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -818,12 +818,12 @@ SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface,
// As a result, it is necessary to know the actual device size and request that.
SkVector scale;
SkMatrix skTransform;
- bool invertable = fRec.computeMatrices(SkScalerContextRec::kVertical_PreMatrixScale,
+ bool invertible = fRec.computeMatrices(SkScalerContextRec::kVertical_PreMatrixScale,
&scale, &skTransform, nullptr, nullptr, &fFUnitMatrix);
fTransform = MatrixToCGAffineTransform(skTransform);
// CGAffineTransformInvert documents that if the transform is non-invertible it will return the
// passed transform unchanged. It does so, but then also prints a message to stdout. Avoid this.
- if (invertable) {
+ if (invertible) {
fInvTransform = CGAffineTransformInvert(fTransform);
} else {
fInvTransform = fTransform;
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 414aab2f9a..da2ae35cd7 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -239,8 +239,8 @@ static void test_matrix_min_max_scale(skiatest::Reporter* reporter) {
SkMatrix mats[2*SK_ARRAY_COUNT(baseMats)];
for (size_t i = 0; i < SK_ARRAY_COUNT(baseMats); ++i) {
mats[i] = baseMats[i];
- bool invertable = mats[i].invert(&mats[i + SK_ARRAY_COUNT(baseMats)]);
- REPORTER_ASSERT(reporter, invertable);
+ bool invertible = mats[i].invert(&mats[i + SK_ARRAY_COUNT(baseMats)]);
+ REPORTER_ASSERT(reporter, invertible);
}
SkRandom rand;
for (int m = 0; m < 1000; ++m) {