| Index: src/core/SkFontStyle.cpp
|
| diff --git a/src/core/SkFontStyle.cpp b/src/core/SkFontStyle.cpp
|
| index 285d17a2b0ec70b6eae8180fa8d9430f59041a48..badf9d7a9d88ba959e5af42ce705da3ee07a009a 100644
|
| --- a/src/core/SkFontStyle.cpp
|
| +++ b/src/core/SkFontStyle.cpp
|
| @@ -18,9 +18,9 @@ SkFontStyle::SkFontStyle() {
|
|
|
| SkFontStyle::SkFontStyle(int weight, int width, Slant slant) {
|
| fUnion.fU32 = 0;
|
| - fUnion.fR.fWeight = SkPin32(weight, kThin_Weight, kBlack_Weight);
|
| - fUnion.fR.fWidth = SkPin32(width, kUltraCondensed_Width, kUltaExpanded_Width);
|
| - fUnion.fR.fSlant = SkPin32(slant, kUpright_Slant, kItalic_Slant);
|
| + fUnion.fR.fWeight = SkTPin<int>(weight, kThin_Weight, kBlack_Weight);
|
| + fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltaExpanded_Width);
|
| + fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kItalic_Slant);
|
| }
|
|
|
| SkFontStyle::SkFontStyle(unsigned oldStyle) {
|
|
|