aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPaint.cpp
diff options
context:
space:
mode:
authorGravatar sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-26 21:56:19 +0000
committerGravatar sugoi@google.com <sugoi@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-26 21:56:19 +0000
commit8d38d516c0f17d8d9f6b170055ac05ac181c0554 (patch)
treef873516f154e20c35948e32d21ff8885fb749d88 /src/core/SkPaint.cpp
parent1744f97ea73384b9f75b0ccee0a36a213c681d3a (diff)
Fixed sk_getMetrics_utf32_xy function
The unused parameters x and y here seems to be a mistake. Review URL: https://codereview.appspot.com/7386055 git-svn-id: http://skia.googlecode.com/svn/trunk@7873 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPaint.cpp')
-rw-r--r--src/core/SkPaint.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index b715524a42..9510e75c75 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -842,7 +842,7 @@ static const SkGlyph& sk_getMetrics_utf32_xy(SkGlyphCache* cache,
const int32_t* ptr = *(const int32_t**)text;
SkUnichar uni = *--ptr;
*text = (const char*)ptr;
- return cache->getUnicharMetrics(uni);
+ return cache->getUnicharMetrics(uni, x, y);
}
static const SkGlyph& sk_getMetrics_glyph_00(SkGlyphCache* cache,
@@ -1689,7 +1689,7 @@ static const SkMaskGamma& cachedMaskGamma(SkScalar contrast, SkScalar paintGamma
/**
* We ensure that the rec is self-consistent and efficient (where possible)
*/
-void SkScalerContext::PostMakeRec(const SkPaint& paint, SkScalerContext::Rec* rec) {
+void SkScalerContext::PostMakeRec(const SkPaint&, SkScalerContext::Rec* rec) {
/**
* If we're asking for A8, we force the colorlum to be gray, since that
* limits the number of unique entries, and the scaler will only look at