Fix decoding GIF to 565
565 cannot take the !writeTransparentPixels path, so disable it for
cases where we might have to take that path.
This only affects frames beyond the first. If the first frame has
a transparent pixel, it will be marked as non-opaque, so we cannot
decode to 565 anyway.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2441833002
Review-Url: https://codereview.chromium.org/2441833002
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 30185a2..4b297c1 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -473,6 +473,13 @@
}
break;
}
+ case SkCodec::kInvalidConversion:
+ if (i > 0 && (decodeInfo.colorType() == kRGB_565_SkColorType
+ || decodeInfo.colorType() == kIndex_8_SkColorType)) {
+ return Error::Nonfatal(SkStringPrintf(
+ "Cannot decode frame %i to 565/Index8 (%s).", i, fPath.c_str()));
+ }
+ // Fall through.
default:
return SkStringPrintf("Couldn't getPixels for frame %i in %s.",
i, fPath.c_str());