diff options
-rw-r--r-- | docs/SkImage_Reference.bmh | 8 | ||||
-rw-r--r-- | site/user/api/SkBlendMode_Reference.md | 2 | ||||
-rw-r--r-- | site/user/api/SkImage_Reference.md | 9 | ||||
-rw-r--r-- | tools/bookmaker/definition.cpp | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh index 002e529819..1c329801a8 100644 --- a/docs/SkImage_Reference.bmh +++ b/docs/SkImage_Reference.bmh @@ -2187,8 +2187,9 @@ void draw(SkCanvas* canvas) { # ------------------------------------------------------------------------------ -#Method sk_sp<SkImage> makeColorSpace(sk_sp<SkColorSpace> target, - SkTransferFunctionBehavior premulBehavior) const +#Method sk_sp<SkImage> makeColorSpace( + sk_sp<SkColorSpace> target, + SkTransferFunctionBehavior premulBehavior = SkTransferFunctionBehavior::kIgnore) const #In Constructor #Line # creates Image matching Color_Space if possible ## @@ -2207,7 +2208,8 @@ and Color_Space. Set premulBehavior to SkTransferFunctionBehavior::kIgnore to treat Image pixels as linear, when converting to destination Color_Type -and Color_Space, ignoring pixel encoding. +and Color_Space, ignoring pixel encoding. premulBehavior is +SkTransferFunctionBehavior::kIgnore by default. #Param target Color_Space describing color range of returned Image ## #Param premulBehavior one of: SkTransferFunctionBehavior::kRespect, diff --git a/site/user/api/SkBlendMode_Reference.md b/site/user/api/SkBlendMode_Reference.md index 8fc68238f6..b00e325725 100644 --- a/site/user/api/SkBlendMode_Reference.md +++ b/site/user/api/SkBlendMode_Reference.md @@ -971,7 +971,7 @@ source hue, leaving destination luminosity and saturation unchanged. ### Example -<div><fiddle-embed name="f206f698e7a8db3d84334c26b1a702dc"></fiddle-embed></div> +<div><fiddle-embed name="a48698975d236573cef512f94a7e360b"></fiddle-embed></div> ## <a name='Color'>Color</a> diff --git a/site/user/api/SkImage_Reference.md b/site/user/api/SkImage_Reference.md index 2e0eeae96b..ad21311548 100644 --- a/site/user/api/SkImage_Reference.md +++ b/site/user/api/SkImage_Reference.md @@ -2300,7 +2300,7 @@ partial or full <a href='#Image'>Image</a>, or nullptr ### Example -<div><fiddle-embed name="bd5286cb9a5e5c32cd980f72b8f400fb"></fiddle-embed></div> +<div><fiddle-embed name="93669037c9eb9d142e7776b9f936fa96"></fiddle-embed></div> ### See Also @@ -2622,7 +2622,9 @@ true if <a href='#Image'>Image</a> is created as needed ## makeColorSpace <pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0"> -<a href='undocumented#sk_sp'>sk sp</a><<a href='#SkImage'>SkImage</a>> <a href='#SkImage_makeColorSpace'>makeColorSpace</a>(<a href='undocumented#sk_sp'>sk sp</a><<a href='undocumented#SkColorSpace'>SkColorSpace</a>> target, <a href='undocumented#SkTransferFunctionBehavior'>SkTransferFunctionBehavior</a> premulBehavior) const +<a href='undocumented#sk_sp'>sk sp</a><<a href='#SkImage'>SkImage</a>> <a href='#SkImage_makeColorSpace'>makeColorSpace</a>( + <a href='undocumented#sk_sp'>sk sp</a><<a href='undocumented#SkColorSpace'>SkColorSpace</a>> target, + <a href='undocumented#SkTransferFunctionBehavior'>SkTransferFunctionBehavior</a> premulBehavior = <a href='undocumented#SkTransferFunctionBehavior_kIgnore'>SkTransferFunctionBehavior::kIgnore</a>) const </pre> Creates <a href='#Image'>Image</a> in <a href='#SkImage_makeColorSpace_target'>target</a> <a href='undocumented#Color_Space'>Color Space</a>. @@ -2640,7 +2642,8 @@ and <a href='undocumented#Color_Space'>Color Space</a>. Set <a href='#SkImage_makeColorSpace_premulBehavior'>premulBehavior</a> to <a href='undocumented#SkTransferFunctionBehavior_kIgnore'>SkTransferFunctionBehavior::kIgnore</a> to treat <a href='#Image'>Image</a> pixels as linear, when converting to destination <a href='SkImageInfo_Reference#Color_Type'>Color Type</a> -and <a href='undocumented#Color_Space'>Color Space</a>, ignoring pixel encoding. +and <a href='undocumented#Color_Space'>Color Space</a>, ignoring pixel encoding. <a href='#SkImage_makeColorSpace_premulBehavior'>premulBehavior</a> is +<a href='undocumented#SkTransferFunctionBehavior_kIgnore'>SkTransferFunctionBehavior::kIgnore</a> by default. ### Parameters diff --git a/tools/bookmaker/definition.cpp b/tools/bookmaker/definition.cpp index 228f898fe1..4dfeda3ac6 100644 --- a/tools/bookmaker/definition.cpp +++ b/tools/bookmaker/definition.cpp @@ -771,7 +771,7 @@ string Definition::formatFunction(Format format) const { int written = 0; do { const char* nextStart = lastEnd; - SkASSERT(written < limit); +// SkASSERT(written < limit); const char* delimiter = methodParser.anyOf(",)"); const char* nextEnd = delimiter ? delimiter : methodParser.fEnd; if (delimiter) { |