diff options
author | 2013-05-31 12:58:29 +0000 | |
---|---|---|
committer | 2013-05-31 12:58:29 +0000 | |
commit | 6dce11368ad6368fb9cb117d70cf8220f0b6f368 (patch) | |
tree | ed93dba02e21f85fbbeb5183494f066e2d2f1272 | |
parent | 04db31641b37d17e7b93a883ffb48385f9a2bde6 (diff) |
fix warnings on MacOS 10.6
git-svn-id: http://skia.googlecode.com/svn/trunk@9362 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | gm/filterbitmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 9e86b54c03..3431cfd504 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -115,7 +115,7 @@ class FilterBitmapTextGM: public FilterBitmapGM { } void make_bitmap() SK_OVERRIDE { - fBM.setConfig(SkBitmap::kARGB_8888_Config, fTextSize * 8, fTextSize * 6); + fBM.setConfig(SkBitmap::kARGB_8888_Config, int(fTextSize * 8), int(fTextSize * 6)); fBM.allocPixels(); SkCanvas canvas(fBM); canvas.drawColor(SK_ColorWHITE); @@ -126,13 +126,13 @@ class FilterBitmapTextGM: public FilterBitmapGM { paint.setTextSize(fTextSize); setTypeface(&paint, "Times", SkTypeface::kNormal); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2*fTextSize, paint); + canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2f*fTextSize, paint); setTypeface(&paint, "Times", SkTypeface::kBold); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4*fTextSize, paint); + canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4f*fTextSize, paint); setTypeface(&paint, "Times", SkTypeface::kItalic); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6*fTextSize, paint); + canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint); setTypeface(&paint, "Times", SkTypeface::kBoldItalic); - canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8*fTextSize, paint); + canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint); } private: typedef FilterBitmapGM INHERITED; |