diff options
author | Cary Clark <caryclark@skia.org> | 2018-10-17 09:39:54 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-10-17 14:09:00 +0000 |
commit | 7bae65d0070c5923abe8d052688b86e41d872f33 (patch) | |
tree | fa5ee2f4b426519a22f2bf732480dafeb2f34270 /site | |
parent | ca7c297989619d9a1f3e7bd5389cf5ee25b11c0b (diff) | |
download | skqp-7bae65d0070c5923abe8d052688b86e41d872f33.tar.gz |
fix bookmaker
TBR=brianosman@google.com
Docs-Preview: https://skia.org/?cl=163121
Bug: skia:
Change-Id: I3191da39b9b9b642d2a7160ac0e274d56869bdf4
Reviewed-on: https://skia-review.googlesource.com/c/163121
Commit-Queue: Cary Clark <caryclark@skia.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'site')
-rw-r--r-- | site/user/api/SkColor4f_Reference.md | 56 | ||||
-rw-r--r-- | site/user/api/SkColor_Reference.md | 14 | ||||
-rw-r--r-- | site/user/api/SkMatrix_Reference.md | 10 |
3 files changed, 65 insertions, 15 deletions
diff --git a/site/user/api/SkColor4f_Reference.md b/site/user/api/SkColor4f_Reference.md index fefe65cd75..49fcc12b8a 100644 --- a/site/user/api/SkColor4f_Reference.md +++ b/site/user/api/SkColor4f_Reference.md @@ -33,9 +33,9 @@ struct <a href='#SkRGBA4f'>SkRGBA4f</a> { static <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_FromPMColor'>FromPMColor</a>(<a href='SkColor_Reference#SkPMColor'>SkPMColor</a>); <a href='#SkRGBA4f'>SkRGBA4f</a><<a href='SkImageInfo_Reference#kPremul_SkAlphaType'>kPremul_SkAlphaType</a>> <a href='#SkRGBA4f_premul'>premul</a>() const; <a href='#SkRGBA4f'>SkRGBA4f</a><<a href='SkImageInfo_Reference#kUnpremul_SkAlphaType'>kUnpremul_SkAlphaType</a>> <a href='#SkRGBA4f_unpremul'>unpremul</a>() const; - uint32_t toBytes_RGBA() const; - static <a href='#SkRGBA4f'>SkRGBA4f</a> FromBytes_RGBA(uint32_t color); - <a href='#SkRGBA4f'>SkRGBA4f</a> makeOpaque() const; + uint32_t <a href='#SkRGBA4f_toBytes_RGBA'>toBytes_RGBA</a>() const; + static <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_FromBytes_RGBA'>FromBytes_RGBA</a>(uint32_t color); + <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_makeOpaque'>makeOpaque</a>() const; }; </pre> @@ -540,6 +540,56 @@ Returns <a href='#SkRGBA4f'>SkRGBA4f</a> with all components independent of <a h <a href='#SkRGBA4f_premul'>premul</a> +<a name='SkRGBA4f_toBytes_RGBA'></a> + +--- + +<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0"> +uint32_t <a href='#SkRGBA4f_toBytes_RGBA'>toBytes RGBA</a>() const +</pre> + +Produces bytes in RGBA order. Component values are not affected by color <a href='SkColor_Reference#Alpha'>Alpha</a>. + +### Return Value + +color + +<a name='SkRGBA4f_FromBytes_RGBA'></a> + +--- + +<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0"> +static <a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_FromBytes_RGBA'>FromBytes RGBA</a>(uint32_t color) +</pre> + +Returns from <a href='#SkRGBA4f_FromBytes_RGBA_color'>color</a> <a href='SkImageInfo_Reference#kRGBA_8888_SkColorType'>kRGBA_8888_SkColorType</a> order. Component values are +not affected by <a href='#SkRGBA4f_FromBytes_RGBA_color'>color</a> <a href='SkColor_Reference#Alpha'>Alpha</a>. + +### Parameters + +<table> <tr> <td><a name='SkRGBA4f_FromBytes_RGBA_color'><code><strong>color</strong></code></a></td> + <td><a href='undocumented#Premultiply'>Premultiplied</a> or <a href='undocumented#Unpremultiply'>Unpremultiplied</a></td> + </tr> +</table> + +### Return Value + +<a href='#SkRGBA4f_FromBytes_RGBA_color'>color</a> + +<a name='SkRGBA4f_makeOpaque'></a> + +--- + +<pre style="padding: 1em 1em 1em 1em; width: 62.5em;background-color: #f0f0f0"> +<a href='#SkRGBA4f'>SkRGBA4f</a> <a href='#SkRGBA4f_makeOpaque'>makeOpaque</a>() const +</pre> + +Returns color with <a href='SkColor_Reference#Alpha'>Alpha</a> set to one. + +### Return Value + +color + <a name='SkColor4f'></a> --- diff --git a/site/user/api/SkColor_Reference.md b/site/user/api/SkColor_Reference.md index 8a79b54518..9ecda8d5e8 100644 --- a/site/user/api/SkColor_Reference.md +++ b/site/user/api/SkColor_Reference.md @@ -321,8 +321,8 @@ from <a href='#SkColorSetA_a'>a</a>. <a href='#Alpha'>Alpha</a> component of <a --- <pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0"> -constexpr <a href='#SkAlpha'>SkAlpha</a> <a href='#SK_AlphaOPAQUE'>SK_AlphaOPAQUE</a> = 0xFF; constexpr <a href='#SkAlpha'>SkAlpha</a> <a href='#SK_AlphaTRANSPARENT'>SK_AlphaTRANSPARENT</a> = 0x00; +constexpr <a href='#SkAlpha'>SkAlpha</a> <a href='#SK_AlphaOPAQUE'>SK_AlphaOPAQUE</a> = 0xFF; </pre> <a href='#Alpha'>Alpha</a> constants are conveniences to represent fully transparent and fully @@ -372,17 +372,17 @@ fully transparent; to 255, fully opaque. <pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0"> constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorGREEN'>SK_ColorGREEN</a>; -constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorLTGRAY'>SK_ColorLTGRAY</a>; constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorRED'>SK_ColorRED</a>; -constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorGRAY'>SK_ColorGRAY</a>; -constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorYELLOW'>SK_ColorYELLOW</a>; constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorBLACK'>SK_ColorBLACK</a>; -constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorDKGRAY'>SK_ColorDKGRAY</a>; constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorTRANSPARENT'>SK_ColorTRANSPARENT</a>; -constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorCYAN'>SK_ColorCYAN</a>; +constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorDKGRAY'>SK_ColorDKGRAY</a>; +constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorLTGRAY'>SK_ColorLTGRAY</a>; +constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorGRAY'>SK_ColorGRAY</a>; constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorWHITE'>SK_ColorWHITE</a>; -constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorMAGENTA'>SK_ColorMAGENTA</a>; +constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorYELLOW'>SK_ColorYELLOW</a>; constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorBLUE'>SK_ColorBLUE</a>; +constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorCYAN'>SK_ColorCYAN</a>; +constexpr <a href='#SkColor'>SkColor</a> <a href='#SK_ColorMAGENTA'>SK_ColorMAGENTA</a>; </pre> <a href='#Color'>Color</a> names are provided as conveniences, but are not otherwise special. diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md index bb0feaf91a..a94b565aa9 100644 --- a/site/user/api/SkMatrix_Reference.md +++ b/site/user/api/SkMatrix_Reference.md @@ -790,15 +790,15 @@ Skews are not similar and do not preserve right angles. --- <pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0"> - static constexpr int <a href='#SkMatrix_kMPersp2'>kMPersp2</a> = 8; - static constexpr int <a href='#SkMatrix_kMPersp0'>kMPersp0</a> = 6; static constexpr int <a href='#SkMatrix_kMPersp1'>kMPersp1</a> = 7; - static constexpr int <a href='#SkMatrix_kMSkewX'>kMSkewX</a> = 1; + static constexpr int <a href='#SkMatrix_kMPersp2'>kMPersp2</a> = 8; + static constexpr int <a href='#SkMatrix_kMSkewY'>kMSkewY</a> = 3; static constexpr int <a href='#SkMatrix_kMTransX'>kMTransX</a> = 2; static constexpr int <a href='#SkMatrix_kMScaleX'>kMScaleX</a> = 0; - static constexpr int <a href='#SkMatrix_kMSkewY'>kMSkewY</a> = 3; - static constexpr int <a href='#SkMatrix_kMScaleY'>kMScaleY</a> = 4; + static constexpr int <a href='#SkMatrix_kMSkewX'>kMSkewX</a> = 1; static constexpr int <a href='#SkMatrix_kMTransY'>kMTransY</a> = 5; + static constexpr int <a href='#SkMatrix_kMScaleY'>kMScaleY</a> = 4; + static constexpr int <a href='#SkMatrix_kMPersp0'>kMPersp0</a> = 6; </pre> <a href='#Matrix'>Matrix</a> organizes its values in row order. These members correspond to |