| Index: src/fonts/SkTestScalerContext.cpp
|
| diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp
|
| index fc1f9456e25dd4c5a5513a39988e60644f99d961..769f4ea66f6c184e3a37f2a5ec33d9fee024cd42 100644
|
| --- a/src/fonts/SkTestScalerContext.cpp
|
| +++ b/src/fonts/SkTestScalerContext.cpp
|
| @@ -214,9 +214,8 @@ protected:
|
| void generateAdvance(SkGlyph* glyph) SK_OVERRIDE {
|
| fFace->getAdvance(glyph);
|
|
|
| - SkVector advance;
|
| - fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
|
| - SkFixedToScalar(glyph->fAdvanceY), &advance);
|
| + const SkVector advance = fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
|
| + SkFixedToScalar(glyph->fAdvanceY));
|
| glyph->fAdvanceX = SkScalarToFixed(advance.fX);
|
| glyph->fAdvanceY = SkScalarToFixed(advance.fY);
|
| }
|
| @@ -224,9 +223,8 @@ protected:
|
| void generateMetrics(SkGlyph* glyph) SK_OVERRIDE {
|
| fFace->getMetrics(glyph);
|
|
|
| - SkVector advance;
|
| - fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
|
| - SkFixedToScalar(glyph->fAdvanceY), &advance);
|
| + const SkVector advance = fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
|
| + SkFixedToScalar(glyph->fAdvanceY));
|
| glyph->fAdvanceX = SkScalarToFixed(advance.fX);
|
| glyph->fAdvanceY = SkScalarToFixed(advance.fY);
|
|
|
|
|