Fix compiler errors/warnings in r8355

git-svn-id: http://skia.googlecode.com/svn/trunk@8357 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-03-25 12:01:45 +00:00
parent 44b85fe217
commit 77279cbf9b
2 changed files with 4 additions and 4 deletions

View File

@ -290,7 +290,7 @@ DrawData::DrawData(const void* data, size_t length) {
// TODO: add display of actual data? // TODO: add display of actual data?
SkString* str = new SkString; SkString* str = new SkString;
str->appendf("length: %d", length); str->appendf("length: %d", (int) length);
fInfo.push(str); fInfo.push(str);
} }

View File

@ -229,7 +229,7 @@ public:
virtual ~DrawData() { delete [] fData; } virtual ~DrawData() { delete [] fData; }
virtual void execute(SkCanvas* canvas) SK_OVERRIDE; virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private: private:
void* fData; char* fData;
size_t fLength; size_t fLength;
typedef SkDrawCommand INHERITED; typedef SkDrawCommand INHERITED;
@ -306,7 +306,7 @@ public:
virtual ~DrawTextC() { delete [] fText; } virtual ~DrawTextC() { delete [] fText; }
virtual void execute(SkCanvas* canvas) SK_OVERRIDE; virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private: private:
void* fText; char* fText;
size_t fByteLength; size_t fByteLength;
SkScalar fX; SkScalar fX;
SkScalar fY; SkScalar fY;
@ -337,7 +337,7 @@ public:
virtual ~DrawTextOnPath() { delete [] fText; } virtual ~DrawTextOnPath() { delete [] fText; }
virtual void execute(SkCanvas* canvas) SK_OVERRIDE; virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private: private:
void* fText; char* fText;
size_t fByteLength; size_t fByteLength;
SkPath fPath; SkPath fPath;
SkMatrix fMatrix; SkMatrix fMatrix;