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

Clip perspective bounds by device clip in SkPDFDevice

Browse Source 
Bug: skia:9906
Change-Id: Ib0369e0637be2a064f4d17e0f5ae41e99883c41e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324129
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Auto-Submit: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Michael Ludwig 2020-10-08 16:29:14 -04:00 committed by Skia Commit-Bot
parent e9b9c3bd7f
commit 30378382aa
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pdf/SkPDFDevice.cpp
View File

@ -1602,21 +1602,16 @@ void SkPDFDevice::internalDrawImageRect(SkKeyedImage imageSubset,
SkRect imageBounds = SkRect::Make(imageSubset.image()->bounds());
SkPath perspectiveOutline = SkPath::Rect(imageBounds).makeTransform(transform);
// TODO(edisonn): perf - use current clip too.
// Retrieve the bounds of the new shape.
SkRect bounds = perspectiveOutline.getBounds();
if (!bounds.intersect(SkRect::Make(this->devClipBounds()))) {
return;
}
// Transform the bitmap in the new space, taking into
// account the initial transform.
SkMatrix total = transform;
total.postConcat(fInitialTransform);
SkPath physicalPerspectiveOutline = SkPath::Rect(imageBounds).makeTransform(total);
SkRect physicalPerspectiveBounds =
physicalPerspectiveOutline.getBounds();
SkScalar scaleX = physicalPerspectiveBounds.width() / bounds.width();
SkScalar scaleY = physicalPerspectiveBounds.height() / bounds.height();
// Transform the bitmap in the new space to the final space, to account for DPI
SkRect physicalBounds = fInitialTransform.mapRect(bounds);
SkScalar scaleX = physicalBounds.width() / bounds.width();
SkScalar scaleY = physicalBounds.height() / bounds.height();
// TODO(edisonn): A better approach would be to use a bitmap shader
// (in clamp mode) and draw a rect over the entire bounding box. Then
@ -1625,7 +1620,7 @@ void SkPDFDevice::internalDrawImageRect(SkKeyedImage imageSubset,
// the image. Avoiding alpha will reduce the pdf size and generation
// CPU time some.
SkISize wh = rect_to_size(physicalPerspectiveBounds).toCeil();
SkISize wh = rect_to_size(physicalBounds).toCeil();
auto surface = SkSurface::MakeRaster(SkImageInfo::MakeN32Premul(wh));
if (!surface) {