- Add astcbitmap to gm slides

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 36 matching lines @@
 static bool skip_image_format(SkImageDecoder::Format format) {
     switch (format) {
         case SkImageDecoder::kPNG_Format:
         case SkImageDecoder::kWEBP_Format:
             return false;
         // Skip unknown since it will not be decoded anyway.
         case SkImageDecoder::kUnknown_Format:
         // Technically ICO and BMP supports alpha channels, but our image
         // decoders do not, so skip them as well.
         case SkImageDecoder::kICO_Format:
         case SkImageDecoder::kBMP_Format:

[robertphillips, 2014/08/06 21:13:15]

is -> are ?
format -> formats ?

[krajcevski, 2014/08/06 22:31:00]

Done.

-        // KTX is a Texture format so it's not particularly clear how to 
+        // KTX and ASTC is a Texture format so it's not particularly clear how to 
         // decode the alpha from it.
         case SkImageDecoder::kKTX_Format:
+        case SkImageDecoder::kASTC_Format:
         // The rest of these are opaque.
         case SkImageDecoder::kPKM_Format:
         case SkImageDecoder::kWBMP_Format:
         case SkImageDecoder::kGIF_Format:
         case SkImageDecoder::kJPEG_Format:
             return true;
     }
     SkASSERT(false);
     return true;
 }
@@ skipping 738 matching lines @@
                        ((void*)pixels.get(), sizeof(uint16_t) * pixelCount)));
     decoder->setAllocator(allocator);
     decoder->setSampleSize(2);
     SkBitmap bitmap;
     bool success = decoder->decode(stream, &bitmap, kRGB_565_SkColorType,
                                    SkImageDecoder::kDecodePixels_Mode);
     REPORTER_ASSERT(r, success);
     REPORTER_ASSERT(r, !allocator->ready());  // Decoder used correct memory
     REPORTER_ASSERT(r, sentinal == pixels[pixelCount]);
 }