hide SkBitmap::setConfig

src/images/SkImageDecoder_pkm.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
@@ skipping 29 matching lines @@
 
     unsigned char* buf = (unsigned char*)autoMal.get();
 
     // Make sure original PKM header is there...
     SkASSERT(etc1_pkm_is_valid(buf));
 
     const unsigned short width = etc1_pkm_get_width(buf);
     const unsigned short height = etc1_pkm_get_height(buf);
 
     // should we allow the Chooser (if present) to pick a config for us???
-    if (!this->chooseFromOneChoice(SkBitmap::kARGB_8888_Config, width, height)) {
+    if (!this->chooseFromOneChoice(kN32_SkColorType, width, height)) {
         return false;
     }
 
     // Setup the sampler...
     SkScaledBitmapSampler sampler(width, height, this->getSampleSize());
 
     // Set the config...
-    bm->setConfig(SkBitmap::kARGB_8888_Config, sampler.scaledWidth(), sampler.scaledHeight(),
-                  0, kOpaque_SkAlphaType);
+    bm->setInfo(SkImageInfo::MakeN32(sampler.scaledWidth(), sampler.scaledHeight(),
+                                     kOpaque_SkAlphaType));
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         return true;
     }
 
     if (!this->allocPixelRef(bm, NULL)) {
         return false;
     }
 
     // Lock the pixels, since we're about to write to them...
     SkAutoLockPixels alp(*bm);
@@ skipping 52 matching lines @@
 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory);
 
 static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) {
     if (is_pkm(stream)) {
         return SkImageDecoder::kPKM_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_pkm);