Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: src/gpu/GrDistanceFieldTextContext.cpp

Issue 795223002: Fix some win64 warnings. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkVarAlloc.h ('k') | src/gpu/GrProgramDesc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDistanceFieldTextContext.cpp
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index d35ba233e720c12f87f228c7c9f4545aed27aee7..641d0c1e01eff1056fadac148e755313f619ee0a 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -306,7 +306,7 @@ void GrDistanceFieldTextContext::onDrawPosText(const GrPaint& paint, const SkPai
glyph.getSubYFixed()),
x, y, fontScaler)) {
// couldn't append, send to fallback
- fallbackTxt.push_back_n(text-lastText, lastText);
+ fallbackTxt.push_back_n(SkToU32(text-lastText), lastText);
reed1 2014/12/11 20:56:26 SkToInt ?
bsalomon 2014/12/11 21:08:47 Imminent CL will fix the casts that should have be
fallbackPos.push_back(pos[0]);
if (2 == scalarsPerPosition) {
fallbackPos.push_back(pos[1]);
@@ -335,7 +335,7 @@ void GrDistanceFieldTextContext::onDrawPosText(const GrPaint& paint, const SkPai
glyph.getSubYFixed()),
x - advanceX, y - advanceY, fontScaler)) {
// couldn't append, send to fallback
- fallbackTxt.push_back_n(text-lastText, lastText);
+ fallbackTxt.push_back_n(SkToU32(text-lastText), lastText);
fallbackPos.push_back(pos[0]);
if (2 == scalarsPerPosition) {
fallbackPos.push_back(pos[1]);
« no previous file with comments | « src/core/SkVarAlloc.h ('k') | src/gpu/GrProgramDesc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698