Merge "Avoid sampling outside BQ crop rect" am: 4fd405dfe7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768168

Change-Id: Ifbfc59fed8e28cd5e2f4ca165e582f4031381b8f
This commit is contained in:
Treehugger Robot
2021-07-15 22:06:28 +00:00
committed by Automerger Merge Worker

View File

@@ -189,8 +189,10 @@ CopyResult Readback::copySurfaceInto(ANativeWindow* window, const Rect& inSrcRec
if (srcRect.width() != bitmap->width() || srcRect.height() != bitmap->height()) {
paint.setFilterQuality(kLow_SkFilterQuality);
}
canvas->drawImageRect(image, imageSrcRect, imageDstRect, &paint,
SkCanvas::kFast_SrcRectConstraint);
const bool hasBufferCrop = cropRect.left < cropRect.right && cropRect.top < cropRect.bottom;
auto constraint =
hasBufferCrop ? SkCanvas::kStrict_SrcRectConstraint : SkCanvas::kFast_SrcRectConstraint;
canvas->drawImageRect(image, imageSrcRect, imageDstRect, &paint, constraint);
canvas->restore();
if (!tmpSurface->readPixels(*bitmap, 0, 0)) {