[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-2047-gd1aa5fd
[email protected] (Ray Johnston) Sun, 5 Jan 2020 14:07:40 +0000 (UTC)
| Newsgroups | gmane.comp.printing.ghostscript.cvs |
|---|---|
| Message-ID | <[email protected]> |
The ghostpdl branch, master has been updated
via d1aa5fdfdbea4c55445ee1bdbe08b822a1bd7a8c (commit)
via 372c862f2050d82248316f54156e5bb33dd7520a (commit)
from 9608d275bd750b189dd52681791f31617a640817 (commit)
----------------------------------------------------------------------
commit d1aa5fdfdbea4c55445ee1bdbe08b822a1bd7a8c
Author: Ray Johnston <[email protected]>
Date: Sat Jan 4 20:04:03 2020 -0800
Further refinement for Bug 701880. Make tiffsep better match pbmraw
The previous change attempted to fix the y-phase, but this was not a
180 degree rotation, so it caused the primary angle of the pattern to
shift by 90 degrees. A better correspondence is achieved by inverting
the polarity of the thresholds. This is slightly "darker" than pbmraw
but the angle and phase matches pbmraw closely.
Note that the phase using the CAL module does not match the non-CAL
or pbmraw, but the angle of the pattern does match.
diff --git a/devices/gdevtsep.c b/devices/gdevtsep.c
index 17e31b0..6d301b2 100644
--- a/devices/gdevtsep.c
+++ b/devices/gdevtsep.c
@@ -2127,6 +2127,8 @@ sep1_ht_order_to_thresholds(gx_device *pdev, const gs_gstate *pgs)
}
nc = pgs->dev_ht->num_comp;
for( j=0; j<nc; j++ ) {
+ int x, y;
+
d_order = &(pgs->dev_ht->components[j].corder);
dptr = &(tfdev->thresholds[j]);
/* In order to use the function from gsht.c we need to set the color_info */
@@ -2134,16 +2136,25 @@ sep1_ht_order_to_thresholds(gx_device *pdev, const gs_gstate *pgs)
pdev->color_info.dither_grays = pdev->color_info.dither_colors = 2;
pdev->color_info.polarity = GX_CINFO_POLARITY_ADDITIVE;
code = gx_ht_construct_threshold(d_order, pdev, pgs, j);
- pdev->color_info.dither_grays = pdev->color_info.dither_colors = 256;
- pdev->color_info.polarity = GX_CINFO_POLARITY_SUBTRACTIVE;
if( code < 0 ) {
emprintf(mem,
"sep1_order_to_thresholds: conversion to thresholds failed.\n");
return_error(code); /* error condition */
}
+ pdev->color_info.dither_grays = pdev->color_info.dither_colors = 256;
+ pdev->color_info.polarity = GX_CINFO_POLARITY_SUBTRACTIVE;
+ /* Invert the thresholds so we (almost) match pbmraw dithered output */
+ for (y=0; y<d_order->full_height; y++) {
+ byte *s = d_order->threshold;
+ int s_offset = y * d_order->width;
+
+ for (x=0; x<d_order->width; x++) {
+ s[s_offset + x] = 256 - s[s_offset + x];
+ }
+ }
dptr->dstart = d_order->threshold;
- dptr->dwidth = d_order->width;
- dptr->dheight = d_order->full_height;
+ dptr->dwidth = d_order->width;
+ dptr->dheight = d_order->full_height;
}
}
return 0;
@@ -2840,10 +2851,9 @@ tiffsep1_print_page(gx_device_printer * pdev, gp_file * file)
* 27% faster.
*/
#define USE_32_BIT_WRITES
- int threshline = tfdev->thresholds[comp_num].dheight - 1 -
- (y % tfdev->thresholds[comp_num].dheight);
byte *thresh_line_base = tfdev->thresholds[comp_num].dstart +
- ( threshline * tfdev->thresholds[comp_num].dwidth) ;
+ ((y % tfdev->thresholds[comp_num].dheight) *
+ tfdev->thresholds[comp_num].dwidth) ;
byte *thresh_ptr = thresh_line_base;
byte *thresh_limit = thresh_ptr + tfdev->thresholds[comp_num].dwidth;
byte *src = params.data[comp_num];
----------------------------------------------------------------------
commit 372c862f2050d82248316f54156e5bb33dd7520a
Author: Ray Johnston <[email protected]>
Date: Fri Jan 3 09:56:29 2020 -0800
Fix Bug 701845. The devicen device would confuse transparency.
The devicen device defines 32-bit depth, but 0 components and no
standard process colors or names. This confused the pdf14 device into
writing a clist with 1-component (gray), but then because the icc_profile
had 4 components, would try and use 4 component when reading.
Fix by making it 32-bit CMYK, and also fix to write a valid PCX by
converting the 32-bit CMYK to 24-bit RGB on output. PCX cannot handle
32-bit CMYK. Prior to this, 32-bit CMYK would fail showpage with a
rangecheck error.
diff --git a/base/gdevdevn.c b/base/gdevdevn.c
index 737f022..c738c86 100644
--- a/base/gdevdevn.c
+++ b/base/gdevdevn.c
@@ -1054,8 +1054,8 @@ const gx_devn_prn_device gs_devicen_device =
gx_devn_prn_device_body(devicen_procs, "devicen", 4, GX_CINFO_POLARITY_SUBTRACTIVE, 32, 255, 255, "DeviceCMYK"),
/* DeviceN device specific parameters */
{ 8, /* Bits per color - must match ncomp, depth, etc. above */
- NULL, /* No names for standard DeviceN color model */
- 0, /* No standard colorants for DeviceN */
+ DeviceCMYKComponents, /* Names of color model colorants */
+ 4, /* Number colorants for CMYK */
0, /* MaxSeparations has not been specified */
-1, /* PageSpotColors has not been specified */
{0}, /* SeparationNames */
@@ -1761,7 +1761,7 @@ devn_write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
if (outname == NULL) {
code = gs_note_error(gs_error_VMerror);
- goto done;
+ goto done;
}
code = gs_add_control_path(pdev->memory, gs_permit_file_reading, filename);
@@ -1771,7 +1771,7 @@ devn_write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
in = gp_fopen(pdev->memory, filename, "rb");
if (!in) {
code = gs_note_error(gs_error_invalidfileaccess);
- goto done;
+ goto done;
}
gs_sprintf(outname, "%s.pcx", filename);
code = gs_add_control_path(pdev->memory, gs_permit_file_writing, outname);
@@ -1780,9 +1780,12 @@ devn_write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
out = gp_fopen(pdev->memory, outname, "wb");
if (!out) {
code = gs_note_error(gs_error_invalidfileaccess);
- goto done;
+ goto done;
}
+ if (ncomp == 4 && bpc == 8) {
+ ncomp = 3; /* we will convert 32-bit to 24-bit RGB */
+ }
planar = devn_setup_pcx_header(pdev, &header, ncomp, bpc);
code = devn_pcx_write_page(pdev, in, linesize, out, &header, planar, depth);
if (code >= 0)
@@ -1814,12 +1817,22 @@ devn_pcx_write_page(gx_device_printer * pdev, gp_file * infile, int linesize, gp
int height = pdev->height;
uint lsize = raster + rsize;
byte *line = gs_alloc_bytes(pdev->memory, lsize, "pcx file buffer");
+ byte *rgb_buff = NULL;
byte *plane = line + raster;
+ bool convert_to_rgb = false;
int y;
int code = 0; /* return code */
if (line == 0) /* can't allocate line buffer */
return_error(gs_error_VMerror);
+ if (pdev->color_info.num_components == 4 && depth == 32) {
+ rgb_buff = gs_alloc_bytes(pdev->memory, lsize, "pcx_rgb_buff");
+ if (rgb_buff == 0) /* can't allocate line buffer */
+ return_error(gs_error_VMerror);
+ raster = (raster * 3) / 4; /* will be rounded up to even later */
+ depth = 24; /* we will be writing 24-bit rgb */
+ convert_to_rgb = true;
+ }
/* Fill in the other variable entries in the header struct. */
@@ -1844,6 +1857,21 @@ devn_pcx_write_page(gx_device_printer * pdev, gp_file * infile, int linesize, gp
code = gp_fread(line, sizeof(byte), linesize, infile);
if (code < 0)
break;
+ /* If needed, convert to rgb */
+ if (convert_to_rgb) {
+ int i;
+ byte *row_in = line;
+
+ /* Transform the data. */
+ row = rgb_buff; /* adjust to converted output buffer */
+ for (i=0; i < linesize; i += 4) {
+ *row++ = ((255 - row_in[0]) * (255 - row_in[3])) / 255;
+ *row++ = ((255 - row_in[1]) * (255 - row_in[3])) / 255;
+ *row++ = ((255 - row_in[2]) * (255 - row_in[3])) / 255;
+ row_in += 4;
+ }
+ row = rgb_buff; /* adjust to converted output buffer */
+ }
end = row + raster;
if (!planar) { /* Just write the bits. */
if (raster & 1) { /* Round to even, with predictable padding. */
@@ -1906,6 +1934,8 @@ devn_pcx_write_page(gx_device_printer * pdev, gp_file * infile, int linesize, gp
}
pcx_done:
+ if (rgb_buff != NULL)
+ gs_free_object(pdev->memory, rgb_buff, "pcx_rgb_buff");
gs_free_object(pdev->memory, line, "pcx file buffer");
return code;
Summary of changes:
base/gdevdevn.c | 40 +++++++++++++++++++++++++++++++++++-----
devices/gdevtsep.c | 24 +++++++++++++++++-------
2 files changed, 52 insertions(+), 12 deletions(-)