aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-08 13:07:25 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-08 13:07:25 +0000
commitb5715a1c8003e4a8af2301ab44aeef043547808e (patch)
tree74eea76f1c9596f6fd6fa07996a0dec66b18bdba /src
parentb54a5d6fb91ebc537bb2a2adefa31a25f6fa7925 (diff)
fix spelling: cannonical -> canonical
git-svn-id: http://skia.googlecode.com/svn/trunk@7074 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkMaskGamma.h4
-rw-r--r--src/core/SkPaint.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkMaskGamma.h b/src/core/SkMaskGamma.h
index ba3be64dcd..fafe4ac776 100644
--- a/src/core/SkMaskGamma.h
+++ b/src/core/SkMaskGamma.h
@@ -118,8 +118,8 @@ public:
}
}
- /** Given a color, returns the closest cannonical color. */
- static SkColor CannonicalColor(SkColor color) {
+ /** Given a color, returns the closest canonical color. */
+ static SkColor CanonicalColor(SkColor color) {
return SkColorSetRGB(
sk_t_scale255<R_LUM_BITS>(SkColorGetR(color) >> (8 - R_LUM_BITS)),
sk_t_scale255<G_LUM_BITS>(SkColorGetG(color) >> (8 - G_LUM_BITS)),
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 41c2f7556e..8270e3b4dd 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1690,7 +1690,7 @@ void SkScalerContext::PostMakeRec(const SkPaint& paint, SkScalerContext::Rec* re
case SkMask::kLCD32_Format: {
// filter down the luminance color to a finite number of bits
SkColor color = rec->getLuminanceColor();
- rec->setLuminanceColor(SkMaskGamma::CannonicalColor(color));
+ rec->setLuminanceColor(SkMaskGamma::CanonicalColor(color));
break;
}
case SkMask::kA8_Format: {
@@ -1707,7 +1707,7 @@ void SkScalerContext::PostMakeRec(const SkPaint& paint, SkScalerContext::Rec* re
// reduce to our finite number of bits
color = SkColorSetRGB(lum, lum, lum);
- rec->setLuminanceColor(SkMaskGamma::CannonicalColor(color));
+ rec->setLuminanceColor(SkMaskGamma::CanonicalColor(color));
break;
}
case SkMask::kBW_Format: