aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-25 12:01:45 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-25 12:01:45 +0000
commit77279cbf9bfa1732b8b4b9437a4a857c6fc18b70 (patch)
tree9819be4fefe72e9326b57d77a8c267717d467d07
parent44b85fe217695435c41ea54356df8cd88cae2f24 (diff)
Fix compiler errors/warnings in r8355
git-svn-id: http://skia.googlecode.com/svn/trunk@8357 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--debugger/SkDrawCommand.cpp2
-rw-r--r--debugger/SkDrawCommand.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp
index e7936a2a21..f731ed775a 100644
--- a/debugger/SkDrawCommand.cpp
+++ b/debugger/SkDrawCommand.cpp
@@ -290,7 +290,7 @@ DrawData::DrawData(const void* data, size_t length) {
// TODO: add display of actual data?
SkString* str = new SkString;
- str->appendf("length: %d", length);
+ str->appendf("length: %d", (int) length);
fInfo.push(str);
}
diff --git a/debugger/SkDrawCommand.h b/debugger/SkDrawCommand.h
index fc812b52c4..7412c1d7bf 100644
--- a/debugger/SkDrawCommand.h
+++ b/debugger/SkDrawCommand.h
@@ -229,7 +229,7 @@ public:
virtual ~DrawData() { delete [] fData; }
virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
- void* fData;
+ char* fData;
size_t fLength;
typedef SkDrawCommand INHERITED;
@@ -306,7 +306,7 @@ public:
virtual ~DrawTextC() { delete [] fText; }
virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
- void* fText;
+ char* fText;
size_t fByteLength;
SkScalar fX;
SkScalar fY;
@@ -337,7 +337,7 @@ public:
virtual ~DrawTextOnPath() { delete [] fText; }
virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
- void* fText;
+ char* fText;
size_t fByteLength;
SkPath fPath;
SkMatrix fMatrix;