commit c4482f0051184cb34b1e564f4e74478c3ae037df
author Lei Zhang <thestig@chromium.org> Wed Oct 21 22:47:56 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Oct 21 22:47:56 2020 +0000
tree afafc0594f21181bcef79e771fc5e2ce1d92b393
parent 6579c8b6432ed0cd67750ff065e8f462093e3e5c

Remove `FXDIB_Format::k8bppCmyk`.

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::k8bppCmyka` is also unused and removed for the same
reason.

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

core/fxge/dib/fx_dib.cpp

diff --git a/core/fxge/dib/fx_dib.cpp b/core/fxge/dib/fx_dib.cpp
index 8d30aee..a04e5e2 100644
--- a/core/fxge/dib/fx_dib.cpp
+++ b/core/fxge/dib/fx_dib.cpp
@@ -72,12 +72,8 @@
 
 FXDIB_Format AddAlphaToCmykFormat(FXDIB_Format format) {
   switch (format) {
-    case FXDIB_Format::k8bppCmyk:
-      return FXDIB_Format::k8bppCmyka;
     case FXDIB_Format::kCmyk:
       return FXDIB_Format::kCmyka;
-    case FXDIB_Format::k8bppCmyka:
-      return FXDIB_Format::k8bppCmyka;
     case FXDIB_Format::kCmyka:
       return FXDIB_Format::kCmyka;
     default:

core/fxge/dib/fx_dib.h

diff --git a/core/fxge/dib/fx_dib.h b/core/fxge/dib/fx_dib.h
index a662f93..88ad009 100644
--- a/core/fxge/dib/fx_dib.h
+++ b/core/fxge/dib/fx_dib.h
@@ -24,9 +24,7 @@
   k8bppRgba = 0x208,
   kRgba = 0x218,
   kArgb = 0x220,
-  k8bppCmyk = 0x408,
   kCmyk = 0x420,
-  k8bppCmyka = 0x608,
   kCmyka = 0x620,
 };
 

core/fxge/win32/cfx_psrenderer.cpp

diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp
index 15a49da..a80181d 100644
--- a/core/fxge/win32/cfx_psrenderer.cpp
+++ b/core/fxge/win32/cfx_psrenderer.cpp
@@ -374,10 +374,6 @@
         if (pSource->HasPalette())
           pConverted = pConverted->CloneConvert(FXDIB_Format::kRgb);
         break;
-      case FXDIB_Format::k8bppCmyk:
-        if (pSource->HasPalette())
-          pConverted = pConverted->CloneConvert(FXDIB_Format::kCmyk);
-        break;
       default:
         break;
     }

testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc

diff --git a/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc b/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc
index feb2aa1..b6acebd 100644
--- a/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc
+++ b/testing/fuzzers/pdf_scanlinecompositor_fuzzer.cc
@@ -27,9 +27,9 @@
     FXDIB_Format::kRgba,
     FXDIB_Format::kArgb,
     FXDIB_Format::kInvalid /* Was FXDIB_Format::k1bppCmyk */,
-    FXDIB_Format::k8bppCmyk,
+    FXDIB_Format::kInvalid /* Was FXDIB_Format::k8bppCmyk */,
     FXDIB_Format::kCmyk,
-    FXDIB_Format::k8bppCmyka,
+    FXDIB_Format::kInvalid /* Was FXDIB_Format::k8bppCmyka */,
     FXDIB_Format::kCmyka};
 
 }  // namespace