diff options
| -rw-r--r-- | debugger/QT/SkSettingsWidget.cpp | 2 | ||||
| -rw-r--r-- | debugger/SkDebugCanvas.cpp | 10 | ||||
| -rw-r--r-- | debugger/SkDrawCommand.cpp | 3 | ||||
| -rw-r--r-- | debugger/SkObjectParser.cpp | 15 | ||||
| -rw-r--r-- | gm/blend.cpp | 2 | ||||
| -rw-r--r-- | gm/image.cpp | 3 | ||||
| -rw-r--r-- | tools/PictureRenderer.cpp | 2 |
7 files changed, 20 insertions, 17 deletions
diff --git a/debugger/QT/SkSettingsWidget.cpp b/debugger/QT/SkSettingsWidget.cpp index 2519efd3f9..d9268be360 100644 --- a/debugger/QT/SkSettingsWidget.cpp +++ b/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("%")); } } diff --git a/debugger/SkDebugCanvas.cpp b/debugger/SkDebugCanvas.cpp index 4751be7722..1bc0d8df7e 100644 --- a/debugger/SkDebugCanvas.cpp +++ b/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); } diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp index 83b0719e4b..34c6c3c984 100644 --- a/debugger/SkDrawCommand.cpp +++ b/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)); } diff --git a/debugger/SkObjectParser.cpp b/debugger/SkObjectParser.cpp index af12083e6b..bf6a053d71 100644 --- a/debugger/SkObjectParser.cpp +++ b/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; } diff --git a/gm/blend.cpp b/gm/blend.cpp index f1f47b3444..3ba92a7981 100644 --- a/gm/blend.cpp +++ b/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); diff --git a/gm/image.cpp b/gm/image.cpp index 090106dc37..444cc4d8a5 100644 --- a/gm/image.cpp +++ b/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; diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 0bc3df10c2..edbdce9ea7 100644 --- a/tools/PictureRenderer.cpp +++ b/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. |