From 11407e56f2779f3204ba481b38946137d8094715 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Mon, 5 Nov 2018 21:26:13 -0500 Subject: [PATCH] fix paint docs fix bookmaker build for setHinting TBR=reed@google.com Bug: skia: Change-Id: Ieade1bca4cd369eb5a9431796c83e039ae69e81c Reviewed-on: https://skia-review.googlesource.com/c/168480 Reviewed-by: Cary Clark Commit-Queue: Cary Clark Auto-Submit: Cary Clark --- docs/SkPaint_Reference.bmh | 27 ++++++++++++++------------- docs/undocumented.bmh | 10 ++++++++++ include/core/SkPaint.h | 11 +++++++++-- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh index 5543fba1a0bcb..49c8f65d4a095 100644 --- a/docs/SkPaint_Reference.bmh +++ b/docs/SkPaint_Reference.bmh @@ -375,24 +375,25 @@ Set SkPaintDefaults_Hinting at compile time to change the default setting. ## ## -#Method void setHinting(Hinting hintingLevel) - +#Method void setHinting(SkFontHinting hintingLevel) #In Hinting #Line # sets Hinting, glyph outline adjustment level ## - Sets level of glyph outline adjustment. - Does not check for valid values of hintingLevel. +#Populate - #Table - #Legend - # Hinting # value # effect on generated glyph outlines ## - ## - # kNo_Hinting # 0 # leaves glyph outlines unchanged from their native representation ## - # kSlight_Hinting # 1 # modifies glyph outlines minimally to improve contrast ## - # kNormal_Hinting # 2 # modifies glyph outlines to improve contrast ## - # kFull_Hinting # 3 # modifies glyph outlines for maximum contrast ## + #Example + SkPaint paint1, paint2; + paint2.setHinting(kNormal_SkFontHinting); + SkDebugf("paint1 %c= paint2\n", paint1 == paint2 ? '=' : ':'); + + #StdOut + paint1 == paint2 + ## ## +## - #Param hintingLevel one of: kNo_Hinting, kSlight_Hinting, kNormal_Hinting, kFull_Hinting ## +#Method void setHinting(Hinting hintingLevel) +#In Hinting +#Populate #Example SkPaint paint1, paint2; diff --git a/docs/undocumented.bmh b/docs/undocumented.bmh index 3eda4ebbc70b3..216373d2123e4 100644 --- a/docs/undocumented.bmh +++ b/docs/undocumented.bmh @@ -344,6 +344,16 @@ FT_Load_Glyph ## #Class SkFont ## +#Enum SkFontHinting +#Const kNo_SkFontHinting 0 +## +#Const kSlight_SkFontHinting 1 +## +#Const kNormal_SkFontHinting 2 +## +#Const kFull_SkFontHinting 3 +## +## #Topic ## #Topic Font_Manager diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index f89a4854429a3..147f9675fdfc2 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -208,10 +208,17 @@ class SK_API SkPaint { /** Sets level of glyph outline adjustment. Does not check for valid values of hintingLevel. - @param hintingLevel one of: kNo_Hinting, kSlight_Hinting, kNormal_Hinting, kFull_Hinting + @param hintingLevel one of: kNo_SkFontHinting, kSlight_SkFontHinting, + kNormal_SkFontHinting, kFull_SkFontHinting */ void setHinting(SkFontHinting hintingLevel); - void setHinting(Hinting hintingLevel) { + + /** Sets level of glyph outline adjustment. + Does not check for valid values of hintingLevel. + + @param hintingLevel one of: kNo_Hinting, kSlight_Hinting, kNormal_Hinting, kFull_Hinting + */ + void setHinting(Hinting hintingLevel) { this->setHinting((SkFontHinting)hintingLevel); }