Temp fix for crash when generating 16-bit cache for colorTables.

src/core/SkColorTable.cpp

 
 /*
  * Copyright 2009 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 "SkColorTable.h"
@@ skipping 55 matching lines @@
 #include "SkColorPriv.h"
 
 static inline void build_16bitcache(uint16_t dst[], const SkPMColor src[],
                                     int count) {
     while (--count >= 0) {
         *dst++ = SkPixel32ToPixel16_ToU16(*src++);
     }
 }
 
 const uint16_t* SkColorTable::lock16BitCache() {
-    if (this->isOpaque() && NULL == f16BitCache) {
+    SkASSERT(this->isOpaque());

[reed1, 2014/09/29 14:16:00]

// Assert that we're opaque, since our 16bit will be sort of useless if there is
alpha (which we're throwing away)

+    if (NULL == f16BitCache) {
         f16BitCache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
         build_16bitcache(f16BitCache, fColors, fCount);
     }
 
     SkDEBUGCODE(f16BitCacheLockCount += 1);
     return f16BitCache;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 16 matching lines @@
 #ifdef SK_DEBUG
     SkASSERT((unsigned)fCount <= 256);
     SkASSERT(success);
 #endif
 }
 
 void SkColorTable::writeToBuffer(SkWriteBuffer& buffer) const {
     buffer.writeUInt(fAlphaType);
     buffer.writeColorArray(fColors, fCount);
 }