commit 6afe1ac5bc361b2a9b3ce248e10364d52c82fa10
author Lei Zhang <thestig@chromium.org> Tue Jul 30 20:55:46 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 30 20:55:46 2024 +0000
tree eb9e5a7b2663f1a949ae4aea0d7b657107b45447
parent f1aa1f8fe0830a434f47996734d8e7c87ef88067

Remove one code path for 1 BPP to ARGB bitmap conversion

No caller ever does this. Then the helper functions shared by 1 BPP to
RGB/ARGB bitmap conversions is only used for conversions to RGB, and can
be slightly simplified.

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

core/fxge/dib/cfx_dibbase.cpp

diff --git a/core/fxge/dib/cfx_dibbase.cpp b/core/fxge/dib/cfx_dibbase.cpp
index bb05d3c..e5a677c 100644
--- a/core/fxge/dib/cfx_dibbase.cpp
+++ b/core/fxge/dib/cfx_dibbase.cpp
@@ -173,15 +173,13 @@
   return DataVector<uint32_t>(src_palette_span.begin(), src_palette_span.end());
 }
 
-void ConvertBuffer_1bppMask2Rgb(FXDIB_Format dest_format,
-                                pdfium::span<uint8_t> dest_buf,
+void ConvertBuffer_1bppMask2Rgb(pdfium::span<uint8_t> dest_buf,
                                 int dest_pitch,
                                 int width,
                                 int height,
                                 const RetainPtr<const CFX_DIBBase>& pSrcBitmap,
                                 int src_left,
                                 int src_top) {
-  int comps = GetCompsFromFormat(dest_format);
   static constexpr uint8_t kSetGray = 0xff;
   static constexpr uint8_t kResetGray = 0x00;
   for (int row = 0; row < height; ++row) {
@@ -193,7 +191,7 @@
         uint8_t value =
             (src_scan[col / 8] & (1 << (7 - col % 8))) ? kSetGray : kResetGray;
         FXSYS_memset(dest_scan, value, 3);
-        dest_scan += comps;
+        dest_scan += 3;
       }
     });
   }
@@ -223,8 +221,7 @@
   }
 }
 
-void ConvertBuffer_1bppPlt2Rgb(FXDIB_Format dest_format,
-                               pdfium::span<uint8_t> dest_buf,
+void ConvertBuffer_1bppPlt2Rgb(pdfium::span<uint8_t> dest_buf,
                                int dest_pitch,
                                int width,
                                int height,
@@ -236,7 +233,6 @@
       FXARGB_B(src_palette[0]), FXARGB_G(src_palette[0]),
       FXARGB_R(src_palette[0]), FXARGB_B(src_palette[1]),
       FXARGB_G(src_palette[1]), FXARGB_R(src_palette[1])};
-  int comps = GetCompsFromFormat(dest_format);
   for (int row = 0; row < height; ++row) {
     uint8_t* dest_scan =
         dest_buf.subspan(Fx2DSizeOrDie(row, dest_pitch)).data();
@@ -245,7 +241,7 @@
       for (int col = src_left; col < src_left + width; ++col) {
         size_t offset = (src_scan[col / 8] & (1 << (7 - col % 8))) ? 3 : 0;
         FXSYS_memcpy(dest_scan, dst_palette + offset, 3);
-        dest_scan += comps;
+        dest_scan += 3;
       }
     });
   }
@@ -393,11 +389,11 @@
   switch (pSrcBitmap->GetBPP()) {
     case 1:
       if (pSrcBitmap->HasPalette()) {
-        ConvertBuffer_1bppPlt2Rgb(dest_format, dest_buf, dest_pitch, width,
-                                  height, pSrcBitmap, src_left, src_top);
+        ConvertBuffer_1bppPlt2Rgb(dest_buf, dest_pitch, width, height,
+                                  pSrcBitmap, src_left, src_top);
       } else {
-        ConvertBuffer_1bppMask2Rgb(dest_format, dest_buf, dest_pitch, width,
-                                   height, pSrcBitmap, src_left, src_top);
+        ConvertBuffer_1bppMask2Rgb(dest_buf, dest_pitch, width, height,
+                                   pSrcBitmap, src_left, src_top);
       }
       break;
     case 8:
@@ -431,15 +427,6 @@
                         int src_left,
                         int src_top) {
   switch (pSrcBitmap->GetBPP()) {
-    case 1:
-      if (pSrcBitmap->HasPalette()) {
-        ConvertBuffer_1bppPlt2Rgb(dest_format, dest_buf, dest_pitch, width,
-                                  height, pSrcBitmap, src_left, src_top);
-      } else {
-        ConvertBuffer_1bppMask2Rgb(dest_format, dest_buf, dest_pitch, width,
-                                   height, pSrcBitmap, src_left, src_top);
-      }
-      break;
     case 8:
       if (pSrcBitmap->HasPalette()) {
         ConvertBuffer_8bppPlt2Rgb(dest_format, dest_buf, dest_pitch, width,