aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleAll.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-27 13:42:58 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-27 13:42:58 +0000
commit7fa2a65c0cfc714364490cb715171461143024e0 (patch)
treeb7e40b0ca71a7ac8d957d150f038603cde2dcd3c /samplecode/SampleAll.cpp
parent1a5e51f94ed8cb01600184119e52bb64bdb3dccc (diff)
fix more 64bit warnings
BUG=skia: Review URL: https://codereview.chromium.org/147683003 git-svn-id: http://skia.googlecode.com/svn/trunk@13190 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleAll.cpp')
-rw-r--r--samplecode/SampleAll.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 647a199dda..6b742b8355 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -336,10 +336,10 @@ protected:
SkRect rect = {0, 0, SkIntToScalar(40), SkIntToScalar(40) };
SkRect rect2 = {0, 0, SkIntToScalar(65), SkIntToScalar(20) };
SkScalar left = 0, top = 0, x = 0, y = 0;
- size_t index;
+ int index;
char ascii[] = "ascii...";
- size_t asciiLength = sizeof(ascii) - 1;
+ int asciiLength = sizeof(ascii) - 1;
char utf8[] = "utf8" "\xe2\x80\xa6";
short utf16[] = {'u', 't', 'f', '1', '6', 0x2026 };
short utf16simple[] = {'u', 't', 'f', '1', '6', '!' };
@@ -602,7 +602,7 @@ SkCornerPathEffect.h:28:class SkCornerPathEffect : public SkPathEffect {
SkString str("GOOGLE");
for (size_t i = 0; i < SK_ARRAY_COUNT(gRastProcs); i++) {
- apply_shader(&paint, i);
+ apply_shader(&paint, (int)i);
// paint.setMaskFilter(NULL);
// paint.setColor(SK_ColorBLACK);