ensure that opaque-only colortypes always report opaque-alphatype

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 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.
  */
 
 
 #include "SkBitmap.h"
@@ skipping 235 matching lines @@
             break;
         default:
             return false;
     }
     if (canonical) {
         *canonical = alphaType;
     }
     return true;
 }
 
-bool SkBitmap::setConfig(const SkImageInfo& info, size_t rowBytes) {
+bool SkBitmap::setConfig(const SkImageInfo& origInfo, size_t rowBytes) {
+    SkImageInfo info = origInfo;
+
+    if (!validate_alphaType(info.fColorType, info.fAlphaType,
+                            &info.fAlphaType)) {
+        return reset_return_false(this);
+    }
+    
     // require that rowBytes fit in 31bits
     int64_t mrb = info.minRowBytes64();
     if ((int32_t)mrb != mrb) {
         return reset_return_false(this);
     }
     if ((int64_t)rowBytes != (int32_t)rowBytes) {
         return reset_return_false(this);
     }
 
     if (info.width() < 0 || info.height() < 0) {
@@ skipping 1345 matching lines @@
 
 SkBitmap::RLEPixels::~RLEPixels() {
     sk_free(fYPtrs);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkBitmap::validate() const {
     fInfo.validate();
+
+    // ImageInfo may not require this, but Bitmap ensures that opaque-only
+    // colorTypes report opaque for their alphatype
+    if (kRGB_565_SkColorType == fInfo.colorType()) {
+        SkASSERT(kOpaque_SkAlphaType == fInfo.alphaType());
+    }
+
     SkASSERT(fInfo.validRowBytes(fRowBytes));
     uint8_t allFlags = kImageIsOpaque_Flag | kImageIsVolatile_Flag | kImageIsImmutable_Flag;
 #ifdef SK_BUILD_FOR_ANDROID
     allFlags |= kHasHardwareMipMap_Flag;
 #endif
     SkASSERT(fFlags <= allFlags);
     SkASSERT(fPixelLockCount >= 0);
 
     if (fPixels) {
         SkASSERT(fPixelRef);
@@ skipping 54 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif