commit 33bee090fa332b2f3db366ae0ecc3231bd8e112e
author msarett <msarett@google.com> Wed Nov 11 12:43:07 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Nov 11 12:43:07 2015 -0800
tree 74233e19db37c46d1485d3485ec3d8f2209e7f4b
parent 67d7620285cdfa60158add6615db03bd48e6d8b0

Fix -Wunused-parameter errors in SkCodec.h in Android

BUG=skia:

Review URL: https://codereview.chromium.org/1437823004

gyp/tools.gyp

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 59b19dc..969ea87 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -589,6 +589,7 @@
         'includes_to_test': [
           '<(skia_include_path)/animator',
           '<(skia_include_path)/c',
+          '<(skia_include_path)/codec',
           '<(skia_include_path)/config',
           '<(skia_include_path)/core',
           '<(skia_include_path)/effects',

include/codec/SkCodec.h

diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index 5127a7c..d90fea8 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -483,7 +483,7 @@
      * kGray_8_SkColorType: Black
      * kIndex_8_SkColorType: First color in color table
      */
-    virtual uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const {
+    virtual uint32_t onGetFillValue(SkColorType /*colorType*/, SkAlphaType alphaType) const {
         return kOpaque_SkAlphaType == alphaType ? SK_ColorBLACK : SK_ColorTRANSPARENT;
     }
 
@@ -537,8 +537,8 @@
     }
 
     // Methods for scanline decoding.
-    virtual SkCodec::Result onStartScanlineDecode(const SkImageInfo& dstInfo,
-            const SkCodec::Options& options, SkPMColor ctable[], int* ctableCount) {
+    virtual SkCodec::Result onStartScanlineDecode(const SkImageInfo& /*dstInfo*/,
+            const SkCodec::Options& /*options*/, SkPMColor* /*ctable*/, int* /*ctableCount*/) {
         return kUnimplemented;
     }
 
@@ -555,7 +555,7 @@
         return countLines == this->onGetScanlines(storage.get(), countLines, 0);
     }
 
-    virtual int onGetScanlines(void* dst, int countLines, size_t rowBytes) { return 0; }
+    virtual int onGetScanlines(void* /*dst*/, int /*countLines*/, size_t /*rowBytes*/) { return 0; }
 
     /**
      * On an incomplete decode, getPixels() and getScanlines() will call this function
@@ -582,7 +582,7 @@
      *
      *  Only valid during scanline decoding.
      */
-    virtual SkSampler* getSampler(bool createIfNecessary) { return nullptr; }
+    virtual SkSampler* getSampler(bool /*createIfNecessary*/) { return nullptr; }
 
     friend class SkSampledCodec;
 };