aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2016-02-02 11:56:33 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-02 11:56:33 -0800
commit1497f9f2641b539f0bc45b4f1496ceab7d56b18c (patch)
treefe426c1c965b05d29eea59e5ee2988286cae98cd /dm
parent136f517627556f9f831f92bc3e9e51c1ab9241d3 (diff)
Update SK_IMAGE_VERSION to test RAW
Bump SK_IMAGE_VERSION to test the images in v2 in GoogleStorage, which includes the images from v1 plus test images for SkRawCodec. Only define skia_decodes_raw on platforms that support it, rather than defining it always and checking additional conditions to determine whether to support raw. Further, define it and SK_CODEC_DECODES_RAW for all targets, so we can use the compile flag in other targets. In DM, exclude the raw extensions if SK_CODEC_DECODES_RAW is not defined. Blacklist raw extensions on NexusPlayer, which was running out of memory when running them. BUG=skia:4829 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1612113002 Review URL: https://codereview.chromium.org/1612113002
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index b135b0038b..eb40113a9b 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -537,8 +537,10 @@ static void gather_srcs() {
static const char* const exts[] = {
"bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico",
"BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO",
+#ifdef SK_CODEC_DECODES_RAW
"arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
"ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW",
+#endif
};
for (int i = 0; i < FLAGS_images.count(); i++) {
const char* flag = FLAGS_images[i];