diff options
author | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 16:47:43 +0000 |
---|---|---|
committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 16:47:43 +0000 |
commit | 05af1afd429808913683da75644e48bece12e820 (patch) | |
tree | b7f0ec33f2cbbb9312deb9e0e566c8bea4a97320 /src/gpu/SkGpuDevice.cpp | |
parent | 30454293fd4fae81238c582c18232692bff32b1e (diff) |
eliminate all warnings in non-thirdparty code on mac
Most of these issues were due to functions whose definitions appear in header files; I changed those functions to be 'static inline' instead of just 'static' or 'inline', which kills the warning for such functions.
Other functions that were static or anonymous-namespaced but were unused in cpp files were probably called at some point but are no longer; someone who knows more than I do should probably scrub all the functions I either deleted or #if 0'ed out and make sure that the right thing is happening here.
Lots of unused variables removed, and one nasty const issue handled.
There remains a single warning in thirdparty/externals/cityhash/src/city.cc on line 146 related to a signed/unsigned mismatch. I don't know if we have control over this library so I didn't fix this one, but perhaps someone could do something about that one.
BUG=
Review URL: https://codereview.appspot.com/7067044
git-svn-id: http://skia.googlecode.com/svn/trunk@7051 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/SkGpuDevice.cpp')
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index f4c4cf60aa..6a312f3f3b 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -347,8 +347,7 @@ void SkGpuDevice::writePixels(const SkBitmap& bitmap, int x, int y, } namespace { -void purgeClipCB(int genID, void* data) { - GrContext* context = (GrContext*) data; +void purgeClipCB(int genID, void* ) { if (SkClipStack::kInvalidGenID == genID || SkClipStack::kEmptyGenID == genID || @@ -1340,8 +1339,6 @@ void SkGpuDevice::internalDrawBitmap(const SkBitmap& bitmap, return; } - GrEffectStage* stage = grPaint->colorStage(kBitmapTextureIdx); - GrTexture* texture; SkAutoCachedTexture act(this, bitmap, ¶ms, &texture); if (NULL == texture) { |