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

Fix linux warnings

Browse Source 
Review URL: http://codereview.appspot.com/6354093/



git-svn-id: http://skia.googlecode.com/svn/trunk@4554 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2012-07-11 19:45:22 +00:00
parent 641ca9c808
commit 548a433ec3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gpu/gl/GrGLCaps.cpp
View File

@ -175,8 +175,8 @@ bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
return true;
}
int otherFormat = GR_GL_RGBA;
int otherType = GR_GL_UNSIGNED_BYTE;
GrGLint otherFormat = GR_GL_RGBA;
GrGLint otherType = GR_GL_UNSIGNED_BYTE;
// The other supported format/type combo supported for ReadPixels
// can change based on which render target is bound
@ -188,7 +188,7 @@ bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
GR_GL_IMPLEMENTATION_COLOR_READ_TYPE,
&otherType);
return otherFormat == format && otherType == type;
return (GrGLenum)otherFormat == format && (GrGLenum)otherType == type;
}
namespace {

4
src/gpu/gl/GrGLPath.cpp
View File

@ -29,7 +29,7 @@ inline GrGLubyte verb_to_gl_path_cmd(const SkPath::Verb verb) {
GR_STATIC_ASSERT(3 == SkPath::kCubic_Verb);
GR_STATIC_ASSERT(4 == SkPath::kClose_Verb);
GrAssert(verb >= 0 && verb < GR_ARRAY_COUNT(gTable));
GrAssert(verb >= 0 && (size_t)verb < GR_ARRAY_COUNT(gTable));
return gTable[verb];
}
@ -47,7 +47,7 @@ inline int num_pts(const SkPath::Verb verb) {
GR_STATIC_ASSERT(3 == SkPath::kCubic_Verb);
GR_STATIC_ASSERT(4 == SkPath::kClose_Verb);
GrAssert(verb >= 0 && verb < GR_ARRAY_COUNT(gTable));
GrAssert(verb >= 0 && (size_t)verb < GR_ARRAY_COUNT(gTable));
return gTable[verb];
}
}

1
src/gpu/gl/GrGpuGL.cpp
View File

@ -1810,6 +1810,7 @@ void GrGpuGL::onGpuStencilPath(const GrPath* path, GrPathFill fill) {
default:
// Only the above two fill rules are allowed.
GrCrash("Unexpected path fill.");
return; // suppress unused var warning.
}
GrGLint writeMask = fStencilSettings.writeMask(GrStencilSettings::kFront_Face);
GL_CALL(StencilFillPath(id, fillMode, writeMask));