Do not test images with alpha to 565
authormsarett <msarett@google.com>
Mon, 25 Jan 2016 16:20:55 +0000 (08:20 -0800)
committerCommit bot <commit-bot@chromium.org>
Mon, 25 Jan 2016 16:20:55 +0000 (08:20 -0800)
This should handle the untriaged images in Gold.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1635453002

Review URL: https://codereview.chromium.org/1635453002

dm/DMSrcSink.cpp

index 8598de781c9bd48b16a716d006be24015ad4161d..057b6ae480c857460fa81683211eea349e6eaae3 100644 (file)
@@ -288,6 +288,11 @@ Error test_gen(SkCanvas* canvas, SkData* data) {
     // Currently, we will avoid creating a CodecSrc for this case (see DM.cpp).
     SkASSERT(kGray_8_SkColorType != gen->getInfo().colorType());
 
+    if (kOpaque_SkAlphaType != gen->getInfo().alphaType() &&
+            kRGB_565_SkColorType == canvas->imageInfo().colorType()) {
+        return Error::Nonfatal("Skip testing non-opaque images to 565.");
+    }
+
     SkAutoTDelete<SkImage> image(SkImage::NewFromGenerator(gen, nullptr));
     if (!image) {
         return "Could not create image from codec image generator.";