Eliminate pdf_overprint_control_t in favour of gs_overprint_control_t

Fixes compiler warning comparing different enum types.

4 files changed, 6 insertions, 12 deletions

diff --git a/pdf/ghostpdf.h b/pdf/ghostpdf.h
index fc260d4dc..c20fd23af 100644
--- a/pdf/ghostpdf.h
+++ b/pdf/ghostpdf.h
@@ -76,12 +76,6 @@ typedef enum pdf_crypt_filter_e {
 } pdf_crypt_filter;
 
 
-typedef enum pdf_overprint_control_e {
-    PDF_OVERPRINT_ENABLE = 0,/* Default */
-    PDF_OVERPRINT_DISABLE,
-    PDF_OVERPRINT_SIMULATE
-} pdf_overprint_control_t;
-
 #define INITIAL_STACK_SIZE 32
 #define MAX_STACK_SIZE 524288
 #define MAX_OBJECT_CACHE_SIZE 200
diff --git a/pdf/pdf_check.c b/pdf/pdf_check.c
index fe53406f8..00933bdf9 100644
--- a/pdf/pdf_check.c
+++ b/pdf/pdf_check.c
@@ -136,7 +136,7 @@ pdfi_check_init_tracker(pdf_context *ctx, pdfi_check_tracker_t *tracker)
     memset(tracker->CheckedResources, 0x00, tracker->size);
 
     if (ctx->device_state.spot_capable ||
-        ((pdf_overprint_control_t) ctx->pgs->device->icc_struct->overprint_control) == PDF_OVERPRINT_SIMULATE) {
+        (ctx->pgs->device->icc_struct->overprint_control) == gs_overprint_control_simulate) {
         code = pdfi_dict_alloc(ctx, 32, &tracker->spot_dict);
         if (code < 0)
             goto cleanup;
diff --git a/pdf/pdf_colour.c b/pdf/pdf_colour.c
index 5446e6eb0..9ba97a5aa 100644
--- a/pdf/pdf_colour.c
+++ b/pdf/pdf_colour.c
@@ -2673,7 +2673,7 @@ static int pdfi_device_setoutputintent(pdf_context *ctx, pdf_dict *profile_dict,
        and doing a rendering to the output intent color space.  Keep the device
        profile as is, and do not do a proofing profile */
 
-    if (!(ctx->pgs->device->icc_struct->overprint_control == PDF_OVERPRINT_SIMULATE &&
+    if (!(ctx->pgs->device->icc_struct->overprint_control == gs_overprint_control_simulate &&
         !gsicc_profiles_equal(dev_profile->oi_profile, dev_profile->device_profile[GS_DEFAULT_DEVICE_PROFILE]))) {
         if (ncomps == dev_comps && index < gs_color_space_index_DevicePixel) {
             /* The OI profile is the same type as the profile for the device and a
diff --git a/pdf/pdf_trans.c b/pdf/pdf_trans.c
index 02dc1da65..0fa750b4d 100644
--- a/pdf/pdf_trans.c
+++ b/pdf/pdf_trans.c
@@ -626,11 +626,11 @@ void pdfi_trans_set_needs_OP(pdf_context *ctx)
 
     ctx->page.needs_OP = false;
     ctx->page.simulate_op = false;
-    switch((pdf_overprint_control_t) ctx->pgs->device->icc_struct->overprint_control) {
-    case PDF_OVERPRINT_DISABLE:
+    switch(ctx->pgs->device->icc_struct->overprint_control) {
+    case gs_overprint_control_disable:
         /* Use defaults */
         break;
-    case PDF_OVERPRINT_SIMULATE:
+    case gs_overprint_control_simulate:
         if (!device_transparency && ctx->page.has_OP) {
             if (is_cmyk) {
                 /* If the page has spots and the device is not spot capable OR
@@ -648,7 +648,7 @@ void pdfi_trans_set_needs_OP(pdf_context *ctx)
             }
         }
         break;
-    case PDF_OVERPRINT_ENABLE:
+    case gs_overprint_control_enable:
     default:
         if (!is_cmyk || device_transparency)
             ctx->page.needs_OP = false;