diff options
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkGatherPixelRefsAndRects.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkGatherPixelRefsAndRects.h | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/utils/SkGatherPixelRefsAndRects.cpp b/src/utils/SkGatherPixelRefsAndRects.cpp index 7b3be55719..320d99694a 100644 --- a/src/utils/SkGatherPixelRefsAndRects.cpp +++ b/src/utils/SkGatherPixelRefsAndRects.cpp @@ -18,7 +18,7 @@ void SkPictureUtils::GatherPixelRefsAndRects(SkPicture* pict, SkGatherPixelRefsAndRectsDevice device(pict->width(), pict->height(), prCont); SkNoSaveLayerCanvas canvas(&device); - canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()), + canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()), SkIntToScalar(pict->height())), SkRegion::kIntersect_Op, false); canvas.drawPicture(*pict); diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h index 57ffecd482..795378f3e5 100644 --- a/src/utils/SkGatherPixelRefsAndRects.h +++ b/src/utils/SkGatherPixelRefsAndRects.h @@ -23,7 +23,7 @@ class SkGatherPixelRefsAndRectsDevice : public SkBaseDevice { public: SK_DECLARE_INST_COUNT(SkGatherPixelRefsAndRectsDevice) - SkGatherPixelRefsAndRectsDevice(int width, int height, + SkGatherPixelRefsAndRectsDevice(int width, int height, SkPictureUtils::SkPixelRefContainer* prCont) { fSize.set(width, height); fPRCont = prCont; @@ -118,7 +118,7 @@ protected: SkRect pathBounds = path.getBounds(); if (NULL != prePathMatrix) { prePathMatrix->mapRect(&pathBounds); - } + } this->drawRect(draw, pathBounds, paint); } @@ -127,7 +127,7 @@ protected: SkMatrix totMatrix; totMatrix.setConcat(*draw.fMatrix, matrix); - SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()), + SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())); SkRect mappedRect; totMatrix.mapRect(&mappedRect, bitmapRect); @@ -144,7 +144,7 @@ protected: SkMatrix matrix; matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y)); - SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()), + SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())); SkRect mappedRect; matrix.mapRect(&mappedRect, bitmapRect); @@ -159,7 +159,7 @@ protected: const SkRect* srcOrNull, const SkRect& dst, const SkPaint& paint, SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE { - SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()), + SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())); SkMatrix matrix; matrix.setRectToRect(bitmapRect, dst, SkMatrix::kFill_ScaleToFit); @@ -281,7 +281,7 @@ protected: const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, const SkPaint& paint) SK_OVERRIDE { - this->drawPoints(draw, SkCanvas::kPolygon_PointMode, vertexCount, verts, paint); + this->drawPoints(draw, SkCanvas::kPolygon_PointMode, vertexCount, verts, paint); } virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) SK_OVERRIDE { @@ -347,4 +347,3 @@ private: }; #endif // SkGatherPixelRefsAndRects_DEFINED - |