aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-01-29 07:13:20 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-29 07:13:20 -0800
commit81aca547caeb6d2a526e474eb7e49f234628966e (patch)
treef57de6026618556f67a2220390130c5719f35c89
parent402448d6818cab9d7b7633a0c18fcf574c915357 (diff)
Fix win64 warnings.
TBR=joshualitt@google.com NOTREECHECKS=true Review URL: https://codereview.chromium.org/884253004
-rw-r--r--src/gpu/GrAARectRenderer.cpp4
-rw-r--r--tools/win_dbghelp.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 6866b79aef..48692ebf5e 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -227,8 +227,8 @@ private:
}
void generateAAFillRectGeometry(void* vertices,
- uint32_t offset,
- uint32_t vertexStride,
+ size_t offset,
+ size_t vertexStride,
GrColor color,
const SkMatrix& viewMatrix,
const SkRect& rect,
diff --git a/tools/win_dbghelp.cpp b/tools/win_dbghelp.cpp
index eefb8ac1ce..ebdbaefcfa 100644
--- a/tools/win_dbghelp.cpp
+++ b/tools/win_dbghelp.cpp
@@ -202,7 +202,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) {
* This function expects the .pdb file to be in the same directory.
*/
void setUpDebuggingFromArgs(const char* vargs0) {
- int i = strlen(vargs0);
+ size_t i = strlen(vargs0);
if (i >= 4 && _stricmp(vargs0 - 4, ".exe") == 0) {
// Ignore .exe