commit 304a07c6c93298c3481bc0d4852d08c22a539504
author Mike Reed <reed@google.com> Wed Jul 12 15:10:28 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 12 20:25:44 2017 +0000
tree ac9b11aab296f645ea66e02cc9e91abad10cd6eb
parent 7da6ba2d63cfd5ae6add617f18ba4882e755642b

remove references to kIndex_8_SkColorType from our tools/tests

Bug: skia:6828
Change-Id: Ib5049c28c11b7320bece20f5a0a886de8b2a4343
Reviewed-on: https://skia-review.googlesource.com/22728
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index fb78d84..6c441d9 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -171,8 +171,6 @@
             }
             alpha8_to_gray8(&bitmap);
 
-            // Verify that we no longer support kIndex8 from this API.
-            SkASSERT(kIndex_8_SkColorType != bitmap.colorType());
             canvas->drawBitmap(bitmap, 0, 0);
             return "";
         }
@@ -229,7 +227,6 @@
                     }
 
                     alpha8_to_gray8(&bitmap);
-                    SkASSERT(kIndex_8_SkColorType != bitmap.colorType());
                     canvas->drawBitmapRect(bitmap,
                             SkRect::MakeXYWH((SkScalar) scaledBorder, (SkScalar) scaledBorder,
                                     (SkScalar) (subsetWidth / fSampleSize),
@@ -343,9 +340,6 @@
                 SkOpts::RGBA_to_rgbA(row, row, bitmap.width());
             }
             break;
-        case kIndex_8_SkColorType:
-            SkASSERT(false);
-            break;
         default:
             // No need to premultiply kGray or k565 outputs.
             break;
@@ -531,10 +525,9 @@
                         break;
                     }
                     case SkCodec::kInvalidConversion:
-                        if (i > 0 && (decodeInfo.colorType() == kRGB_565_SkColorType
-                                      || decodeInfo.colorType() == kIndex_8_SkColorType)) {
+                        if (i > 0 && (decodeInfo.colorType() == kRGB_565_SkColorType)) {
                             return Error::Nonfatal(SkStringPrintf(
-                                "Cannot decode frame %i to 565/Index8 (%s).", i, fPath.c_str()));
+                                "Cannot decode frame %i to 565 (%s).", i, fPath.c_str()));
                         }
                         // Fall through.
                     default: