diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkRegion.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkBlurDrawLooper.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 2 | ||||
-rwxr-xr-x | src/effects/SkTestImageFilters.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkRadialGradient.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkSweepGradient.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointRadialGradient.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrBufferAllocPool.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrTHashCache.h | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrConvolutionEffect.h | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrTextureStripAtlas.cpp | 2 | ||||
-rw-r--r-- | src/image/SkSurface_Gpu.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkFontHost_sandbox_none.cpp | 2 |
18 files changed, 19 insertions, 19 deletions
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp index 936c87e832..4b50bade62 100644 --- a/src/core/SkRegion.cpp +++ b/src/core/SkRegion.cpp @@ -1173,7 +1173,7 @@ static const SkRegion::RunType* skip_intervals_slow(const SkRegion::RunType runs return runs; } -static void compute_bounds(const SkRegion::RunType runs[], int count, +static void compute_bounds(const SkRegion::RunType runs[], SkIRect* bounds, int* ySpanCountPtr, int* intervalCountPtr) { assert_sentinel(runs[0], false); // top @@ -1239,7 +1239,7 @@ void SkRegion::validate() const { { SkIRect bounds; int ySpanCount, intervalCount; - compute_bounds(run, stop - run, &bounds, &ySpanCount, &intervalCount); + compute_bounds(run, &bounds, &ySpanCount, &intervalCount); SkASSERT(bounds == fBounds); SkASSERT(ySpanCount > 0); diff --git a/src/effects/SkBlurDrawLooper.cpp b/src/effects/SkBlurDrawLooper.cpp index b5a8754a03..9585214b29 100644 --- a/src/effects/SkBlurDrawLooper.cpp +++ b/src/effects/SkBlurDrawLooper.cpp @@ -74,7 +74,7 @@ void SkBlurDrawLooper::flatten(SkFlattenableWriteBuffer& buffer) const { buffer.writeUInt(fBlurFlags); } -void SkBlurDrawLooper::init(SkCanvas* canvas) { +void SkBlurDrawLooper::init(SkCanvas*) { fState = kBeforeEdge; } diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 7bb4c93886..bca18e668f 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -420,7 +420,7 @@ void GrMorphologyEffect::getConstantColorComponents(GrColor* color, uint32_t* va GR_DEFINE_EFFECT_TEST(GrMorphologyEffect); GrEffectRef* GrMorphologyEffect::TestCreate(SkMWCRandom* random, - GrContext* context, + GrContext*, GrTexture* textures[]) { int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : GrEffectUnitTest::kAlphaTextureIdx; diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp index c280555226..9af61c8cbf 100755 --- a/src/effects/SkTestImageFilters.cpp +++ b/src/effects/SkTestImageFilters.cpp @@ -69,7 +69,7 @@ SkComposeImageFilter::SkComposeImageFilter(SkFlattenableReadBuffer& buffer) : IN /////////////////////////////////////////////////////////////////////////////// bool SkDownSampleImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src, - const SkMatrix& matrix, + const SkMatrix&, SkBitmap* result, SkIPoint*) { SkScalar scale = fScale; if (scale > SK_Scalar1 || scale <= 0) { diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index ff3a2aa75c..3f670ad629 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -554,7 +554,7 @@ GrEffectRef* GrRadialGradient::TestCreate(SkMWCRandom* random, ///////////////////////////////////////////////////////////////////// void GrGLRadialGradient::emitCode(GrGLShaderBuilder* builder, - const GrEffectStage& stage, + const GrEffectStage&, EffectKey key, const char* vertexCoords, const char* outputColor, diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index fe516ba007..44b03d6b87 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -464,7 +464,7 @@ GrEffectRef* GrSweepGradient::TestCreate(SkMWCRandom* random, ///////////////////////////////////////////////////////////////////// void GrGLSweepGradient::emitCode(GrGLShaderBuilder* builder, - const GrEffectStage& stage, + const GrEffectStage&, EffectKey key, const char* vertexCoords, const char* outputColor, diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index f56e7b429e..d3fb4dd435 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -484,7 +484,7 @@ GrGLConical2Gradient::GrGLConical2Gradient(const GrBackendEffectFactory& factory } void GrGLConical2Gradient::emitCode(GrGLShaderBuilder* builder, - const GrEffectStage& stage, + const GrEffectStage&, EffectKey key, const char* vertexCoords, const char* outputColor, diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 40e2ac3275..0bf308bdb1 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -531,7 +531,7 @@ GrGLRadial2Gradient::GrGLRadial2Gradient(const GrBackendEffectFactory& factory, } void GrGLRadial2Gradient::emitCode(GrGLShaderBuilder* builder, - const GrEffectStage& stage, + const GrEffectStage&, EffectKey key, const char* vertexCoords, const char* outputColor, diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp index db9b2c8d76..65d76c4c96 100644 --- a/src/gpu/GrBufferAllocPool.cpp +++ b/src/gpu/GrBufferAllocPool.cpp @@ -16,7 +16,7 @@ #if GR_DEBUG #define VALIDATE validate #else - static void VALIDATE(bool x = false) {} + static void VALIDATE(bool = false) {} #endif // page size diff --git a/src/gpu/GrTHashCache.h b/src/gpu/GrTHashCache.h index 3427ffe4c2..6bd58c2dba 100644 --- a/src/gpu/GrTHashCache.h +++ b/src/gpu/GrTHashCache.h @@ -20,7 +20,7 @@ template <typename T> class GrTDefaultFindFunctor { public: // always accept the first element examined - bool operator()(const T* elem) const { return true; } + bool operator()(const T*) const { return true; } }; /** diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index f2c5d0915a..5cc05e2f39 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -137,7 +137,7 @@ void GrConfigConversionEffect::getConstantColorComponents(GrColor* color, GR_DEFINE_EFFECT_TEST(GrConfigConversionEffect); GrEffectRef* GrConfigConversionEffect::TestCreate(SkMWCRandom* random, - GrContext* context, + GrContext*, GrTexture* textures[]) { PMConversion pmConv = static_cast<PMConversion>(random->nextULessThan(kPMConversionCnt)); bool swapRB; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 1c0e8f574d..794a9367df 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -180,7 +180,7 @@ bool GrConvolutionEffect::onIsEqual(const GrEffect& sBase) const { GR_DEFINE_EFFECT_TEST(GrConvolutionEffect); GrEffectRef* GrConvolutionEffect::TestCreate(SkMWCRandom* random, - GrContext* context, + GrContext*, GrTexture* textures[]) { int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : GrEffectUnitTest::kAlphaTextureIdx; diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index b2b24e51be..e4faa945b8 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -52,7 +52,7 @@ public: virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { + virtual void getConstantColorComponents(GrColor*, uint32_t* validFlags) const { // If the texture was opaque we could know that the output color if we knew the sum of the // kernel values. *validFlags = 0; diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 58ac3c0254..37e6eb4b25 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -68,7 +68,7 @@ const GrBackendEffectFactory& GrSimpleTextureEffect::getFactory() const { GR_DEFINE_EFFECT_TEST(GrSimpleTextureEffect); GrEffectRef* GrSimpleTextureEffect::TestCreate(SkMWCRandom* random, - GrContext* context, + GrContext*, GrTexture* textures[]) { int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : GrEffectUnitTest::kAlphaTextureIdx; diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 851bdcce7d..e54af25ca0 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -214,7 +214,7 @@ void GrTextureDomainEffect::getConstantColorComponents(GrColor* color, uint32_t* GR_DEFINE_EFFECT_TEST(GrTextureDomainEffect); GrEffectRef* GrTextureDomainEffect::TestCreate(SkMWCRandom* random, - GrContext* context, + GrContext*, GrTexture* textures[]) { int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : GrEffectUnitTest::kAlphaTextureIdx; diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp index 9081fb6f1d..c67a112811 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -34,7 +34,7 @@ GrTextureStripAtlas::GetCache() { } // Remove the specified atlas from the cache -void GrTextureStripAtlas::CleanUp(const GrContext* context, void* info) { +void GrTextureStripAtlas::CleanUp(const GrContext*, void* info) { GrAssert(NULL != info); AtlasEntry* entry = static_cast<AtlasEntry*>(info); diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index c4975774b7..1ed68e50b1 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -86,7 +86,7 @@ void SkSurface_Gpu::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, // Copy the contents of the SkGpuDevice into a new texture and give that // texture to the SkImage. Note that this flushes the SkGpuDevice but // doesn't force an OpenGL flush. -void SkSurface_Gpu::onCopyOnWrite(SkImage* image, SkCanvas* canvas) { +void SkSurface_Gpu::onCopyOnWrite(SkImage* image, SkCanvas*) { GrRenderTarget* rt = (GrRenderTarget*) fDevice->accessRenderTarget(); // are we sharing our render target with the image? diff --git a/src/ports/SkFontHost_sandbox_none.cpp b/src/ports/SkFontHost_sandbox_none.cpp index a52bbffe31..1c59cd1f56 100644 --- a/src/ports/SkFontHost_sandbox_none.cpp +++ b/src/ports/SkFontHost_sandbox_none.cpp @@ -9,6 +9,6 @@ #include "SkTypeface.h" //static -void SkFontHost::EnsureTypefaceAccessible(const SkTypeface& typeface) { +void SkFontHost::EnsureTypefaceAccessible(const SkTypeface&) { //No sandbox, nothing to do. } |