diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-28 16:39:52 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-28 16:39:52 +0000 |
commit | 7b06ba45b34855a5bb16f9c729813173d7dfe47d (patch) | |
tree | df8faa2c2836c6f7b45ccd2dd536e4eaf388426a /gm/filterbitmap.cpp | |
parent | 98447b0c742953534f9a0691cb352f7f7ba21a8c (diff) |
don't unref() null (from typeface::create) you gunky
git-svn-id: http://skia.googlecode.com/svn/trunk@9294 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/filterbitmap.cpp')
-rw-r--r-- | gm/filterbitmap.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index d7e2352fbc..aba331e070 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -10,6 +10,11 @@ #include "SkTypeface.h" #include "SkImageDecoder.h" + +static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) { + SkSafeUnref(paint->setTypeface(SkTypeface::CreateFromName(name, style))); +} + static void load_bm(SkBitmap* bm) { // SkImageDecoder::DecodeFile("/skia/trunk/books.jpg", bm); @@ -23,13 +28,13 @@ static void load_bm(SkBitmap* bm) { paint.setSubpixelText(true); paint.setTextSize(17); - paint.setTypeface(SkTypeface::CreateFromName("Times", SkTypeface::kNormal))->unref(); + setTypeface(&paint, "Times", SkTypeface::kNormal); canvas.drawText("Hamburgefons", 12, 10, 25, paint); - paint.setTypeface(SkTypeface::CreateFromName("Times", SkTypeface::kItalic))->unref(); + setTypeface(&paint, "Times", SkTypeface::kBold); canvas.drawText("Hamburgefons", 12, 10, 50, paint); - paint.setTypeface(SkTypeface::CreateFromName("Times", SkTypeface::kBold))->unref(); + setTypeface(&paint, "Times", SkTypeface::kItalic); canvas.drawText("Hamburgefons", 12, 10, 75, paint); - paint.setTypeface(SkTypeface::CreateFromName("Times", SkTypeface::kBoldItalic))->unref(); + setTypeface(&paint, "Times", SkTypeface::kBoldItalic); canvas.drawText("Hamburgefons", 12, 10, 100, paint); } |