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

Side by Side Diff: tools/skpdiff/SkDiffContext.cpp

Issue 154263008: bugfix for typo in skpdiff tool (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« 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 "SkBitmap.h" 8 #include "SkBitmap.h"
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 #include "SkOSFile.h" 10 #include "SkOSFile.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // Perform each diff 101 // Perform each diff
102 for (int differIndex = 0; differIndex < fDifferCount; differIndex++) { 102 for (int differIndex = 0; differIndex < fDifferCount; differIndex++) {
103 SkImageDiffer* differ = fDiffers[differIndex]; 103 SkImageDiffer* differ = fDiffers[differIndex];
104 104
105 // Copy the results into data for this record 105 // Copy the results into data for this record
106 DiffData& diffData = newRecord->fDiffs.push_back(); 106 DiffData& diffData = newRecord->fDiffs.push_back();
107 diffData.fDiffName = differ->getName(); 107 diffData.fDiffName = differ->getName();
108 108
109 if (!differ->diff(&baselineBitmap, &testBitmap, alphaMaskPending, &diffD ata.fResult)) { 109 if (!differ->diff(&baselineBitmap, &testBitmap, alphaMaskPending, &diffD ata.fResult)) {
110 // if the diff failed record -1 as the result 110 // if the diff failed record -1 as the result
111 diffData.fResult = -1; 111 diffData.fResult.result = -1;
112 continue; 112 continue;
113 } 113 }
114 114
115 if (alphaMaskPending 115 if (alphaMaskPending
116 && SkImageDiffer::RESULT_CORRECT != diffData.fResult.result 116 && SkImageDiffer::RESULT_CORRECT != diffData.fResult.result
117 && !diffData.fResult.poiAlphaMask.empty() 117 && !diffData.fResult.poiAlphaMask.empty()
118 && !newRecord->fCommonName.isEmpty()) { 118 && !newRecord->fCommonName.isEmpty()) {
119 119
120 newRecord->fDifferencePath = SkOSPath::SkPathJoin(fDifferenceDir.c_s tr(), 120 newRecord->fDifferencePath = SkOSPath::SkPathJoin(fDifferenceDir.c_s tr(),
121 newRecord->fCommon Name.c_str()); 121 newRecord->fCommon Name.c_str());
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 for (int i = 0; i < cntColumns; i++) { 351 for (int i = 0; i < cntColumns; i++) {
352 SkString str; 352 SkString str;
353 str.printf(", %f", values[i]); 353 str.printf(", %f", values[i]);
354 stream.writeText(str.c_str()); 354 stream.writeText(str.c_str());
355 } 355 }
356 stream.writeText("\n"); 356 stream.writeText("\n");
357 357
358 currentRecord = iter2.next(); 358 currentRecord = iter2.next();
359 } 359 }
360 } 360 }
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