From c7a84fa10a2125d288a72aef5c895835aad9e1fc Mon Sep 17 00:00:00 2001 From: caryclark Date: Thu, 29 Jan 2015 09:59:53 -0800 Subject: [PATCH] fix bit rotted code to create test font BUG=skia:3080 R=reed@google.com Review URL: https://codereview.chromium.org/884873007 --- tools/create_test_font.cpp | 76 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/tools/create_test_font.cpp b/tools/create_test_font.cpp index f6cac0a..5e4f6bc 100644 --- a/tools/create_test_font.cpp +++ b/tools/create_test_font.cpp @@ -34,75 +34,75 @@ static struct FontDesc { int fFontIndex; } gFonts[] = { {"Courier New", SkTypeface::kNormal, "Courier New", "Courier New.ttf", - gCourierNew}, + gCourierNew, -1}, {"Courier New", SkTypeface::kBold, "Courier New", "Courier New Bold.ttf", - gCourierNew_Bold}, + gCourierNew_Bold, -1}, {"Courier New", SkTypeface::kItalic, "Courier New", "Courier New Italic.ttf", - gCourierNew_Italic}, + gCourierNew_Italic, -1}, {"Courier New", SkTypeface::kBoldItalic, "Courier New", "Courier New Bold Italic.ttf", - gCourierNew_BoldItalic}, + gCourierNew_BoldItalic, -1}, {"Helvetica", SkTypeface::kNormal, "Liberation Sans", "LiberationSans-Regular.ttf", - gLiberationSans}, + gLiberationSans, -1}, {"Helvetica", SkTypeface::kBold, "Liberation Sans", "LiberationSans-Bold.ttf", - gLiberationSans_Bold}, + gLiberationSans_Bold, -1}, {"Helvetica", SkTypeface::kItalic, "Liberation Sans", "LiberationSans-Italic.ttf", - gLiberationSans_Italic}, + gLiberationSans_Italic, -1}, {"Helvetica", SkTypeface::kBoldItalic, "Liberation Sans", "LiberationSans-BoldItalic.ttf", - gLiberationSans_BoldItalic}, + gLiberationSans_BoldItalic, -1}, {"Hiragino Maru Gothic Pro", SkTypeface::kNormal, "Hiragino Maru Gothic Pro", "Pro W4.otf", - gHiraginoMaruGothicPro}, + gHiraginoMaruGothicPro, -1}, {"Liberation Sans", SkTypeface::kNormal, "Liberation Sans", "LiberationSans-Regular.ttf", - gLiberationSans}, + gLiberationSans, -1}, {"Liberation Sans", SkTypeface::kBold, "Liberation Sans", "LiberationSans-Bold.ttf", - gLiberationSans_Bold}, + gLiberationSans_Bold, -1}, {"Liberation Sans", SkTypeface::kItalic, "Liberation Sans", "LiberationSans-Italic.ttf", - gLiberationSans_Italic}, + gLiberationSans_Italic, -1}, {"Liberation Sans", SkTypeface::kBoldItalic, "Liberation Sans", "LiberationSans-BoldItalic.ttf", - gLiberationSans_BoldItalic}, + gLiberationSans_BoldItalic, -1}, {"monospace", SkTypeface::kNormal, "Courier New", "Courier New.ttf", - gCourierNew}, + gCourierNew, -1}, {"monospace", SkTypeface::kBold, "Courier New", "Courier New Bold.ttf", - gCourierNew_Bold}, + gCourierNew_Bold, -1}, {"monospace", SkTypeface::kItalic, "Courier New", "Courier New Italic.ttf", - gCourierNew_Italic}, + gCourierNew_Italic, -1}, {"monospace", SkTypeface::kBoldItalic, "Courier New", "Courier New Bold Italic.ttf", - gCourierNew_BoldItalic}, + gCourierNew_BoldItalic, -1}, {"Papyrus", SkTypeface::kNormal, "Papyrus", "Papyrus.ttc", - gPapyrus}, + gPapyrus, -1}, {"sans-serif", SkTypeface::kNormal, "Liberation Sans", "LiberationSans-Regular.ttf", - gLiberationSans}, + gLiberationSans, -1}, {"sans-serif", SkTypeface::kBold, "Liberation Sans", "LiberationSans-Bold.ttf", - gLiberationSans_Bold}, + gLiberationSans_Bold, -1}, {"sans-serif", SkTypeface::kItalic, "Liberation Sans", "LiberationSans-Italic.ttf", - gLiberationSans_Italic}, + gLiberationSans_Italic, -1}, {"sans-serif", SkTypeface::kBoldItalic, "Liberation Sans", "LiberationSans-BoldItalic.ttf", - gLiberationSans_BoldItalic}, + gLiberationSans_BoldItalic, -1}, {"serif", SkTypeface::kNormal, "Times New Roman", "Times New Roman.ttf", - gTimesNewRoman}, + gTimesNewRoman, -1}, {"serif", SkTypeface::kBold, "Times New Roman", "Times New Roman Bold.ttf", - gTimesNewRoman_Bold}, + gTimesNewRoman_Bold, -1}, {"serif", SkTypeface::kItalic, "Times New Roman", "Times New Roman Italic.ttf", - gTimesNewRoman_Italic}, + gTimesNewRoman_Italic, -1}, {"serif", SkTypeface::kBoldItalic, "Times New Roman", "Times New Roman Bold Italic.ttf", - gTimesNewRoman_BoldItalic}, + gTimesNewRoman_BoldItalic, -1}, {"Times", SkTypeface::kNormal, "Times New Roman", "Times New Roman.ttf", - gTimesNewRoman}, + gTimesNewRoman, -1}, {"Times", SkTypeface::kBold, "Times New Roman", "Times New Roman Bold.ttf", - gTimesNewRoman_Bold}, + gTimesNewRoman_Bold, -1}, {"Times", SkTypeface::kItalic, "Times New Roman", "Times New Roman Italic.ttf", - gTimesNewRoman_Italic}, + gTimesNewRoman_Italic, -1}, {"Times", SkTypeface::kBoldItalic, "Times New Roman", "Times New Roman Bold Italic.ttf", - gTimesNewRoman_BoldItalic}, + gTimesNewRoman_BoldItalic, -1}, {"Times New Roman", SkTypeface::kNormal, "Times New Roman", "Times New Roman.ttf", - gTimesNewRoman}, + gTimesNewRoman, -1}, {"Times New Roman", SkTypeface::kBold, "Times New Roman", "Times New Roman Bold.ttf", - gTimesNewRoman_Bold}, + gTimesNewRoman_Bold, -1}, {"Times New Roman", SkTypeface::kItalic, "Times New Roman", "Times New Roman Italic.ttf", - gTimesNewRoman_Italic}, + gTimesNewRoman_Italic, -1}, {"Times New Roman", SkTypeface::kBoldItalic, "Times New Roman", "Times New Roman Bold Italic.ttf", - gTimesNewRoman_BoldItalic}, + gTimesNewRoman_BoldItalic, -1}, {"Times Roman", SkTypeface::kNormal, "Liberation Sans", "LiberationSans-Regular.ttf", - gLiberationSans}, + gLiberationSans, -1}, }; const int gFontsCount = (int) SK_ARRAY_COUNT(gFonts); @@ -125,10 +125,10 @@ const char gHeader[] = "// Auto-generated by "; static FILE* font_header() { - SkString outPath(SkOSPath::SkPathJoin(".", "tools")); - outPath = SkOSPath::SkPathJoin(outPath.c_str(), "test_font_data.cpp"); + SkString outPath(SkOSPath::Join(".", "tools")); + outPath = SkOSPath::Join(outPath.c_str(), "test_font_data.cpp"); FILE* out = fopen(outPath.c_str(), "w"); - fprintf(out, "%s%s\n\n", gHeader, SkOSPath::SkBasename(__FILE__).c_str()); + fprintf(out, "%s%s\n\n", gHeader, SkOSPath::Basename(__FILE__).c_str()); return out; } -- 2.7.4