commit c63e0970f4473e4eac682d5c27003b7682d60d9c
author Lei Zhang <thestig@chromium.org> Wed Jul 24 19:25:03 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 24 19:25:03 2024 +0000
tree 087143bf5be772120bffbe95fd419b995bbdeec4
parent fde3846ef0d02be8f423c2a26d26d2846471bbfe

Further simplify OutputImage() inside cgdi_plus_ext.cpp

- Remove the `src_rect` parameter, as its value is always the entire
  `source`. Then a subspan() call and some variables can be removed.
- Use std::size() when appropriate.
- Rename variables to follow Google C++ style.

Change-Id: I0c06c6ebe3fa59ba7aab9a674973e841b669207d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/122351
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>

core/fxge/win32/cgdi_plus_ext.cpp

diff --git a/core/fxge/win32/cgdi_plus_ext.cpp b/core/fxge/win32/cgdi_plus_ext.cpp
index edfda9f..716ef5a 100644
--- a/core/fxge/win32/cgdi_plus_ext.cpp
+++ b/core/fxge/win32/cgdi_plus_ext.cpp
@@ -201,16 +201,13 @@
   return solidBrush;
 }
 
-void OutputImage(Gdiplus::GpGraphics* pGraphics,
+void OutputImage(Gdiplus::GpGraphics* graphics,
                  RetainPtr<const CFX_DIBBase> source,
-                 const FX_RECT& src_rect,
                  int dest_left,
                  int dest_top,
                  int dest_width,
                  int dest_height) {
   CHECK_EQ(FXDIB_Format::kArgb, source->GetFormat());
-  int src_width = src_rect.Width();
-  int src_height = src_rect.Height();
   const CGdiplusExt& GdiplusExt = GetGdiplusExt();
 
   RetainPtr<const CFX_DIBitmap> realized_source = source->RealizeIfNeeded();
@@ -218,30 +215,26 @@
     return;
   }
 
-  int src_pitch = realized_source->GetPitch();
-
   // `GdipCreateBitmapFromScan0()` requires a `BYTE*` scanline buffer, but in
   // this case, the bitmap only gets read by `GdipDrawImagePointsI()`, then
   // disposed of, so it's safe to cast away `const` here.
-  uint8_t* scan0 = const_cast<uint8_t*>(
-      realized_source->GetBuffer()
-          .subspan(src_rect.top * src_pitch +
-                   realized_source->GetBPP() * src_rect.left / 8)
-          .data());
+  uint8_t* scan0 = const_cast<uint8_t*>(realized_source->GetBuffer().data());
   Gdiplus::GpBitmap* bitmap = nullptr;
-  CallFunc(GdipCreateBitmapFromScan0)(src_width, src_height, src_pitch,
-                                      PixelFormat32bppARGB, scan0, &bitmap);
+  CallFunc(GdipCreateBitmapFromScan0)(
+      realized_source->GetWidth(), realized_source->GetHeight(),
+      realized_source->GetPitch(), PixelFormat32bppARGB, scan0, &bitmap);
   if (dest_height < 0) {
     dest_height--;
   }
   if (dest_width < 0) {
     dest_width--;
   }
-  Gdiplus::Point destinationPoints[] = {
+  const Gdiplus::Point destination_points[] = {
       Gdiplus::Point(dest_left, dest_top),
       Gdiplus::Point(dest_left + dest_width, dest_top),
       Gdiplus::Point(dest_left, dest_top + dest_height)};
-  CallFunc(GdipDrawImagePointsI)(pGraphics, bitmap, destinationPoints, 3);
+  CallFunc(GdipDrawImagePointsI)(graphics, bitmap, destination_points,
+                                 std::size(destination_points));
   CallFunc(GdipDisposeImage)(bitmap);
 }
 
@@ -572,9 +565,8 @@
     CallFunc(GdipSetInterpolationMode)(pGraphics,
                                        Gdiplus::InterpolationModeBilinear);
   }
-  FX_RECT src_rect(0, 0, source->GetWidth(), source->GetHeight());
-  OutputImage(pGraphics, std::move(source), src_rect, dest_left, dest_top,
-              dest_width, dest_height);
+  OutputImage(pGraphics, std::move(source), dest_left, dest_top, dest_width,
+              dest_height);
   CallFunc(GdipDeleteGraphics)(pGraphics);
   return true;
 }