diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-31 11:55:29 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-31 11:55:30 -0700 |
| commit | d1ebe0689d3b3ce27778cbb3b27e97a4b6c7317c (patch) | |
| tree | 7c9c143ff475b95b18f3374a450cd4d6777f064f /src/gpu | |
| parent | 383ff1047f64192a8d7231a9e20d90126f85997d (diff) | |
Another small fix to GrFontScaler
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1261433006
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrFontScaler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrFontScaler.cpp b/src/gpu/GrFontScaler.cpp index b4ec1beed3..8c0e0e69fc 100644 --- a/src/gpu/GrFontScaler.cpp +++ b/src/gpu/GrFontScaler.cpp @@ -140,7 +140,7 @@ bool GrFontScaler::getPackedGlyphImage(const SkGlyph& glyph, int width, int heig if (SkMask::kBW_Format == glyph.fMaskFormat) { // expand bits to our mask type const uint8_t* bits = reinterpret_cast<const uint8_t*>(src); - switch (this->getMaskFormat()) { + switch (expectedMaskFormat) { case kA8_GrMaskFormat:{ uint8_t* bytes = reinterpret_cast<uint8_t*>(dst); expand_bits(bytes, bits, width, height, dstRB, srcRB); @@ -157,7 +157,7 @@ bool GrFontScaler::getPackedGlyphImage(const SkGlyph& glyph, int width, int heig } else if (srcRB == dstRB) { memcpy(dst, src, dstRB * height); } else { - const int bbp = GrMaskFormatBytesPerPixel(this->getMaskFormat()); + const int bbp = GrMaskFormatBytesPerPixel(expectedMaskFormat); for (int y = 0; y < height; y++) { memcpy(dst, src, width * bbp); src = (const char*)src + srcRB; |