Adjust the alpha type for pixelRefs.

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 228 matching lines @@
         if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
             SkASSERT(bitmap.colorType() != opts.fRequestedColorType);
             return NULL;  // Can not translate to needed config.
         }
         info.fColorType = opts.fRequestedColorType;
     }
 
     if (opts.fRequireUnpremul && info.fAlphaType != kOpaque_SkAlphaType) {
         info.fAlphaType = kUnpremul_SkAlphaType;
     }
+
+    if (!SkColorTypeValidateAlphaType(info.fColorType, info.fAlphaType, &info.fAlphaType)) {
+        return NULL;
+    }
+
     return SkNEW_ARGS(DecodingImageGenerator,
                       (data, autoStream.detach(), info,
                        opts.fSampleSize, opts.fDitherImage));
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkImageGenerator* SkDecodingImageGenerator::Create(
@@ skipping 13 matching lines @@
         SkStreamRewindable* stream,
         const SkDecodingImageGenerator::Options& opts) {
     SkASSERT(stream != NULL);
     SkASSERT(stream->unique());
     if ((stream == NULL) || !stream->unique()) {
         SkSafeUnref(stream);
         return NULL;
     }
     return CreateDecodingImageGenerator(NULL, stream, opts);
 }