From 1d225f2b3352bb8f24661f62d2bd1cc7386a2f86 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 14 Sep 2012 02:01:10 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@5539 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkBBoxRecord.cpp | 2 +- src/core/SkPicture.cpp | 2 +- src/core/SkPicturePlayback.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/SkBBoxRecord.cpp b/src/core/SkBBoxRecord.cpp index 272f826f96..41f6b95516 100644 --- a/src/core/SkBBoxRecord.cpp +++ b/src/core/SkBBoxRecord.cpp @@ -217,7 +217,7 @@ void SkBBoxRecord::drawVertices(VertexMode mode, int vertexCount, } void SkBBoxRecord::drawPicture(SkPicture& picture) { - if (picture.width() > 0 && picture.height() > 0 && + if (picture.width() > 0 && picture.height() > 0 && this->transformBounds(SkRect::MakeWH(picture.width(), picture.height()), NULL)) { INHERITED::drawPicture(picture); } diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index af1cd60cbf..4405094314 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -186,7 +186,7 @@ SkCanvas* SkPicture::beginRecording(int width, int height, } if (recordingFlags & kOptimizeForClippedPlayback_RecordingFlag) { - SkScalar aspectRatio = SkScalarDiv(SkIntToScalar(width), + SkScalar aspectRatio = SkScalarDiv(SkIntToScalar(width), SkIntToScalar(height)); SkRTree* tree = SkRTree::Create(6, 11, aspectRatio); SkASSERT(NULL != tree); diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp index 3df113ca26..41872f831c 100644 --- a/src/core/SkPicturePlayback.cpp +++ b/src/core/SkPicturePlayback.cpp @@ -153,7 +153,7 @@ SkPicturePlayback::SkPicturePlayback(const SkPicturePlayback& src, SkPictCopyInf fMatrices = SkSafeRef(src.fMatrices); fRegions = SkSafeRef(src.fRegions); fOpData = SkSafeRef(src.fOpData); - + fBoundingHierarchy = src.fBoundingHierarchy; fStateTree = src.fStateTree; @@ -593,7 +593,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas) { fBoundingHierarchy->search(query, &results); if (results.count() == 0) { return; } SkTQSort( - reinterpret_cast(results.begin()), + reinterpret_cast(results.begin()), reinterpret_cast(results.end()-1)); } } -- cgit v1.2.3