Remove `FXDIB_Format::kCmyk`.
No code ever creates bitmaps of this format, so any code that handles
this format is dead code. As a result of this removal,
`FXDIB_Format::kCmyka` is also unused and removed for the same reason.
Many utility functions that check to see if a bitmap is CMYK will be
removed in a follow-up CL.
Change-Id: Idab3556bf80ac1d49004c4de6cbb81aa5bb4d23b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75550
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index cb95cae..af44ab3 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -293,10 +293,9 @@
if (!ConvertFormat(FXDIB_Format::k8bppMask))
return false;
} else {
- if (!ConvertFormat(IsCmykImage() ? FXDIB_Format::kCmyka
- : FXDIB_Format::kArgb)) {
+ if (!ConvertFormat(FXDIB_Format::kArgb))
return false;
- }
+
if (GetFormat() == FXDIB_Format::kArgb)
destOffset = 3;
}
@@ -306,8 +305,7 @@
if (GetBPP() < 24) {
if (HasAlpha()) {
- if (!ConvertFormat(IsCmykImage() ? FXDIB_Format::kCmyka
- : FXDIB_Format::kArgb))
+ if (!ConvertFormat(FXDIB_Format::kArgb))
return false;
} else {
#if defined(OS_APPLE)
@@ -315,10 +313,8 @@
#else
constexpr FXDIB_Format kPlatformFormat = FXDIB_Format::kRgb;
#endif
- if (!ConvertFormat(IsCmykImage() ? FXDIB_Format::kCmyk
- : kPlatformFormat)) {
+ if (!ConvertFormat(kPlatformFormat))
return false;
- }
}
}
destOffset = kChannelOffset[destChannel];
@@ -377,13 +373,11 @@
destOffset = 0;
} else {
destOffset = 0;
- if (!ConvertFormat(IsCmykImage() ? FXDIB_Format::kCmyka
- : FXDIB_Format::kArgb)) {
+ if (!ConvertFormat(FXDIB_Format::kArgb))
return false;
- }
- if (GetFormat() == FXDIB_Format::kArgb) {
+
+ if (GetFormat() == FXDIB_Format::kArgb)
destOffset = 3;
- }
}
} else {
if (IsMask()) {
@@ -391,20 +385,16 @@
}
if (GetBPP() < 24) {
if (HasAlpha()) {
- if (!ConvertFormat(IsCmykImage() ? FXDIB_Format::kCmyka
- : FXDIB_Format::kArgb)) {
+ if (!ConvertFormat(FXDIB_Format::kArgb))
return false;
- }
} else {
#if defined(OS_APPLE)
constexpr FXDIB_Format kPlatformFormat = FXDIB_Format::kRgb;
#else
constexpr FXDIB_Format kPlatformFormat = FXDIB_Format::kRgb32;
#endif
- if (!ConvertFormat(IsCmykImage() ? FXDIB_Format::kCmyk
- : kPlatformFormat)) {
+ if (!ConvertFormat(kPlatformFormat))
return false;
- }
}
}
destOffset = kChannelOffset[destChannel];
diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index 84368b8..a129e73 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -106,8 +106,6 @@
return FXDIB_Format::k8bppMask;
FXDIB_Format format = pDrc->GetFormat();
- if (GetIsCmykFromFormat(format))
- return FXDIB_Format::kCmyka;
if (HasNoFlags(format) || format == FXDIB_Format::kArgb)
return FXDIB_Format::kArgb;
return FXDIB_Format::kRgba;
@@ -148,11 +146,7 @@
return;
}
- if (format == FXDIB_Format::kCmyka) {
- *dest32 = FXCMYK_TODIB(CmykEncode(blue_c, green_m, red_y, func(3)));
- } else {
- *dest32 = ArgbEncode(kOpaqueAlpha, red_y, green_m, blue_c);
- }
+ *dest32 = ArgbEncode(kOpaqueAlpha, red_y, green_m, blue_c);
}
class CPDF_FixedMatrix {
diff --git a/core/fxge/dib/fx_dib.cpp b/core/fxge/dib/fx_dib.cpp
index a04e5e2..9d827b1 100644
--- a/core/fxge/dib/fx_dib.cpp
+++ b/core/fxge/dib/fx_dib.cpp
@@ -71,14 +71,7 @@
}
FXDIB_Format AddAlphaToCmykFormat(FXDIB_Format format) {
- switch (format) {
- case FXDIB_Format::kCmyk:
- return FXDIB_Format::kCmyka;
- case FXDIB_Format::kCmyka:
- return FXDIB_Format::kCmyka;
- default:
- return FXDIB_Format::kInvalid;
- }
+ return FXDIB_Format::kInvalid;
}
FXDIB_ResampleOptions::FXDIB_ResampleOptions() = default;
diff --git a/core/fxge/dib/fx_dib.h b/core/fxge/dib/fx_dib.h
index 88ad009..d6e9309 100644
--- a/core/fxge/dib/fx_dib.h
+++ b/core/fxge/dib/fx_dib.h
@@ -120,7 +120,7 @@
}
inline bool GetIsCmykFromFormat(FXDIB_Format format) {
- return !!(static_cast<uint16_t>(format) & 0x400);
+ return false;
}
inline bool HasNoFlags(FXDIB_Format format) {
diff --git a/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc b/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc
index b6acebd..0e35fcd 100644
--- a/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc
+++ b/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc
@@ -28,9 +28,9 @@
FXDIB_Format::kArgb,
FXDIB_Format::kInvalid /* Was FXDIB_Format::k1bppCmyk */,
FXDIB_Format::kInvalid /* Was FXDIB_Format::k8bppCmyk */,
- FXDIB_Format::kCmyk,
+ FXDIB_Format::kInvalid /* Was FXDIB_Format::kCmyk */,
FXDIB_Format::kInvalid /* Was FXDIB_Format::k8bppCmyka */,
- FXDIB_Format::kCmyka};
+ FXDIB_Format::kInvalid /* Was FXDIB_Format::kCmyka */};
} // namespace
