aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-14 21:53:24 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-14 21:53:24 +0000
commitadacc7067ad617cdc7bbef39192ca80f4b4d27f9 (patch)
tree3f6a13154d08c42648ccea82257f37f7c321b00e /tools
parent04b57f87ab6789f7fc302eda8a993d88d4feea8f (diff)
Start cleaning up 64bit Win warnings
Diffstat (limited to 'tools')
-rw-r--r--tools/skdiff_utils.cpp2
-rw-r--r--tools/skpdiff/skpdiff_util.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/skdiff_utils.cpp b/tools/skdiff_utils.cpp
index 0eb405aaa5..1f5289b353 100644
--- a/tools/skdiff_utils.cpp
+++ b/tools/skdiff_utils.cpp
@@ -102,7 +102,7 @@ static SkString replace_all(const SkString &input,
const char *input_cstr = input.c_str();
const char *first_char = input_cstr;
const char *match_char;
- int oldSubstringLen = strlen(oldSubstring);
+ size_t oldSubstringLen = strlen(oldSubstring);
while (NULL != (match_char = strstr(first_char, oldSubstring))) {
output.append(first_char, (match_char - first_char));
output.append(newSubstring);
diff --git a/tools/skpdiff/skpdiff_util.cpp b/tools/skpdiff/skpdiff_util.cpp
index 5b19c7311d..171721c3be 100644
--- a/tools/skpdiff/skpdiff_util.cpp
+++ b/tools/skpdiff/skpdiff_util.cpp
@@ -130,7 +130,7 @@ bool get_directory(const char path[], SkTArray<SkString>* entries) {
return true;
#elif SK_BUILD_FOR_WIN32
char pathDirGlob[MAX_PATH];
- char pathLength = strlen(path);
+ size_t pathLength = strlen(path);
strncpy(pathDirGlob, path, pathLength);
if (path[pathLength - 1] == '/' || path[pathLength - 1] == '\\') {