AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor imageinfo fixes

Browse Source 
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>
This commit is contained in:
Cary Clark 2018-01-24 15:37:13 -05:00 committed by Skia Commit-Bot
parent 181ec2f02f
commit 745c398754
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/core/SkImageInfo.h
View File

@ -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