commit b4b2831a719c39834a0250a0169494cc25472a8f
author Tom Sepez <tsepez@chromium.org> Mon Nov 14 21:22:25 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 14 21:22:25 2022 +0000
tree d5717735b0b3bc4efa0beaaa80801dfc5e3f3007
parent 69bddfee86d1b95b92413a9b8e96b3a9cca0f8e3

Avoid needless casting to uint8_t* in cfx_dibbase.cpp

No reason to declare uint32_t arrays if we are just casting them
to uint8_t pointers.

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

core/fxge/dib/cfx_dibbase.cpp

diff --git a/core/fxge/dib/cfx_dibbase.cpp b/core/fxge/dib/cfx_dibbase.cpp
index d303314..7f5559f 100644
--- a/core/fxge/dib/cfx_dibbase.cpp
+++ b/core/fxge/dib/cfx_dibbase.cpp
@@ -378,23 +378,18 @@
                                const RetainPtr<const CFX_DIBBase>& pSrcBitmap,
                                int src_left,
                                int src_top) {
-  int comps = GetCompsFromFormat(dest_format);
   pdfium::span<const uint32_t> src_palette = pSrcBitmap->GetPaletteSpan();
-  uint32_t plt[2];
-  uint8_t* bgr_ptr = reinterpret_cast<uint8_t*>(plt);
-  bgr_ptr[0] = FXARGB_B(src_palette[0]);
-  bgr_ptr[1] = FXARGB_G(src_palette[0]);
-  bgr_ptr[2] = FXARGB_R(src_palette[0]);
-  bgr_ptr[3] = FXARGB_B(src_palette[1]);
-  bgr_ptr[4] = FXARGB_G(src_palette[1]);
-  bgr_ptr[5] = FXARGB_R(src_palette[1]);
-
+  const uint8_t dst_palette[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(row * dest_pitch).data();
     const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row).data();
     for (int col = src_left; col < src_left + width; ++col) {
       size_t offset = (src_scan[col / 8] & (1 << (7 - col % 8))) ? 3 : 0;
-      memcpy(dest_scan, bgr_ptr + offset, 3);
+      memcpy(dest_scan, dst_palette + offset, 3);
       dest_scan += comps;
     }
   }
@@ -408,23 +403,20 @@
                                const RetainPtr<const CFX_DIBBase>& pSrcBitmap,
                                int src_left,
                                int src_top) {
-  int comps = GetCompsFromFormat(dest_format);
   pdfium::span<const uint32_t> src_palette = pSrcBitmap->GetPaletteSpan();
-  uint32_t plt[256];
-  uint8_t* bgr_ptr = reinterpret_cast<uint8_t*>(plt);
+  uint8_t dst_palette[768];
   for (int i = 0; i < 256; ++i) {
-    *bgr_ptr++ = FXARGB_B(src_palette[i]);
-    *bgr_ptr++ = FXARGB_G(src_palette[i]);
-    *bgr_ptr++ = FXARGB_R(src_palette[i]);
+    dst_palette[3 * i] = FXARGB_B(src_palette[i]);
+    dst_palette[3 * i + 1] = FXARGB_G(src_palette[i]);
+    dst_palette[3 * i + 2] = FXARGB_R(src_palette[i]);
   }
-  bgr_ptr = reinterpret_cast<uint8_t*>(plt);
-
+  int comps = GetCompsFromFormat(dest_format);
   for (int row = 0; row < height; ++row) {
     uint8_t* dest_scan = dest_buf.subspan(row * dest_pitch).data();
     const uint8_t* src_scan =
         pSrcBitmap->GetScanline(src_top + row).subspan(src_left).data();
     for (int col = 0; col < width; ++col) {
-      uint8_t* src_pixel = bgr_ptr + 3 * (*src_scan++);
+      uint8_t* src_pixel = dst_palette + 3 * (*src_scan++);
       memcpy(dest_scan, src_pixel, 3);
       dest_scan += comps;
     }