commit 548e95e3048973f4457ef8c541da6fed0349b19f
author Lei Zhang <thestig@chromium.org> Mon Jun 24 23:54:36 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 24 23:54:36 2024 +0000
tree 70e6adab549d49d89a93c6104b2bc0d05a39d1d6
parent 4e3d023b291d443610171f257f3497244ad4a82c

Make CJPX_Decoder::ColorSpaceOption an enum class

Then shorten the enum value names.

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

core/fpdfapi/page/cpdf_dib.cpp

diff --git a/core/fpdfapi/page/cpdf_dib.cpp b/core/fpdfapi/page/cpdf_dib.cpp
index bca3800..22733de 100644
--- a/core/fpdfapi/page/cpdf_dib.cpp
+++ b/core/fpdfapi/page/cpdf_dib.cpp
@@ -108,11 +108,13 @@
 
 CJPX_Decoder::ColorSpaceOption ColorSpaceOptionFromColorSpace(
     CPDF_ColorSpace* pCS) {
-  if (!pCS)
-    return CJPX_Decoder::kNoColorSpace;
-  if (pCS->GetFamily() == CPDF_ColorSpace::Family::kIndexed)
-    return CJPX_Decoder::kIndexedColorSpace;
-  return CJPX_Decoder::kNormalColorSpace;
+  if (!pCS) {
+    return CJPX_Decoder::ColorSpaceOption::kNone;
+  }
+  if (pCS->GetFamily() == CPDF_ColorSpace::Family::kIndexed) {
+    return CJPX_Decoder::ColorSpaceOption::kIndexed;
+  }
+  return CJPX_Decoder::ColorSpaceOption::kNormal;
 }
 
 enum class JpxDecodeAction {

core/fxcodec/jpx/cjpx_decoder.cpp

diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp
index 7a84964..33157b5 100644
--- a/core/fxcodec/jpx/cjpx_decoder.cpp
+++ b/core/fxcodec/jpx/cjpx_decoder.cpp
@@ -460,8 +460,9 @@
   if (!m_Codec)
     return false;
 
-  if (m_ColorSpaceOption == kIndexedColorSpace)
+  if (m_ColorSpaceOption == ColorSpaceOption::kIndexed) {
     m_Parameters.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+  }
   opj_set_info_handler(m_Codec.get(), fx_ignore_callback, nullptr);
   opj_set_warning_handler(m_Codec.get(), fx_ignore_callback, nullptr);
   opj_set_error_handler(m_Codec.get(), fx_ignore_callback, nullptr);

core/fxcodec/jpx/cjpx_decoder.h

diff --git a/core/fxcodec/jpx/cjpx_decoder.h b/core/fxcodec/jpx/cjpx_decoder.h
index b391edb..fb1efd4 100644
--- a/core/fxcodec/jpx/cjpx_decoder.h
+++ b/core/fxcodec/jpx/cjpx_decoder.h
@@ -30,10 +30,10 @@
   // 1 is the smallest required size.
   static constexpr uint8_t kMaxResolutionsToSkip = 32;
 
-  enum ColorSpaceOption {
-    kNoColorSpace,
-    kNormalColorSpace,
-    kIndexedColorSpace
+  enum class ColorSpaceOption {
+    kNone,
+    kNormal,
+    kIndexed,
   };
 
   struct JpxImageInfo {