commit 94acc70312d8fe6605dea99f27f62b180bf22284
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 06 18:43:21 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 06 18:43:21 2012 +0000
tree 1aee4ca3784d75c3ae2eb1a626d1cb5d6479022e
parent 22023bea1b7c5eff958214a3fd6f7fc4ffeec76c

Fixed Windows compiler complaints (esp. in debugger)

https://codereview.appspot.com/6497090/



git-svn-id: http://skia.googlecode.com/svn/trunk@5419 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/SkObjectParser.cpp

diff --git a/debugger/SkObjectParser.cpp b/debugger/SkObjectParser.cpp
index af12083..bf6a053 100644
--- a/debugger/SkObjectParser.cpp
+++ b/debugger/SkObjectParser.cpp
@@ -40,13 +40,13 @@
 SkString* SkObjectParser::IRectToString(const SkIRect& rect) {
     SkString* mRect = new SkString("SkIRect: ");
     mRect->append("L: ");
-    mRect->appendScalar(rect.left());
+    mRect->appendScalar(SkIntToScalar(rect.left()));
     mRect->append(", T: ");
-    mRect->appendScalar(rect.top());
+    mRect->appendScalar(SkIntToScalar(rect.top()));
     mRect->append(", R: ");
-    mRect->appendScalar(rect.right());
+    mRect->appendScalar(SkIntToScalar(rect.right()));
     mRect->append(", B: ");
-    mRect->appendScalar(rect.bottom());
+    mRect->appendScalar(SkIntToScalar(rect.bottom()));
     return mRect;
 }
 
@@ -175,9 +175,8 @@
 }
 
 SkString* SkObjectParser::TextToString(const void* text, size_t byteLength) {
-    char result[6+byteLength];
-    strcpy(result,"Text: ");
-    strcat(result, (char*)text);
-    SkString* mText = new SkString(result);
+    SkString* mText = new SkString(6+byteLength+1);
+    mText->append("Text: ");
+    mText->append((char*) text, byteLength);
     return mText;
 }