AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check bounder before lockPixels on the bitmap

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@493 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com 2010-02-09 13:06:29 +00:00
parent 985dfad8ec
commit 218521e157
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/SkDraw.cpp
View File

@ -1042,12 +1042,21 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
return; return;
} }
// do I need to call the bounder first???
if (clipped_out(matrix, *fClip, bitmap.width(), bitmap.height())) { if (clipped_out(matrix, *fClip, bitmap.width(), bitmap.height())) {
return; return;
} }
// only lock the pixels if we passed the clip test if (fBounder && just_translate(matrix, bitmap)) {
SkIRect ir;
int32_t ix = SkScalarRound(matrix.getTranslateX());
int32_t iy = SkScalarRound(matrix.getTranslateY());
ir.set(ix, iy, ix + bitmap.width(), iy + bitmap.height());
if (!fBounder->doIRect(ir)) {
return;
}
}
// only lock the pixels if we passed the clip and bounder tests
SkAutoLockPixels alp(bitmap); SkAutoLockPixels alp(bitmap);
// after the lock, check if we are valid // after the lock, check if we are valid
if (!bitmap.readyToDraw()) { if (!bitmap.readyToDraw()) {
@ -1066,10 +1075,6 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
SkIRect ir; SkIRect ir;
ir.set(ix, iy, ix + bitmap.width(), iy + bitmap.height()); ir.set(ix, iy, ix + bitmap.width(), iy + bitmap.height());
if (fBounder && !fBounder->doIRect(ir)) {
return;
}
SkRegion::Cliperator iter(*fClip, ir); SkRegion::Cliperator iter(*fClip, ir);
const SkIRect& cr = iter.rect(); const SkIRect& cr = iter.rect();