diff --git a/debugger/QT/SkImageWidget.cpp b/debugger/QT/SkImageWidget.cpp index 76b6b21059..d852bf6da9 100644 --- a/debugger/QT/SkImageWidget.cpp +++ b/debugger/QT/SkImageWidget.cpp @@ -42,9 +42,9 @@ void SkImageWidget::paintEvent(QPaintEvent* event) { if (command->render(fSurface->getCanvas())) { QPoint origin(0,0); - QImage image((uchar*) fPixels, + QImage image((uchar*) fPixels, kImageWidgetWidth, - kImageWidgetHeight, + kImageWidgetHeight, QImage::Format_ARGB32_Premultiplied); painter.drawImage(origin, image); diff --git a/debugger/QT/SkImageWidget.h b/debugger/QT/SkImageWidget.h index f36857b420..7ee430f664 100644 --- a/debugger/QT/SkImageWidget.h +++ b/debugger/QT/SkImageWidget.h @@ -19,7 +19,7 @@ class SkImageWidget : public QWidget { public: SkImageWidget(SkDebugger* debugger); - + virtual ~SkImageWidget() { fSurface->unref(); } diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp index de24611f8b..c9d9a47da3 100644 --- a/debugger/SkDrawCommand.cpp +++ b/debugger/SkDrawCommand.cpp @@ -104,7 +104,7 @@ void xlate_and_scale_to_bounds(SkCanvas* canvas, const SkRect& bounds) { } canvas->translate(-bounds.centerX(), -bounds.centerY()); } - + void render_path(SkCanvas* canvas, const SkPath& path) { canvas->clear(0xFFFFFFFF); @@ -137,7 +137,7 @@ void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRec SkRect dst = SkRect::MakeXYWH(SK_Scalar1, SK_Scalar1, xScale * input.width(), yScale * input.height()); - + canvas->clear(0xFFFFFFFF); canvas->drawBitmapRect(input, NULL, dst); @@ -169,7 +169,7 @@ void render_rrect(SkCanvas* canvas, const SkRRect& rrect) { canvas->drawRRect(rrect, p); canvas->restore(); } - + }; @@ -518,7 +518,7 @@ bool DrawPoints::render(SkCanvas* canvas) const { for (unsigned int i = 0; i < fCount; ++i) { bounds.growToInclude(fPts[i].fX, fPts[i].fY); } - + xlate_and_scale_to_bounds(canvas, bounds); SkPaint p;