SkBitmap now really stores SkImageInfo -- config is just a ruse

src/images/SkDecodingImageGenerator.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkImageDecoder.h"
@@ skipping 260 matching lines @@
             SkASSERT(bitmap.config() != config);
             return NULL;  // Can not translate to needed config.
         }
         info.fWidth = bitmap.width();
         info.fHeight = bitmap.height();
         info.fColorType = opts.fRequestedColorType;
         info.fAlphaType = bitmap.alphaType();
 
         // Sanity check.
         SkDEBUGCODE(SkColorType tmp;)
-        SkASSERT(SkBitmapConfigToColorType(config, &tmp));
         SkASSERT(tmp == opts.fRequestedColorType);
     }
     return SkNEW_ARGS(SkDecodingImageGenerator,
                       (data, autoStream.detach(), info,
                        opts.fSampleSize, opts.fDitherImage, config));
 }