diff options
| -rw-r--r-- | bench/GameBench.cpp | 6 | ||||
| -rw-r--r-- | src/fonts/SkFontMgr_fontconfig.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_fontconfig.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index bfb2337eff..63a0d02f97 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -140,7 +140,7 @@ protected: SkPaint p2; // for drawVertices path p2.setColor(0xFF000000); p2.setFilterBitmap(true); - p2.setShader(SkShader::CreateBitmapShader(fAtlas, + p2.setShader(SkShader::CreateBitmapShader(fAtlas, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode))->unref(); @@ -197,14 +197,14 @@ protected: curCell = (curCell + 1) % (kNumAtlasedX*kNumAtlasedY); if (fUseDrawVertices) { - SkPoint uvs[4] = { + SkPoint uvs[4] = { { SkIntToScalar(src.fLeft), SkIntToScalar(src.fBottom) }, { SkIntToScalar(src.fLeft), SkIntToScalar(src.fTop) }, { SkIntToScalar(src.fRight), SkIntToScalar(src.fTop) }, { SkIntToScalar(src.fRight), SkIntToScalar(src.fBottom) }, }; canvas->drawVertices(SkCanvas::kTriangles_VertexMode, - 4, verts, uvs, NULL, NULL, + 4, verts, uvs, NULL, NULL, indices, 6, p2); } else { canvas->drawBitmapRect(fAtlas, &src, dst, &p); diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp index 27b5f313f5..367faf8528 100644 --- a/src/fonts/SkFontMgr_fontconfig.cpp +++ b/src/fonts/SkFontMgr_fontconfig.cpp @@ -282,7 +282,7 @@ protected: SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL; } - + virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) SK_OVERRIDE { return FontConfigTypeface::LegacyCreateTypeface(NULL, familyName, diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp index 75c21c243b..2826c6e783 100644 --- a/src/ports/SkFontHost_fontconfig.cpp +++ b/src/ports/SkFontHost_fontconfig.cpp @@ -211,5 +211,3 @@ void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc, SkTypeface* FontConfigTypeface::onRefMatchingStyle(Style style) const { return LegacyCreateTypeface(this, NULL, style); } - - |