diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-01-24 15:37:13 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-24 21:26:29 +0000 |
| commit | 745c398754bb9e57db9a727047e3815b774d33d8 (patch) | |
| tree | faf733c64f001c921880e2d9b0f3937b89e7ca00 | |
| parent | 181ec2f02f2efa822b0fba35feb74fc0ba3945f1 (diff) | |
minor imageinfo fixes
teeny fixes to SkImageInfo.h to get
ready for documenting it. Selected
SkImageInfo.h as Herb discovered that
global enums (especially forward
declared ones) break bookmaker.
TBR=reed@google.com
Bug: skia:6898
Change-Id: I6ecf4f9dd7022c810f3d7a6cfee10fb07aa49aee
Reviewed-on: https://skia-review.googlesource.com/99342
Reviewed-by: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@skia.org>
| -rw-r--r-- | include/core/SkImageInfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 5d2b74af39..24e356b87e 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -45,7 +45,7 @@ enum SkAlphaType { */ kUnpremul_SkAlphaType, - kLastEnum_SkAlphaType = kUnpremul_SkAlphaType + kLastEnum_SkAlphaType = kUnpremul_SkAlphaType, }; static inline bool SkAlphaTypeIsOpaque(SkAlphaType at) { @@ -82,7 +82,7 @@ enum SkColorType { #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) kN32_SkColorType = kRGBA_8888_SkColorType, #else - #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order" + #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order" #endif }; @@ -161,7 +161,7 @@ enum SkYUVColorSpace { range. See http://en.wikipedia.org/wiki/Rec._709 for details. */ kRec709_SkYUVColorSpace, - kLastEnum_SkYUVColorSpace = kRec709_SkYUVColorSpace + kLastEnum_SkYUVColorSpace = kRec709_SkYUVColorSpace, }; /////////////////////////////////////////////////////////////////////////////// @@ -297,8 +297,8 @@ public: return !(*this == other); } - void unflatten(SkReadBuffer&); - void flatten(SkWriteBuffer&) const; + void unflatten(SkReadBuffer& buffer); + void flatten(SkWriteBuffer& buffer) const; /** * Returns the size (in bytes) of the image buffer that this info needs, given the specified |