AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix warnings

Browse Source 
Review URL: https://codereview.appspot.com/7060053

git-svn-id: http://skia.googlecode.com/svn/trunk@7070 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-01-07 22:26:05 +00:00
parent cb88d32b9f
commit 89d15a28b5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/bench_pictures_main.cpp
View File

@ -450,7 +450,7 @@ static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>*
gLogger.logError("Missing scaleFactor for --scale\n");
PRINT_USAGE_AND_EXIT;
}
scaleFactor = atof(*argv);
scaleFactor = SkDoubleToScalar(atof(*argv));
} else if (0 == strcmp(*argv, "--tiles")) {
++argv;
if (argv >= stop) {

2
tools/render_pictures_main.cpp
View File

@ -425,7 +425,7 @@ static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>*
usage(argv0);
exit(-1);
}
scaleFactor = atof(*argv);
scaleFactor = SkDoubleToScalar(atof(*argv));
} else if (0 == strcmp(*argv, "--tiles")) {
++argv;
if (argv >= stop) {

12
tools/skdiff_html.cpp
View File

@ -125,22 +125,22 @@ static void print_label_cell(SkFILEWStream* stream, const DiffRecord& diff) {
print_pixel_count(stream, diff);
}
stream->writeText("<br>");
if (static_cast<int>(diff.fAverageMismatchA) > 0) {
if (SkScalarRoundToInt(diff.fAverageMismatchA) > 0) {
stream->writeText("<br>Average alpha channel mismatch ");
stream->writeDecAsText(static_cast<float>(diff.fAverageMismatchA));
stream->writeDecAsText(SkScalarRoundToInt(diff.fAverageMismatchA));
}
stream->writeText("<br>Max alpha channel mismatch ");
stream->writeDecAsText(static_cast<int>(diff.fMaxMismatchA));
stream->writeDecAsText(SkScalarRoundToInt(diff.fMaxMismatchA));
stream->writeText("<br>Total alpha channel mismatch ");
stream->writeDecAsText(static_cast<int>(diff.fTotalMismatchA));
stream->writeText("<br>");
stream->writeText("<br>Average color mismatch ");
stream->writeDecAsText(static_cast<int>(MAX3(diff.fAverageMismatchR,
diff.fAverageMismatchG,
diff.fAverageMismatchB)));
stream->writeDecAsText(SkScalarRoundToInt(MAX3(diff.fAverageMismatchR,
diff.fAverageMismatchG,
diff.fAverageMismatchB)));
stream->writeText("<br>Max color mismatch ");
stream->writeDecAsText(MAX3(diff.fMaxMismatchR,
diff.fMaxMismatchG,