trim down colortable impl

Bug: skia:
Change-Id: I2a7d3719ccde753b723d33231be49b028ff1c313
Reviewed-on: https://skia-review.googlesource.com/26304
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 2 insertions, 20 deletions

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index e96e968fbf..005e2157fe 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -700,28 +700,10 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
     }
 
     if (buffer->readBool()) {
-        sk_sp<SkColorTable> ctable = SkColorTable::Create(*buffer);
-        if (!ctable) {
+        SkColorTable::Skip(*buffer);
+        if (!buffer->isValid()) {
             return false;
         }
-
-        if (info.isEmpty()) {
-            // require an empty ctable
-            if (ctable->count() != 0) {
-                buffer->validate(false);
-                return false;
-            }
-        } else {
-            // require a non-empty ctable
-            if (ctable->count() == 0) {
-                buffer->validate(false);
-                return false;
-            }
-            unsigned char maxIndex = ctable->count() - 1;
-            for (uint64_t i = 0; i < ramSize; ++i) {
-                dst[i] = SkTMin(dst[i], maxIndex);
-            }
-        }
     }
 
     sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeWithData(info, info.minRowBytes(),