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

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@12477 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-12-04 07:02:26 +00:00
parent e76a3225d5
commit 6e515d67d2
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkPathRef.h
View File

@ -133,7 +133,7 @@ public:
* optimization for performance and so some paths that are in
* fact ovals can report false.
*/
bool isOval(SkRect* rect) const {
bool isOval(SkRect* rect) const {
if (fIsOval && NULL != rect) {
*rect = getBounds();
}

2
include/gpu/GrTypes.h
View File

@ -252,7 +252,7 @@ static inline int GrMaskFormatBytesPerPixel(GrMaskFormat format) {
// kA8 (0) -> 1
// kA565 (1) -> 2
// kA888 (2) -> 4
// kARGB (3) -> 4
// kARGB (3) -> 4
static const int sBytesPerPixel[] = { 1, 2, 4, 4 };
SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sBytesPerPixel) == kMaskFormatCount, array_size_mismatch);

16
src/gpu/GrTextStrike.cpp
View File

@ -47,9 +47,9 @@ GrFontCache::~GrFontCache() {
}
static GrPixelConfig mask_format_to_pixel_config(GrMaskFormat format) {
static const GrPixelConfig sPixelConfigs[] = {
kAlpha_8_GrPixelConfig,
kRGB_565_GrPixelConfig,
static const GrPixelConfig sPixelConfigs[] = {
kAlpha_8_GrPixelConfig,
kRGB_565_GrPixelConfig,
kSkia8888_GrPixelConfig,
kSkia8888_GrPixelConfig
};
@ -59,11 +59,11 @@ static GrPixelConfig mask_format_to_pixel_config(GrMaskFormat format) {
}
static int mask_format_to_atlas_index(GrMaskFormat format) {
static const int sAtlasIndices[] = {
GrFontCache::kA8_AtlasType,
GrFontCache::k565_AtlasType,
GrFontCache::k8888_AtlasType,
GrFontCache::k8888_AtlasType
static const int sAtlasIndices[] = {
GrFontCache::kA8_AtlasType,
GrFontCache::k565_AtlasType,
GrFontCache::k8888_AtlasType,
GrFontCache::k8888_AtlasType
};
SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sAtlasIndices) == kMaskFormatCount, array_size_mismatch);

4
tests/PathTest.cpp
View File

@ -1951,9 +1951,9 @@ static void test_transform(skiatest::Reporter* reporter) {
SkPath p1; // Leave p1 non-unique (i.e., the empty path)
p.transform(matrix, &p1);
p.transform(matrix, &p1);
SkPoint pts1[kPtCount];
int count = p1.getPoints(pts1, kPtCount);
int count = p1.getPoints(pts1, kPtCount);
REPORTER_ASSERT(reporter, kPtCount == count);
for (int i = 0; i < count; ++i) {
SkPoint newPt = SkPoint::Make(pts[i].fX * 2, pts[i].fY * 3);