commit aae3f4452ac46d64c705a1a117503d59000ebf5e
author Lei Zhang <thestig@chromium.org> Thu Mar 23 22:09:01 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 23 22:09:01 2023 +0000
tree 6db5e7c7bfbe6556f743c965df551319548e7738
parent a5970445122e8d000c7a59b9a0da530a246af041

Simplify pitch calculation in CFX_DIBitmap::CalculatePitchAndSize()

Use the existing CalculatePitch32() utility function instead of
duplicating it.

Change-Id: I98146336445f1d2a525a3a7648799e7415109295
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/105430
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/dib/cfx_dibitmap.cpp

diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index e14560f..7233089 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -670,16 +670,12 @@
 
   uint32_t actual_pitch = pitch;
   if (actual_pitch == 0) {
-    FX_SAFE_UINT32 safe_pitch = width;
-    safe_pitch *= bpp;
-    safe_pitch += 31;
-    // Note: This is not the same as /8 due to truncation.
-    safe_pitch /= 32;
-    safe_pitch *= 4;
-    if (!safe_pitch.IsValid())
+    absl::optional<uint32_t> pitch32 = fxge::CalculatePitch32(bpp, width);
+    if (!pitch32.has_value()) {
       return absl::nullopt;
+    }
 
-    actual_pitch = safe_pitch.ValueOrDie();
+    actual_pitch = pitch32.value();
   }
 
   FX_SAFE_UINT32 safe_size = actual_pitch;