Remove useless CGdiDisplayDriver::StretchDIBits() params - Remove the clip rect pointer that is unused by StretchDIBits(). - Remove the option that is always empty from the only caller. Then code in StretchDIBits() that handles options can be removed. Change-Id: I87a55d844af4ccd070688f06eab0bf00e6ab1dec Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/122352 Reviewed-by: Tom Sepez <tsepez@google.com> Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxge/win32/cgdi_display_driver.cpp b/core/fxge/win32/cgdi_display_driver.cpp index 0d4dd43..f5aefcb 100644 --- a/core/fxge/win32/cgdi_display_driver.cpp +++ b/core/fxge/win32/cgdi_display_driver.cpp
@@ -203,9 +203,9 @@ auto* pPlatform = static_cast<CWin32Platform*>(CFX_GEModule::Get()->GetPlatform()); if (pPlatform->m_GdiplusExt.IsAvailable()) { - return pPlatform->m_GdiplusExt.StretchDIBits( - m_hDC, std::move(bitmap), dest_left, dest_top, dest_width, - dest_height, pClipRect, FXDIB_ResampleOptions()); + return pPlatform->m_GdiplusExt.StretchDIBits(m_hDC, std::move(bitmap), + dest_left, dest_top, + dest_width, dest_height); } return UseFoxitStretchEngine(std::move(bitmap), color, dest_left, dest_top, dest_width, dest_height, pClipRect,
diff --git a/core/fxge/win32/cgdi_plus_ext.cpp b/core/fxge/win32/cgdi_plus_ext.cpp index 716ef5a..1cfe68e 100644 --- a/core/fxge/win32/cgdi_plus_ext.cpp +++ b/core/fxge/win32/cgdi_plus_ext.cpp
@@ -546,19 +546,14 @@ int dest_left, int dest_top, int dest_width, - int dest_height, - const FX_RECT* pClipRect, - const FXDIB_ResampleOptions& options) { + int dest_height) { CHECK(source->IsAlphaFormat()); Gdiplus::GpGraphics* pGraphics; const CGdiplusExt& GdiplusExt = GetGdiplusExt(); CallFunc(GdipCreateFromHDC)(hDC, &pGraphics); CallFunc(GdipSetPageUnit)(pGraphics, Gdiplus::UnitPixel); - if (options.bNoSmoothing) { - CallFunc(GdipSetInterpolationMode)( - pGraphics, Gdiplus::InterpolationModeNearestNeighbor); - } else if (source->GetWidth() > abs(dest_width) / 2 || - source->GetHeight() > abs(dest_height) / 2) { + if (source->GetWidth() > abs(dest_width) / 2 || + source->GetHeight() > abs(dest_height) / 2) { CallFunc(GdipSetInterpolationMode)(pGraphics, Gdiplus::InterpolationModeHighQuality); } else {
diff --git a/core/fxge/win32/cgdi_plus_ext.h b/core/fxge/win32/cgdi_plus_ext.h index bb8fd8e..8f8e754 100644 --- a/core/fxge/win32/cgdi_plus_ext.h +++ b/core/fxge/win32/cgdi_plus_ext.h
@@ -20,8 +20,6 @@ class CFX_Matrix; class CFX_Path; struct CFX_FillRenderOptions; -struct FXDIB_ResampleOptions; -struct FX_RECT; class CGdiplusExt { public: @@ -35,9 +33,7 @@ int dest_left, int dest_top, int dest_width, - int dest_height, - const FX_RECT* pClipRect, - const FXDIB_ResampleOptions& options); + int dest_height); bool DrawPath(HDC hDC, const CFX_Path& path, const CFX_Matrix* pObject2Device,