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

Side by Side Diff: dm/DM.cpp

Issue 1612113002: Update SK_IMAGE_VERSION to test RAW (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Reland, with fixes Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "CrashHandler.h" 8 #include "CrashHandler.h"
9 #include "DMJsonWriter.h" 9 #include "DMJsonWriter.h"
10 #include "DMSrcSink.h" 10 #include "DMSrcSink.h"
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 for (SkString file; it.next(&file); ) { 530 for (SkString file; it.next(&file); ) {
531 push_src("skp", "", new SKPSrc(SkOSPath::Join(path, file.c_str() ))); 531 push_src("skp", "", new SKPSrc(SkOSPath::Join(path, file.c_str() )));
532 } 532 }
533 } else { 533 } else {
534 push_src("skp", "", new SKPSrc(path)); 534 push_src("skp", "", new SKPSrc(path));
535 } 535 }
536 } 536 }
537 static const char* const exts[] = { 537 static const char* const exts[] = {
538 "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico" , 538 "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico" ,
539 "BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO" , 539 "BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO" ,
540 #ifdef SK_CODEC_DECODES_RAW
540 "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw", 541 "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
541 "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW", 542 "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW",
543 #endif
542 }; 544 };
543 for (int i = 0; i < FLAGS_images.count(); i++) { 545 for (int i = 0; i < FLAGS_images.count(); i++) {
544 const char* flag = FLAGS_images[i]; 546 const char* flag = FLAGS_images[i];
545 if (sk_isdir(flag)) { 547 if (sk_isdir(flag)) {
546 for (size_t j = 0; j < SK_ARRAY_COUNT(exts); j++) { 548 for (size_t j = 0; j < SK_ARRAY_COUNT(exts); j++) {
547 SkOSFile::Iter it(flag, exts[j]); 549 SkOSFile::Iter it(flag, exts[j]);
548 for (SkString file; it.next(&file); ) { 550 for (SkString file; it.next(&file); ) {
549 SkString path = SkOSPath::Join(flag, file.c_str()); 551 SkString path = SkOSPath::Join(flag, file.c_str());
550 push_codec_srcs(path); 552 push_codec_srcs(path);
551 if (brd_supported(exts[j])) { 553 if (brd_supported(exts[j])) {
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 Reporter* reporter, 1264 Reporter* reporter,
1263 GrContextFactory* fac tory); 1265 GrContextFactory* fac tory);
1264 } // namespace skiatest 1266 } // namespace skiatest
1265 1267
1266 #if !defined(SK_BUILD_FOR_IOS) 1268 #if !defined(SK_BUILD_FOR_IOS)
1267 int main(int argc, char** argv) { 1269 int main(int argc, char** argv) {
1268 SkCommandLineFlags::Parse(argc, argv); 1270 SkCommandLineFlags::Parse(argc, argv);
1269 return dm_main(); 1271 return dm_main();
1270 } 1272 }
1271 #endif 1273 #endif
OLDNEW
« no previous file with comments | « SK_IMAGE_VERSION ('k') | gyp/codec.gyp » ('j') | tools/dm_flags.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698