Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: dm/DM.cpp

Issue 1641663002: Stop testing SkImageDecoder in DM/nanobench (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Reblacklist some interlaced images Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/nanobench.cpp ('k') | dm/DMSrcSink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 9f2684cea9c8068fcc45e80131ce6e8eca5ca912..d53402e723b6295dc121a2c8bd0358570f2bea23 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -519,20 +519,6 @@ static bool brd_supported(const char* ext) {
return false;
}
-static bool is_raw(const SkString& file) {
- static const char* const exts[] = {
- "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
- "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW",
- };
-
- for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
- if (file.endsWith(exts[i])) {
- return true;
- }
- }
- return false;
-}
-
static void gather_srcs() {
for (const skiagm::GMRegistry* r = skiagm::GMRegistry::Head(); r; r = r->next()) {
push_src("gm", "", new GMSrc(r->factory()));
@@ -561,9 +547,6 @@ static void gather_srcs() {
SkOSFile::Iter it(flag, exts[j]);
for (SkString file; it.next(&file); ) {
SkString path = SkOSPath::Join(flag, file.c_str());
- if (!is_raw(file)) {
- push_src("image", "decode", new ImageSrc(path)); // Decode entire image
- }
push_codec_srcs(path);
if (brd_supported(exts[j])) {
push_brd_srcs(path);
@@ -572,9 +555,6 @@ static void gather_srcs() {
}
} else if (sk_exists(flag)) {
// assume that FLAGS_images[i] is a valid image if it is a file.
- if (!is_raw(SkString(flag))) {
- push_src("image", "decode", new ImageSrc(flag)); // Decode entire image.
- }
push_codec_srcs(flag);
push_brd_srcs(flag);
}
« no previous file with comments | « bench/nanobench.cpp ('k') | dm/DMSrcSink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698