diff options
| author |  yujieqin <yujieqin@google.com> | 2016-02-29 07:14:42 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-29 07:14:42 -0800 |
| commit | f236ee4e44662e519db4b4997eee5d2bc8543f9c (patch) | |
| tree | eabb285ab13b2b22e3beddea95dee94b1dd8476c /tests/CodexTest.cpp | |
| parent | e93c17b35af5ebc16af8bb09fd5a83d61a25d879 (diff) | |
Enable RAW codec for Windows
* Fix the exception catching
* Set preprocessor differently for MSVC
BUG=skia:4889(b/26958348)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1738913002
Committed: https://skia.googlesource.com/skia/+/474e4c3dd28b67f590851321f15d9983ef7fd031
Review URL: https://codereview.chromium.org/1738913002
Diffstat (limited to 'tests/CodexTest.cpp')
| -rw-r--r-- | tests/CodexTest.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp index a0789fb819..37e4f305b5 100644 --- a/tests/CodexTest.cpp +++ b/tests/CodexTest.cpp @@ -397,7 +397,8 @@ DEF_TEST(Codec, r) { check(r, "yellow_rose.png", SkISize::Make(400, 301), true, false, false); // RAW -#if defined(SK_CODEC_DECODES_RAW) +// Disable RAW tests for Win32. +#if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32)) check(r, "sample_1mp.dng", SkISize::Make(600, 338), false, false, false); check(r, "sample_1mp_rotated.dng", SkISize::Make(600, 338), false, false, false); check(r, "dng_with_preview.dng", SkISize::Make(600, 338), true, false, false); @@ -596,7 +597,8 @@ DEF_TEST(Codec_Dimensions, r) { test_dimensions(r, "mandrill_16.png"); // RAW -#if defined(SK_CODEC_DECODES_RAW) +// Disable RAW tests for Win32. +#if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32)) test_dimensions(r, "sample_1mp.dng"); test_dimensions(r, "sample_1mp_rotated.dng"); test_dimensions(r, "dng_with_preview.dng"); @@ -872,9 +874,10 @@ private: SkMemoryStream fStream; }; +// Disable RAW tests for Win32. +#if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32)) // Test that the RawCodec works also for not asset stream. This will test the code path using // SkRawBufferedStream instead of SkRawAssetStream. -#if defined(SK_CODEC_DECODES_RAW) DEF_TEST(Codec_raw_notseekable, r) { const char* path = "dng_with_preview.dng"; SkString fullPath(GetResourcePath(path)); |