From 5810cb5e8a07b1a6726265947204259c7e18eca3 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 27 Nov 2021 17:36:26 +0100 Subject: [PATCH] - rediffed --- ghostscript-gdevcd8-fixes.patch | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ghostscript-gdevcd8-fixes.patch b/ghostscript-gdevcd8-fixes.patch index d109930..188f3c4 100644 --- a/ghostscript-gdevcd8-fixes.patch +++ b/ghostscript-gdevcd8-fixes.patch @@ -9,9 +9,9 @@ Fixes: though Jakub Bogusz ---- ghostscript-9.52/contrib/gdevcd8.c.orig 2020-03-19 09:21:42.000000000 +0100 -+++ ghostscript-9.52/contrib/gdevcd8.c 2020-03-25 20:10:39.745178961 +0100 -@@ -604,6 +604,7 @@ +--- ghostscript-9.55.0/contrib/gdevcd8.c.orig 2021-09-27 09:44:02.000000000 +0200 ++++ ghostscript-9.55.0/contrib/gdevcd8.c 2021-11-27 16:28:48.395077465 +0100 +@@ -604,6 +604,7 @@ typedef struct gx_device_cdj850_s { StartRasterMode start_raster_mode; /* output function to start raster mode */ PrintNonBlankLines print_non_blank_lines; /* output function to print a non blank line */ TerminatePage terminate_page; /* page termination output function */ @@ -19,7 +19,7 @@ Jakub Bogusz } gx_device_cdj850; typedef struct { -@@ -659,7 +660,7 @@ +@@ -659,7 +660,7 @@ typedef struct { blackcorrect,\ start_raster_mode,\ print_non_blank_line,\ @@ -28,7 +28,7 @@ Jakub Bogusz } #define cdj_1600_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page, correction, quality, papertype, intensities,ptype,compression,mastergamma,gammavalc,gammavalm,gammavaly,gammavalk,blackcorrect,start_raster_mode,print_non_blank_line,terminate_page)\ -@@ -678,7 +679,7 @@ +@@ -678,7 +679,7 @@ typedef struct { blackcorrect,\ start_raster_mode,\ print_non_blank_line,\ @@ -37,7 +37,7 @@ Jakub Bogusz } /* HP2200 and DNJ500 is a RGB printer */ -@@ -698,7 +699,7 @@ +@@ -698,7 +699,7 @@ typedef struct { blackcorrect,\ start_raster_mode,\ print_non_blank_line,\ @@ -45,8 +45,8 @@ Jakub Bogusz + terminate_page, 1\ } - #define cmyk_colour_procs(proc_colour_open, proc_get_params, proc_put_params, \ -@@ -1057,6 +1058,7 @@ + /* Printer-specific functions. Most printers are handled by the cdj850_xx() +@@ -1077,6 +1078,7 @@ cdj850_get_params(gx_device * pdev, gs_p if (code < 0 || (code = param_write_int(plist, "Quality", &cdj850->quality)) < 0 || (code = param_write_int(plist, "Papertype", &cdj850->papertype)) < 0 || @@ -54,7 +54,7 @@ Jakub Bogusz (code = param_write_float(plist, "MasterGamma", &cdj850->gammavalc)) < 0 || (code = param_write_float(plist, "GammaValC", &cdj850->gammavalc)) < -@@ -1080,6 +1082,7 @@ +@@ -1100,6 +1102,7 @@ cdj850_put_params(gx_device * pdev, gs_p { int quality = cdj850->quality; int papertype = cdj850->papertype; @@ -62,7 +62,7 @@ Jakub Bogusz float mastergamma = cdj850->mastergamma; float gammavalc = cdj850->gammavalc; float gammavalm = cdj850->gammavalm; -@@ -1092,6 +1095,7 @@ +@@ -1112,6 +1115,7 @@ cdj850_put_params(gx_device * pdev, gs_p code = cdj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code); code = cdj_put_param_int(plist, "Quality", &quality, 0, 2, code); code = cdj_put_param_int(plist, "Papertype", &papertype, 0, 4, code); @@ -70,7 +70,7 @@ Jakub Bogusz code = cdj_put_param_float(plist, "MasterGamma", &mastergamma, 0.1f, 9.0f, code); code = cdj_put_param_float(plist, "GammaValC", &gammavalc, 0.0f, 9.0f, code); code = cdj_put_param_float(plist, "GammaValM", &gammavalm, 0.0f, 9.0f, code); -@@ -1108,6 +1112,7 @@ +@@ -1128,6 +1132,7 @@ cdj850_put_params(gx_device * pdev, gs_p cdj850->quality = quality; cdj850->papertype = papertype; @@ -78,7 +78,7 @@ Jakub Bogusz cdj850->mastergamma = mastergamma; cdj850->gammavalc = gammavalc; cdj850->gammavalm = gammavalm; -@@ -1160,7 +1165,13 @@ +@@ -1180,7 +1185,13 @@ static void gx_device_printer * pdev, struct error_val_field *error_values); static int @@ -93,7 +93,7 @@ Jakub Bogusz const byte * cvalues, const byte * mvalues, const byte * yvalues, const int *kcorrect, word * inword); -@@ -2025,7 +2036,10 @@ +@@ -2045,7 +2056,10 @@ send_scan_lines(gx_device_printer * pdev } /* Skip blank lines if any */ if (num_blank_lines > 0) { @@ -104,7 +104,7 @@ Jakub Bogusz memset(data_ptrs->plane_data[0][0], 0, (misc_vars->plane_size * 2 * misc_vars->num_comps)); memset(data_ptrs->plane_data_c[0][0], 0, -@@ -2035,7 +2049,10 @@ +@@ -2055,7 +2069,10 @@ send_scan_lines(gx_device_printer * pdev /* all blank lines printed, now for the non-blank lines */ if (cdj850->yscal && odd(lnum)) { /* output a blank black plane for odd lines */ @@ -115,7 +115,7 @@ Jakub Bogusz } /* now output all non blank lines */ while (lnum < lend && llen != 0) { -@@ -2061,9 +2078,11 @@ +@@ -2081,9 +2098,11 @@ print_c9plane(gp_file * prn_stream, char int out_count = gdev_pcl_mode9compress(plane_size, curr, prev, out_data); /* and output the data */ @@ -128,7 +128,7 @@ Jakub Bogusz } } -@@ -2122,15 +2141,22 @@ +@@ -2142,15 +2161,22 @@ cdj850_print_non_blank_lines(gx_device_p byte *dp = data_ptrs->data[misc_vars->scan + 2]; int *ep = data_ptrs->errors[misc_vars->scan]; @@ -153,7 +153,7 @@ Jakub Bogusz /* dithering the black-plane */ FSDlinebw(misc_vars->scan, misc_vars->plane_size, -@@ -2200,15 +2226,22 @@ +@@ -2220,15 +2246,22 @@ cdj880_print_non_blank_lines(gx_device_p byte *dp = data_ptrs->data[misc_vars->scan + 2]; int *ep = data_ptrs->errors[misc_vars->scan]; @@ -178,7 +178,7 @@ Jakub Bogusz /* dithering the black-plane */ FSDlinebw(misc_vars->scan, misc_vars->plane_size, -@@ -2411,7 +2444,7 @@ +@@ -2431,7 +2464,7 @@ do_black_correction(float kvalue, int kc do real color separation, here we try a real grey component replacement */ static int @@ -187,7 +187,7 @@ Jakub Bogusz const byte cvalues[256], const byte mvalues[256], const byte yvalues[256], const int kcorrect[256], word * inword) -@@ -2421,7 +2454,7 @@ +@@ -2441,7 +2474,7 @@ do_gcr(int bytecount, byte * inbyte, con word last_color_value = 0; word *last_color; @@ -196,7 +196,7 @@ Jakub Bogusz last_color = &last_color_value; /* Grey component replacement */ for (i = 0; i < bytecount; i += 4) { -@@ -2451,11 +2484,12 @@ +@@ -2471,11 +2504,12 @@ do_gcr(int bytecount, byte * inbyte, con /* Test whether we 've already computet the value */ if (*inword == last_color_value) { /* save a copy of the current color before it will be modified */ @@ -210,7 +210,7 @@ Jakub Bogusz /* save a copy of the current color before it will be modified */ last_color_value = *inword; NOBLACK(cyan, magenta, yellow, black); -@@ -2493,6 +2527,7 @@ +@@ -2513,6 +2547,7 @@ do_gcr(int bytecount, byte * inbyte, con debug_print_string(output, strlen(output)); } #endif /* 0 */ @@ -218,7 +218,7 @@ Jakub Bogusz if ( *cyan > 255) *cyan = 255; if (*magenta > 255) *magenta = 255; if ( *yellow > 255) *yellow = 255; -@@ -2500,6 +2535,96 @@ +@@ -2520,6 +2555,96 @@ do_gcr(int bytecount, byte * inbyte, con *cyan = *(cvalues + *cyan); *magenta = *(mvalues + *magenta); *yellow = *(yvalues + *yellow); -- 2.44.0