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

Side by Side Diff: dm/DM.cpp

Issue 1443783002: Make SkAndroidCodec support bmp (Closed) Base URL: https://skia.googlesource.com/skia.git@ship
Patch Set: Response to comments Created 5 years, 1 month 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
« no previous file with comments | « no previous file | src/codec/SkAndroidCodec.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 if (path.endsWith(ext)) { 356 if (path.endsWith(ext)) {
357 subset = true; 357 subset = true;
358 break; 358 break;
359 } 359 }
360 } 360 }
361 361
362 bool full = false; 362 bool full = false;
363 // The following image types are only supported by BitmapFactory, 363 // The following image types are only supported by BitmapFactory,
364 // so we only need to test full image decodes. 364 // so we only need to test full image decodes.
365 static const char* fullExts[] = { 365 static const char* fullExts[] = {
366 "wbmp", 366 "wbmp", "bmp",
367 "WBMP", 367 "WBMP", "BMP",
368 }; 368 };
369 for (const char* ext : fullExts) { 369 for (const char* ext : fullExts) {
370 if (path.endsWith(ext)) { 370 if (path.endsWith(ext)) {
371 full = true; 371 full = true;
372 break; 372 break;
373 } 373 }
374 } 374 }
375 375
376 if (!full && !subset) { 376 if (!full && !subset) {
377 return; 377 return;
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 #endif // SK_PDF_IMAGE_STATS 1146 #endif // SK_PDF_IMAGE_STATS
1147 return 0; 1147 return 0;
1148 } 1148 }
1149 1149
1150 #if !defined(SK_BUILD_FOR_IOS) 1150 #if !defined(SK_BUILD_FOR_IOS)
1151 int main(int argc, char** argv) { 1151 int main(int argc, char** argv) {
1152 SkCommandLineFlags::Parse(argc, argv); 1152 SkCommandLineFlags::Parse(argc, argv);
1153 return dm_main(); 1153 return dm_main();
1154 } 1154 }
1155 #endif 1155 #endif
OLDNEW
« no previous file with comments | « no previous file | src/codec/SkAndroidCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698