diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 22:26:05 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 22:26:05 +0000 |
| commit | 89d15a28b52faed37b1bda1fbcdd1afae4bae457 (patch) | |
| tree | eacfa3af8d5675eab6cb5c03c8ad93af54212d28 /tools | |
| parent | cb88d32b9fb3921529d1e46422daa65dbea0165d (diff) | |
fix warnings
Review URL: https://codereview.appspot.com/7060053
git-svn-id: http://skia.googlecode.com/svn/trunk@7070 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bench_pictures_main.cpp | 2 | ||||
| -rw-r--r-- | tools/render_pictures_main.cpp | 2 | ||||
| -rw-r--r-- | tools/skdiff_html.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp index 65fc42ad36..73c9a7d188 100644 --- a/tools/bench_pictures_main.cpp +++ b/tools/bench_pictures_main.cpp @@ -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) { diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp index e7ae0362d7..e3e43184d9 100644 --- a/tools/render_pictures_main.cpp +++ b/tools/render_pictures_main.cpp @@ -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) { diff --git a/tools/skdiff_html.cpp b/tools/skdiff_html.cpp index d83b7365fe..6f3c3b09e1 100644 --- a/tools/skdiff_html.cpp +++ b/tools/skdiff_html.cpp @@ -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, |