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/QT/SkSettingsWidget.cpp

@@ -157,6 +157,6 @@ void SkSettingsWidget::setZoomText(int scaleFactor) {
     } else if (scaleFactor > 1) {
         fZoomBox.setText(QString::number(scaleFactor*100).append("%"));
     } else if (scaleFactor < -1) {
-        fZoomBox.setText(QString::number(100 / pow(2, (-scaleFactor - 1))).append("%"));
+        fZoomBox.setText(QString::number(100 / pow(2.0f, (-scaleFactor - 1))).append("%"));
     }
 }

debugger/SkDebugCanvas.cpp

@@ -43,9 +43,10 @@ void SkDebugCanvas::draw(SkCanvas* canvas) {
 }
 
 void SkDebugCanvas::applyUserTransform(SkCanvas* canvas) {
-    canvas->translate(fUserOffset.fX, fUserOffset.fY);
+    canvas->translate(SkIntToScalar(fUserOffset.fX), 
+                      SkIntToScalar(fUserOffset.fY));
     if (fUserScale < 0) {
-        canvas->scale((1.0 / -fUserScale), (1.0 / -fUserScale));
+        canvas->scale((1.0f / -fUserScale), (1.0f / -fUserScale));
     } else if (fUserScale > 0) {
         canvas->scale(fUserScale, fUserScale);
     }
@@ -57,7 +58,7 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) {
     bitmap.allocPixels();
 
     SkCanvas canvas(bitmap);
-    canvas.translate(-x, -y);
+    canvas.translate(SkIntToScalar(-x), SkIntToScalar(-y));
     applyUserTransform(&canvas);
 
     int layer = 0;
@@ -89,7 +90,8 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
         i = 0;
         canvas->clear(0);
         canvas->resetMatrix();
-        SkRect rect = SkRect::MakeWH(fWidth, fHeight);
+        SkRect rect = SkRect::MakeWH(SkIntToScalar(fWidth), 
+                                     SkIntToScalar(fHeight));
         canvas->clipRect(rect, SkRegion::kReplace_Op );
         applyUserTransform(canvas);
     }

debugger/SkDrawCommand.cpp

@@ -252,7 +252,8 @@ DrawPoints::DrawPoints(SkCanvas::PointMode mode, size_t count,
     this->fDrawType = DRAW_POINTS;
 
     this->fInfo.push(SkObjectParser::PointsToString(pts, count));
-    this->fInfo.push(SkObjectParser::ScalarToString(count, "Points: "));
+    this->fInfo.push(SkObjectParser::ScalarToString(SkIntToScalar(count), 
+                                                    "Points: "));
     this->fInfo.push(SkObjectParser::PointModeToString(mode));
 }
 

debugger/SkObjectParser.cpp

@@ -40,13 +40,13 @@ SkString* SkObjectParser::IntToString(int x, const char* text) {
 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::ScalarToString(SkScalar x, const char* text) {
 }
 
 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;
 }

gm/blend.cpp

@@ -49,7 +49,7 @@ protected:
         for (int y = 0; y < 80; y += 16) {
           for (int x = 0; x < 80; x += 16) {
             canvas.save();
-            canvas.translate(x, y);
+            canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
             canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
             canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
             canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);

gm/image.cpp

@@ -37,7 +37,8 @@ static void drawJpeg(SkCanvas* canvas, const SkISize& size) {
 }
 
 static void drawContents(SkSurface* surface, SkColor fillC) {
-    SkSize size = SkSize::Make(surface->width(), surface->height());
+    SkSize size = SkSize::Make(SkIntToScalar(surface->width()), 
+                               SkIntToScalar(surface->height()));
     SkCanvas* canvas = surface->getCanvas();
 
     SkScalar stroke = size.fWidth / 10;

tools/PictureRenderer.cpp

@@ -251,7 +251,7 @@ void TiledPictureRenderer::setupPowerOf2Tiles() {
             + fTileMinPowerOf2Width;
     }
 
-    int num_bits = SkScalarCeilToInt(SkScalarLog2(fPicture->width()));
+    int num_bits = SkScalarCeilToInt(SkScalarLog2(SkIntToScalar(fPicture->width())));
     int largest_possible_tile_size = 1 << num_bits;
 
     // The tile height is constant for a particular picture.