Swizzler changes Index8 and 565

tests/CodexTest.cpp

 /*
  * Copyright 2015 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 "SkCodec.h"
@@ skipping 23 matching lines @@
     SkAutoTDelete<SkStream> stream(resource(path));
     if (!stream) {
         SkDebugf("Missing resource '%s'\n", path);
         return;
     }
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
     if (!codec) {
         ERRORF(r, "Unable to decode '%s'", path);
         return;
     }
-    SkImageInfo info = codec->getInfo();
+    SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);

[msarett, 2015/04/09 16:26:32]

If we don't add this, gif will try to decode to kIndex8, which will fail because
we don't provide a color table.

If it is our goal to use this test to test all possible color type outputs, I
need to go back in and implement something similar to what we have in dm.

If we are simply using this test to check rewinding, then I think this change is
logical.

[scroggo, 2015/04/09 17:37:17]

Another option: we could check for kIndex8, and selectively use a different
color type in that case.
Testing all color type outputs is a slightly trickier, since we'll need to
accept failure for non supported color types.
Agreed. Please add a comment why we only do N32, though.

[msarett, 2015/04/09 19:21:31]

Done.

     REPORTER_ASSERT(r, info.dimensions() == size);
     SkBitmap bm;
     bm.allocPixels(info);
     SkAutoLockPixels autoLockPixels(bm);
     SkImageGenerator::Result result =
         codec->getPixels(info, bm.getPixels(), bm.rowBytes(), NULL, NULL, NULL);
     REPORTER_ASSERT(r, result == SkImageGenerator::kSuccess);
 
     SkMD5::Digest digest1, digest2;
     md5(bm, &digest1);
@@ skipping 32 matching lines @@
     // BMP
     check(r, "randPixels.bmp", SkISize::Make(8, 8), false);
 
     // ICO
     // These two tests examine interestingly different behavior:
     // Decodes an embedded BMP image
     check(r, "color_wheel.ico", SkISize::Make(128, 128), false);
     // Decodes an embedded PNG image
     check(r, "google_chrome.ico", SkISize::Make(256, 256), false);
 
+    // GIF
+    check(r, "box.gif", SkISize::Make(200, 55), false);
+    check(r, "color_wheel.gif", SkISize::Make(128, 128), false);
+    check(r, "randPixels.gif", SkISize::Make(8, 8), false);
+
     // PNG
     check(r, "arrow.png", SkISize::Make(187, 312), true);
     check(r, "baby_tux.png", SkISize::Make(240, 246), true);
     check(r, "color_wheel.png", SkISize::Make(128, 128), true);
     check(r, "half-transparent-white-pixel.png", SkISize::Make(1, 1), true);
     check(r, "mandrill_128.png", SkISize::Make(128, 128), true);
     check(r, "mandrill_16.png", SkISize::Make(16, 16), true);
     check(r, "mandrill_256.png", SkISize::Make(256, 256), true);
     check(r, "mandrill_32.png", SkISize::Make(32, 32), true);
     check(r, "mandrill_512.png", SkISize::Make(512, 512), true);
@@ skipping 24 matching lines @@
     const char emptyGif[] = "GIFVER";
 
     test_invalid_stream(r, nonSupportedStream, sizeof(nonSupportedStream));
     test_invalid_stream(r, emptyPng, sizeof(emptyPng));
     test_invalid_stream(r, emptyJpeg, sizeof(emptyJpeg));
     test_invalid_stream(r, emptyWebp, sizeof(emptyWebp));
     test_invalid_stream(r, emptyBmp, sizeof(emptyBmp));
     test_invalid_stream(r, emptyIco, sizeof(emptyIco));
     test_invalid_stream(r, emptyGif, sizeof(emptyGif));
 }