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

Side by Side Diff: dm/DM.cpp

Issue 1280073002: Update libwebp and resume testing scaled webp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update to a newer version of libwebp with another uninitialized fix Created 5 years, 2 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 | « DEPS ('k') | gyp/libwebp.gyp » ('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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 colorTypes[1] = CodecSrc::kIndex8_Always_DstColorType; 295 colorTypes[1] = CodecSrc::kIndex8_Always_DstColorType;
296 numColorTypes = 2; 296 numColorTypes = 2;
297 break; 297 break;
298 default: 298 default:
299 colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType; 299 colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;
300 numColorTypes = 1; 300 numColorTypes = 1;
301 break; 301 break;
302 } 302 }
303 303
304 for (float scale : nativeScales) { 304 for (float scale : nativeScales) {
305 if (scale != 1.0f && (path.endsWith(".webp") || path.endsWith(".WEBP"))) {
306 // FIXME: skbug.com/4038 Scaling webp seems to leave some pixels uni nitialized/
307 // compute their colors based on uninitialized values.
308 continue;
309 }
310
311 for (CodecSrc::Mode mode : nativeModes) { 305 for (CodecSrc::Mode mode : nativeModes) {
312 for (uint32_t i = 0; i < numColorTypes; i++) { 306 for (uint32_t i = 0; i < numColorTypes; i++) {
313 push_codec_src(path, mode, colorTypes[i], scale); 307 push_codec_src(path, mode, colorTypes[i], scale);
314 } 308 }
315 } 309 }
316 } 310 }
317 311
318 if (path.endsWith(".ico") || path.endsWith(".ICO")) { 312 if (path.endsWith(".ico") || path.endsWith(".ICO")) {
319 // FIXME: skbug.com/4404: ICO does not have the ability to decode scanli nes, so we cannot 313 // FIXME: skbug.com/4404: ICO does not have the ability to decode scanli nes, so we cannot
320 // use SkScaledCodec with it. 314 // use SkScaledCodec with it.
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 #endif // SK_PDF_IMAGE_STATS 1108 #endif // SK_PDF_IMAGE_STATS
1115 return 0; 1109 return 0;
1116 } 1110 }
1117 1111
1118 #if !defined(SK_BUILD_FOR_IOS) 1112 #if !defined(SK_BUILD_FOR_IOS)
1119 int main(int argc, char** argv) { 1113 int main(int argc, char** argv) {
1120 SkCommandLineFlags::Parse(argc, argv); 1114 SkCommandLineFlags::Parse(argc, argv);
1121 return dm_main(); 1115 return dm_main();
1122 } 1116 }
1123 #endif 1117 #endif
OLDNEW
« no previous file with comments | « DEPS ('k') | gyp/libwebp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698