diff options
| -rw-r--r-- | include/core/SkFontStyle.h | 5 | ||||
| -rw-r--r-- | src/core/SkFontStyle.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontConfigInterface_direct.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_fontconfig.cpp | 4 | ||||
| -rw-r--r-- | tests/TypefaceTest.cpp | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/include/core/SkFontStyle.h b/include/core/SkFontStyle.h index 643b69bd03..5928e03ae1 100644 --- a/include/core/SkFontStyle.h +++ b/include/core/SkFontStyle.h @@ -23,7 +23,7 @@ public: kBold_Weight = 700, kExtraBold_Weight = 800, kBlack_Weight = 900, - kExtraBlack_Weight = 1000 + kExtraBlack_Weight = 1000, }; enum Width { @@ -35,7 +35,8 @@ public: kSemiExpanded_Width = 6, kExpanded_Width = 7, kExtraExpanded_Width = 8, - kUltaExpanded_Width = 9 + kUltraExpanded_Width = 9, + kUltaExpanded_Width = 9, // deprecated, typo }; enum Slant { diff --git a/src/core/SkFontStyle.cpp b/src/core/SkFontStyle.cpp index fc50f1f73f..a24e7cde2e 100644 --- a/src/core/SkFontStyle.cpp +++ b/src/core/SkFontStyle.cpp @@ -19,7 +19,7 @@ SkFontStyle::SkFontStyle() { SkFontStyle::SkFontStyle(int weight, int width, Slant slant) { fUnion.fU32 = 0; fUnion.fR.fWeight = SkTPin<int>(weight, kInvisible_Weight, kExtraBlack_Weight); - fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltaExpanded_Width); + fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltraExpanded_Width); fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kOblique_Slant); } diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index 6e133bd42c..3cde837b9e 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -432,7 +432,7 @@ static SkFontStyle skfontstyle_from_fcpattern(FcPattern* pattern) { { SkTFixed<FC_WIDTH_SEMIEXPANDED>::value, SkTFixed<SkFS::kSemiExpanded_Width>::value }, { SkTFixed<FC_WIDTH_EXPANDED>::value, SkTFixed<SkFS::kExpanded_Width>::value }, { SkTFixed<FC_WIDTH_EXTRAEXPANDED>::value, SkTFixed<SkFS::kExtraExpanded_Width>::value }, - { SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value, SkTFixed<SkFS::kUltaExpanded_Width>::value }, + { SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value, SkTFixed<SkFS::kUltraExpanded_Width>::value }, }; int width = map_ranges(get_int(pattern, FC_WIDTH, FC_WIDTH_NORMAL), widthRanges, SK_ARRAY_COUNT(widthRanges)); @@ -474,7 +474,7 @@ static void fcpattern_from_skfontstyle(SkFontStyle style, FcPattern* pattern) { { SkTFixed<SkFS::kSemiExpanded_Width>::value, SkTFixed<FC_WIDTH_SEMIEXPANDED>::value }, { SkTFixed<SkFS::kExpanded_Width>::value, SkTFixed<FC_WIDTH_EXPANDED>::value }, { SkTFixed<SkFS::kExtraExpanded_Width>::value, SkTFixed<FC_WIDTH_EXTRAEXPANDED>::value }, - { SkTFixed<SkFS::kUltaExpanded_Width>::value, SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value }, + { SkTFixed<SkFS::kUltraExpanded_Width>::value, SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value }, }; int width = map_ranges(style.width(), widthRanges, SK_ARRAY_COUNT(widthRanges)); diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index b5c31c7fdf..0336e5d921 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -340,7 +340,7 @@ static SkFontStyle skfontstyle_from_fcpattern(FcPattern* pattern) { { SkTFixed<FC_WIDTH_SEMIEXPANDED>::value, SkTFixed<SkFS::kSemiExpanded_Width>::value }, { SkTFixed<FC_WIDTH_EXPANDED>::value, SkTFixed<SkFS::kExpanded_Width>::value }, { SkTFixed<FC_WIDTH_EXTRAEXPANDED>::value, SkTFixed<SkFS::kExtraExpanded_Width>::value }, - { SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value, SkTFixed<SkFS::kUltaExpanded_Width>::value }, + { SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value, SkTFixed<SkFS::kUltraExpanded_Width>::value }, }; int width = map_ranges(get_int(pattern, FC_WIDTH, FC_WIDTH_NORMAL), widthRanges, SK_ARRAY_COUNT(widthRanges)); @@ -384,7 +384,7 @@ static void fcpattern_from_skfontstyle(SkFontStyle style, FcPattern* pattern) { { SkTFixed<SkFS::kSemiExpanded_Width>::value, SkTFixed<FC_WIDTH_SEMIEXPANDED>::value }, { SkTFixed<SkFS::kExpanded_Width>::value, SkTFixed<FC_WIDTH_EXPANDED>::value }, { SkTFixed<SkFS::kExtraExpanded_Width>::value, SkTFixed<FC_WIDTH_EXTRAEXPANDED>::value }, - { SkTFixed<SkFS::kUltaExpanded_Width>::value, SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value }, + { SkTFixed<SkFS::kUltraExpanded_Width>::value, SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value }, }; int width = map_ranges(style.width(), widthRanges, SK_ARRAY_COUNT(widthRanges)); diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index 33fa887f52..6f803ce11f 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -83,7 +83,7 @@ DEF_TEST(TypefaceStyle, reporter) { for (int weight = SkFS::kInvisible_Weight; weight <= SkFS::kExtraBlack_Weight; ++weight) { TypefaceStyle_test(reporter, weight, 5, data.get()); } - for (int width = SkFS::kUltraCondensed_Width; width <= SkFS::kUltaExpanded_Width; ++width) { + for (int width = SkFS::kUltraCondensed_Width; width <= SkFS::kUltraExpanded_Width; ++width) { TypefaceStyle_test(reporter, 400, width, data.get()); } } |