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
diff --git a/debugger/SkDebugCanvas.cpp b/debugger/SkDebugCanvas.cpp
index 4751be7..1bc0d8d 100644
--- a/debugger/SkDebugCanvas.cpp
+++ b/debugger/SkDebugCanvas.cpp
@@ -43,9 +43,10 @@
}
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 @@
bitmap.allocPixels();
SkCanvas canvas(bitmap);
- canvas.translate(-x, -y);
+ canvas.translate(SkIntToScalar(-x), SkIntToScalar(-y));
applyUserTransform(&canvas);
int layer = 0;
@@ -89,7 +90,8 @@
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);
}