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

Side by Side Diff: dm/DM.cpp

Issue 1082923002: Valgrind errors (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « no previous file | no next file » | 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 push_src("image", "codec kGray8", new CodecSrc(path, CodecSrc::kNorm al_Mode, 196 push_src("image", "codec kGray8", new CodecSrc(path, CodecSrc::kNorm al_Mode,
197 CodecSrc::kGrayscale_Always_DstColorType)); 197 CodecSrc::kGrayscale_Always_DstColorType));
198 push_src("image", "scanline kGray8", new CodecSrc(path, CodecSrc::kS canline_Mode, 198 push_src("image", "scanline kGray8", new CodecSrc(path, CodecSrc::kS canline_Mode,
199 CodecSrc::kGrayscale_Always_DstColorType)); 199 CodecSrc::kGrayscale_Always_DstColorType));
200 // Intentional fall through 200 // Intentional fall through
201 // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8? 201 // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
202 // Further discussion on this topic is at skbug.com/3683 202 // Further discussion on this topic is at skbug.com/3683
203 case kIndex_8_SkColorType: 203 case kIndex_8_SkColorType:
204 push_src("image", "codec kIndex8", new CodecSrc(path, CodecSrc::kNorma l_Mode, 204 push_src("image", "codec kIndex8", new CodecSrc(path, CodecSrc::kNorma l_Mode,
205 CodecSrc::kIndex8_Always_DstColorType)); 205 CodecSrc::kIndex8_Always_DstColorType));
206 push_src("image", "scanline kIndex8", new CodecSrc(path, CodecSrc::kSc anline_Mode, 206 // FIXME: Need to implement scanline decoding for kIndex8.
207 CodecSrc::kIndex8_Always_DstColorType)); 207 //push_src("image", "scanline kIndex8", new CodecSrc(path, CodecSrc::k Scanline_Mode,
208 // CodecSrc::kIndex8_Always_DstColorType));
208 break; 209 break;
209 default: 210 default:
210 // Do nothing 211 // Do nothing
211 break; 212 break;
212 } 213 }
213 214
214 // Decode all images to the canvas color type 215 // Decode all images to the canvas color type
215 push_src("image", "codec", new CodecSrc(path, CodecSrc::kNormal_Mode, 216 push_src("image", "codec", new CodecSrc(path, CodecSrc::kNormal_Mode,
216 CodecSrc::kGetFromCanvas_DstColorType)); 217 CodecSrc::kGetFromCanvas_DstColorType));
217 push_src("image", "scanline", new CodecSrc(path, CodecSrc::kScanline_Mode, 218 push_src("image", "scanline", new CodecSrc(path, CodecSrc::kScanline_Mode,
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 } 744 }
744 return 0; 745 return 0;
745 } 746 }
746 747
747 #if !defined(SK_BUILD_FOR_IOS) 748 #if !defined(SK_BUILD_FOR_IOS)
748 int main(int argc, char** argv) { 749 int main(int argc, char** argv) {
749 SkCommandLineFlags::Parse(argc, argv); 750 SkCommandLineFlags::Parse(argc, argv);
750 return dm_main(); 751 return dm_main();
751 } 752 }
752 #endif 753 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698