Compile with c++0x.
http://codereview.appspot.com/5841074/
git-svn-id: http://skia.googlecode.com/svn/trunk@3434 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp
index 75fa008..e1a07eb 100644
--- a/gm/strokefill.cpp
+++ b/gm/strokefill.cpp
@@ -27,9 +27,8 @@
return make_isize(640, 480);
}
- static void show_bold(SkCanvas* canvas, const char text[], SkScalar x,
- SkScalar y, const SkPaint& paint) {
- size_t len = strlen(text);
+ static void show_bold(SkCanvas* canvas, const void* text, int len,
+ SkScalar x, SkScalar y, const SkPaint& paint) {
SkPaint p(paint);
canvas->drawText(text, len, x, y, p);
p.setFakeBoldText(true);
@@ -47,12 +46,12 @@
SkTypeface* face = SkTypeface::CreateFromName("Papyrus", SkTypeface::kNormal);
SkSafeUnref(paint.setTypeface(face));
- show_bold(canvas, "Hello", x, y, paint);
+ show_bold(canvas, "Hello", 5, x, y, paint);
face = SkTypeface::CreateFromName("Hiragino Maru Gothic Pro", SkTypeface::kNormal);
SkSafeUnref(paint.setTypeface(face));
- const char hyphen[] = { 0xE3, 0x83, 0xBC, 0 };
- show_bold(canvas, hyphen, x + SkIntToScalar(300), y, paint);
+ const unsigned char hyphen[] = { 0xE3, 0x83, 0xBC };
+ show_bold(canvas, hyphen, SK_ARRAY_COUNT(hyphen), x + SkIntToScalar(300), y, paint);
paint.setStyle(SkPaint::kStrokeAndFill_Style);