Index: bench/nanobench.cpp |
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp |
index 1e9a88af4928b03a14aba34a6e13a573f1edcdae..d6c4c596c1a6d59fb5e4a0242f8be7d3fd7f762b 100644 |
--- a/bench/nanobench.cpp |
+++ b/bench/nanobench.cpp |
@@ -603,8 +603,19 @@ |
fUseMPDs.push_back() = false; |
// Prepare the images for decoding |
- if (!CollectImages(&fImages)) { |
- exit(1); |
+ for (int i = 0; i < FLAGS_images.count(); i++) { |
+ const char* flag = FLAGS_images[i]; |
+ if (sk_isdir(flag)) { |
+ // If the value passed in is a directory, add all the images |
+ SkOSFile::Iter it(flag); |
+ SkString file; |
+ while (it.next(&file)) { |
+ fImages.push_back() = SkOSPath::Join(flag, file.c_str()); |
+ } |
+ } else if (sk_exists(flag)) { |
+ // Also add the value if it is a single image |
+ fImages.push_back() = flag; |
+ } |
} |
// Choose the candidate color types for image decoding |