aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-14 15:03:35 +0000
committerGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-14 15:03:35 +0000
commit8afae61a57f87e4a50578effce6c428031499301 (patch)
treeba9a4d4497a0416b932b384502e3b519af57e3a1 /tools
parent9ed02b9da25a76ee4c73c1ab19c18b899a223a17 (diff)
Clean up most clang warnings outside animator/
Diffstat (limited to 'tools')
-rw-r--r--tools/skdiff_main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp
index 3fc18e7ad8..9c327dfab6 100644
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff_main.cpp
@@ -773,14 +773,13 @@ static void create_diff_images (DiffMetricProc dmp,
drp = new DiffRecord(*baseFiles[i], basePath, comparisonPath);
SkASSERT(kUnknown == drp->fResult);
- SkData* baseFileBits;
- SkData* comparisonFileBits;
+ SkData* baseFileBits = NULL;
+ SkData* comparisonFileBits = NULL;
if (NULL == (baseFileBits = read_file(basePath.c_str()))) {
SkDebugf("WARNING: couldn't read base file <%s>\n",
basePath.c_str());
drp->fResult = kBaseMissing;
- } else if (NULL == (comparisonFileBits = read_file(
- comparisonPath.c_str()))) {
+ } else if (NULL == (comparisonFileBits = read_file(comparisonPath.c_str()))) {
SkDebugf("WARNING: couldn't read comparison file <%s>\n",
comparisonPath.c_str());
drp->fResult = kComparisonMissing;