Cap color index values

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 1220 matching lines @@
     const size_t ramRB = info.minRowBytes();
     const int height = SkMax32(info.height(), 0);
     const uint64_t snugSize = sk_64_mul(snugRB, height);
     const uint64_t ramSize = sk_64_mul(ramRB, height);
     static const uint64_t max_size_t = (size_t)(-1);
     if (!buffer->validate((snugSize <= ramSize) && (ramSize <= max_size_t))) {
         return false;
     }
 
     SkAutoDataUnref data(SkData::NewUninitialized(SkToSizeT(ramSize)));
-    char* dst = (char*)data->writable_data();
+    unsigned char* dst = (unsigned char*)data->writable_data();
     buffer->readByteArray(dst, SkToSizeT(snugSize));
 
     if (snugSize != ramSize) {
-        const char* srcRow = dst + snugRB * (height - 1);
-        char* dstRow = dst + ramRB * (height - 1);
+        const unsigned char* srcRow = dst + snugRB * (height - 1);
+        unsigned char* dstRow = dst + ramRB * (height - 1);
         for (int y = height - 1; y >= 1; --y) {
             memmove(dstRow, srcRow, snugRB);
             srcRow -= snugRB;
             dstRow -= ramRB;
         }
         SkASSERT(srcRow == dstRow); // first row does not need to be moved
     }
 
     SkAutoTUnref<SkColorTable> ctable;
     if (buffer->readBool()) {
         ctable.reset(SkNEW_ARGS(SkColorTable, (*buffer)));
+
+        unsigned char maxIndex = ctable->count() ? ctable->count()-1 : 0;
+        for (uint64_t i = 0; i < ramSize; ++i) {
+            dst[i] = SkTMin(dst[i], maxIndex);
+        }
     }
 
     SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(),
                                                               ctable.get(), data.get()));
     if (!pr.get()) {
         return false;
     }
     bitmap->setInfo(pr->info());
     bitmap->setPixelRef(pr, 0, 0);
     return true;
@@ skipping 123 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif