fix legacy code path for SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG

include/core/SkImageDecoder.h

-
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
 #ifndef SkImageDecoder_DEFINED
 #define SkImageDecoder_DEFINED
 
 #include "SkBitmap.h"
 #include "SkImage.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkTRegistry.h"
 #include "SkTypes.h"
 
@@ skipping 328 matching lines @@
         @param format On success, if format is non-null, it is set to the format
                       of the decoded stream. On failure it is ignored.
      */
     static bool DecodeStream(SkStreamRewindable* stream, SkBitmap* bitmap, SkColorType pref, Mode,
                              Format* format = NULL);
     static bool DecodeStream(SkStreamRewindable* stream, SkBitmap* bitmap) {
         return DecodeStream(stream, bitmap, kUnknown_SkColorType, kDecodePixels_Mode, NULL);
     }
 
 #ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
-    bool decode(SkStream*, SkBitmap* bitmap, SkBitmap::Config pref, Mode mode) {
+    bool decode(SkStream* stream, SkBitmap* bitmap, SkBitmap::Config pref, Mode mode) {
         return this->decode(stream, bitmap, SkBitmapConfigToColorType(pref), mode);
     }
     bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkBitmap::Config pref) {
         return this->decodeSubset(bm, subset, SkBitmapConfigToColorType(pref));
     }
-    static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmapConfig pref, Mode mode,
+    static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmap::Config pref, Mode mode,
                            Format* format = NULL) {
         return DecodeFile(file, bitmap, SkBitmapConfigToColorType(pref), mode, format);
     }
     static bool DecodeMemory(const void* buffer, size_t size, SkBitmap* bitmap,
                              SkBitmap::Config pref, Mode mode, Format* format = NULL) {
         return DecodeMemory(buffer, size, bitmap, SkBitmapConfigToColorType(pref), mode, format);
     }
     static bool DecodeStream(SkStreamRewindable* stream, SkBitmap* bitmap, SkBitmap::Config pref,
                              Mode mode, Format* format = NULL) {
         return DecodeStream(stream, bitmap, SkBitmapConfigToColorType(pref), mode, format);
@@ skipping 154 matching lines @@
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 DECLARE_DECODER_CREATOR(PKMImageDecoder);
 DECLARE_DECODER_CREATOR(KTXImageDecoder);
 
 // Typedefs to make registering decoder and formatter callbacks easier.
 // These have to be defined outside SkImageDecoder. :(
 typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)>        SkImageDecoder_DecodeReg;
 typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecoder_FormatReg;
 
 #endif