commit b28b958485c171566ab1bd8690cba9182dd8f98f
author Lei Zhang <thestig@chromium.org> Tue Jan 14 22:34:26 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Jan 14 22:34:26 2020 +0000
tree 39605f5e11b187abf1edd101ada8d407fb6df5c1
parent 14bc9cbc73ac37c39b03eaaa2028489c09f60668

Consistently use helper functions to read from FXDIB_Format.

FXDIB_Format contains an "alpha flag" component and a bpp component.
Consistently read them with GetAlphaFlagFromFormat() and
GetBppFromFormat(), respectively. GetBppFromFormat() already exists, and
GetAlphaFlagFromFormat() has to be implemented.

Change-Id: I614fc9d393c76b7e2069a8dc28732ca2ecf05eb8
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65051
Reviewed-by: Tom Sepez <tsepez@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 9c7bc24..411b930 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -39,8 +39,8 @@
                           uint8_t* pBuffer,
                           uint32_t pitch) {
   m_pBuffer = nullptr;
-  m_bpp = static_cast<uint8_t>(format);
-  m_AlphaFlag = static_cast<uint8_t>(format >> 8);
+  m_bpp = GetBppFromFormat(format);
+  m_AlphaFlag = GetAlphaFlagFromFormat(format);
   m_Width = 0;
   m_Height = 0;
   m_Pitch = 0;
@@ -1260,8 +1260,8 @@
   m_pAlphaMask = pAlphaMask;
   m_pPalette = std::move(pal_8bpp);
   m_pBuffer = std::move(dest_buf);
-  m_bpp = static_cast<uint8_t>(dest_format);
-  m_AlphaFlag = static_cast<uint8_t>(dest_format >> 8);
+  m_bpp = GetBppFromFormat(dest_format);
+  m_AlphaFlag = GetAlphaFlagFromFormat(dest_format);
   m_Pitch = dest_pitch;
   return true;
 }

core/fxge/dib/cfx_filtereddib.cpp

diff --git a/core/fxge/dib/cfx_filtereddib.cpp b/core/fxge/dib/cfx_filtereddib.cpp
index 297a099..8cbcdad 100644
--- a/core/fxge/dib/cfx_filtereddib.cpp
+++ b/core/fxge/dib/cfx_filtereddib.cpp
@@ -18,7 +18,7 @@
   m_Height = pSrc->GetHeight();
   FXDIB_Format format = GetDestFormat();
   m_bpp = GetBppFromFormat(format);
-  m_AlphaFlag = static_cast<uint8_t>(format >> 8);
+  m_AlphaFlag = GetAlphaFlagFromFormat(format);
   m_Pitch = (m_Width * m_bpp + 31) / 32 * 4;
   m_pPalette.reset(GetDestPalette());
   m_Scanline.resize(m_Pitch);

core/fxge/fx_dib.h

diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h
index 662ede9..b2dbe8a 100644
--- a/core/fxge/fx_dib.h
+++ b/core/fxge/fx_dib.h
@@ -115,6 +115,10 @@
   return (format & 0xff) / 8;
 }
 
+inline uint32_t GetAlphaFlagFromFormat(FXDIB_Format format) {
+  return (format >> 8) & 0xff;
+}
+
 inline bool GetIsAlphaFromFormat(FXDIB_Format format) {
   return format & 0x200;
 }