fix warnings on Mac in miscellaneous files
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6305047
git-svn-id: http://skia.googlecode.com/svn/trunk@4186 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp
index 30ecfa4..c0541d9 100644
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff_main.cpp
@@ -177,7 +177,7 @@
break;
case kDifferentSizes:
fNumMismatches++;
- drp->fFractionDifference = 2.0;// sort as if 200% of pixels differed
+ drp->fFractionDifference = 2;// sort as if 200% of pixels differed
break;
case kDifferentPixels:
fNumMismatches++;
@@ -192,7 +192,7 @@
break;
case kDifferentOther:
fNumMismatches++;
- drp->fFractionDifference = 3.0;// sort as if 300% of pixels differed
+ drp->fFractionDifference = 3;// sort as if 300% of pixels differed
break;
case kBaseMissing:
fNumMismatches++;
@@ -275,6 +275,7 @@
/// Parameterized routine to compute the color of a pixel in a difference image.
typedef SkPMColor (*DiffMetricProc)(SkPMColor, SkPMColor);
+#if 0 // UNUSED
static void expand_and_copy (int width, int height, SkBitmap** dest) {
SkBitmap* temp = new SkBitmap ();
temp->reset();
@@ -284,6 +285,7 @@
temp->rowBytes());
*dest = temp;
}
+#endif
/// Returns true if the two buffers passed in are both non-NULL, and include
/// exactly the same byte values (and identical lengths).
@@ -882,6 +884,7 @@
stream->writeText("px\"></a></td>");
}
+#if 0 // UNUSED
static void print_text_cell (SkFILEWStream* stream, const char* text) {
stream->writeText("<td align=center>");
if (NULL != text) {
@@ -889,6 +892,7 @@
}
stream->writeText("</td>");
}
+#endif
static void print_diff_with_missing_file(SkFILEWStream* stream,
DiffRecord& diff,