From 186d08f621efcaf9960ffe4a1dd9e6703de8a698 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Tue, 3 Apr 2018 08:43:27 -0400 Subject: fix bugs exposed by documenting SkImageInfo - More rigorous symbol identification creates additional links, and finds spurious errors like unnecessary parentheses. - Fixed code to allow preprocessor directives in #Code blocks (still more to do). - Fixed examples waiting on fiddle updates. - Make SkImageInfo officially documented (update in status.json). - Fixed enum indentation. Docs-Preview: https://skia.org/?cl=115656 Bug: skia:6898 Change-Id: Ifcf5cfd3f6c03b3b83155c898b2b035a2f3d443c Reviewed-on: https://skia-review.googlesource.com/115656 Commit-Queue: Cary Clark Reviewed-by: Cary Clark --- docs/SkImageInfo_Reference.bmh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docs/SkImageInfo_Reference.bmh') diff --git a/docs/SkImageInfo_Reference.bmh b/docs/SkImageInfo_Reference.bmh index 516de4e35f..f8b3f208eb 100644 --- a/docs/SkImageInfo_Reference.bmh +++ b/docs/SkImageInfo_Reference.bmh @@ -227,7 +227,6 @@ kGray_8_SkColorType, kRGBA_F16_SkColorType #Line # encoding for pixel color ## #Code -###$ enum SkColorType { kUnknown_SkColorType, kAlpha_8_SkColorType, @@ -242,7 +241,7 @@ kGray_8_SkColorType, kRGBA_F16_SkColorType kRGBA_F16_SkColorType, kLastEnum_SkColorType = kRGBA_F16_SkColorType, - +###$ #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) kN32_SkColorType = kBGRA_8888_SkColorType, #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) @@ -250,9 +249,9 @@ kGray_8_SkColorType, kRGBA_F16_SkColorType #else #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order" #endif - }; $$$# -## + }; +#Code ## Describes how pixel bits encode color. A pixel may be an alpha mask, a gray level, Color_RGB, or Color_ARGB. @@ -263,7 +262,7 @@ kBGRA_8888_SkColorType. On Big_Endian processors, pixels pack into 32-bit kRGBA_8888_SkColorType. #Const kUnknown_SkColorType 0 - + Color_Type is uninitialized; encoding format and size is unknown. ## #Const kAlpha_8_SkColorType 1 Encodes Color_Alpha as Alpha_8 pixel in an 8-bit byte. -- cgit v1.2.3