aboutsummaryrefslogtreecommitdiffstats
path: root/tests/CodexTest.cpp
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2017-01-11 17:59:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-11 17:59:47 +0000
commitecbbc7d04216d558f52e2a57f8606176171b557b (patch)
tree907e587be1c4d2a2f6d02db1ff4191c675fad3e4 /tests/CodexTest.cpp
parentc37873eb428715fa9296957de24899124d8438d1 (diff)
parent20de35a0fd855c60b40a7d5d513bbe8e19fda49b (diff)
downloadandroid_external_skia-ecbbc7d04216d558f52e2a57f8606176171b557b.tar.gz
android_external_skia-ecbbc7d04216d558f52e2a57f8606176171b557b.tar.bz2
android_external_skia-ecbbc7d04216d558f52e2a57f8606176171b557b.zip
DO NOT MERGE Do not create an SkRawCodec with zero dimensions
am: 20de35a0fd Change-Id: Ia7b3497eea0e8f5d8524515307905e73d40ab0cf
Diffstat (limited to 'tests/CodexTest.cpp')
-rw-r--r--tests/CodexTest.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index 8ce63029a6..7e6d950430 100644
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -628,6 +628,9 @@ DEF_TEST(Codec_Empty, r) {
test_invalid(r, "empty_images/zero-height.wbmp");
// This image is an ico with an embedded mask-bmp. This is illegal.
test_invalid(r, "invalid_images/mask-bmp-ico.ico");
+#if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32))
+ test_invalid(r, "empty_images/zero_height.tiff");
+#endif
}
static void test_invalid_parameters(skiatest::Reporter* r, const char path[]) {