diff options
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 75f4119e52..ec74e491c2 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -2256,10 +2256,18 @@ void SkXPSDevice::drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) { - // TODO(halcanary): more closely use correct logic for src > bitmap.bounds(). - SkRect srcBounds = src ? *src : SkRect::Make(bitmap.bounds()); + SkRect bitmapBounds = SkRect::Make(bitmap.bounds()); + SkRect srcBounds = src ? *src : bitmapBounds; SkMatrix matrix = SkMatrix::MakeRectToRect(srcBounds, dst, SkMatrix::kFill_ScaleToFit); - + SkRect actualDst; + if (!src || bitmapBounds.contains(*src)) { + actualDst = dst; + } else { + if (!srcBounds.intersect(bitmapBounds)) { + return; + } + matrix.mapRect(&actualDst, srcBounds); + } auto bitmapShader = SkMakeBitmapShader(bitmap, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, kNever_SkCopyPixelsMode); @@ -2268,6 +2276,6 @@ void SkXPSDevice::drawBitmapRect(const SkBitmap& bitmap, SkPaint paintWithShader(paint); paintWithShader.setStyle(SkPaint::kFill_Style); paintWithShader.setShader(std::move(bitmapShader)); - this->drawRect(dst, paintWithShader); + this->drawRect(actualDst, paintWithShader); } #endif//defined(SK_BUILD_FOR_WIN32) |