| Index: src/utils/SkDumpCanvas.cpp
|
| ===================================================================
|
| --- src/utils/SkDumpCanvas.cpp (revision 11758)
|
| +++ src/utils/SkDumpCanvas.cpp (working copy)
|
| @@ -142,15 +142,15 @@
|
| // FIXME: this code appears to be untested - and probably unused - and probably wrong
|
| switch (enc) {
|
| case SkPaint::kUTF8_TextEncoding:
|
| - str->appendf("\"%.*s\"%s", SkMax32(byteLen, 32), (const char*) text,
|
| + str->appendf("\"%.*s\"%s", SkTMax<size_t>(byteLen, 32), (const char*) text,
|
| byteLen > 32 ? "..." : "");
|
| break;
|
| case SkPaint::kUTF16_TextEncoding:
|
| - str->appendf("\"%.*ls\"%s", SkMax32(byteLen, 32), (const wchar_t*) text,
|
| + str->appendf("\"%.*ls\"%s", SkTMax<size_t>(byteLen, 32), (const wchar_t*) text,
|
| byteLen > 64 ? "..." : "");
|
| break;
|
| case SkPaint::kUTF32_TextEncoding:
|
| - str->appendf("\"%.*ls\"%s", SkMax32(byteLen, 32), (const wchar_t*) text,
|
| + str->appendf("\"%.*ls\"%s", SkTMax<size_t>(byteLen, 32), (const wchar_t*) text,
|
| byteLen > 128 ? "..." : "");
|
| break;
|
| case SkPaint::kGlyphID_TextEncoding:
|
| @@ -444,7 +444,7 @@
|
| void SkDumpCanvas::drawData(const void* data, size_t length) {
|
| // this->dump(kDrawData_Verb, NULL, "drawData(%d)", length);
|
| this->dump(kDrawData_Verb, NULL, "drawData(%d) %.*s", length,
|
| - SkMin32(length, 64), data);
|
| + SkTMin<size_t>(length, 64), data);
|
| }
|
|
|
| void SkDumpCanvas::beginCommentGroup(const char* description) {
|
|
|