1
diff -uNr old/gdevijs.c new/gdevijs.c
2
--- old/gdevijs.c 2006-06-02 16:42:01.829749000 -0700
3
+++ new/gdevijs.c 2006-06-02 16:42:37.562316824 -0700
5
* which is a security risk, since any program can be run.
6
* You should use -dSAFER which sets .LockSafetyParams to true
7
* before opening this device.
9
+ * 11/26/03 David Suffield (gdevijs-krgb-1.0.patch)
10
+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP
12
+ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher.
13
+ * 2. Added krgb support.
15
+ * 02/21/05 David Suffield (gdevijs-krgb-1.1.patch)
16
+ * 1. Fixed segfault issue with 1-bit color space.
17
+ * 2. Fixed z-order issue with colored text on black rectangle.
19
+ * 02/22/06 David Suffield (gdevijs-krgb-1.2.patch)
20
+ * 1. Fixed krgb buffer overflow issue with out-of-band data in fill_rectangle and copy_mono.
21
+ * This buffer overflow condition occurred with fullbleed print jobs that had k-band images.
22
+ * 2. Added Dan Coby (artifex) fix for gsijs_read_string_malloc gs_free *str memory leak.
24
+ * 06/02/06 David Suffield (gdevijs-krgb-1.3.patch)
25
+ * 1. Revisited the krgb buffer overflow issue with out-of-band data in fill_rectangle and
26
+ * copy_mono. Changed the fill_rectangle and copy_mono to an inner loop buffer check
27
+ * instead of a outer loop x/y extent check.
28
+ * 2. As requested by Ralph Giles, added K 1-bit and 8-bit support for krgb, but only 1-bit is
29
+ * implemented for now.
32
+ * 1. K=1-bit or 8-bit black plane, RGB=24 bit color raster.
33
+ * 2. K-plane will only contain objects that are black text and black line drawings.
34
+ * 3. RGB raster will not contain K-plane objects.
35
+ * 4. K resolution and RGB resolution will be equal.
36
+ * 5. K-plane will be byte aligned.
37
+ * 6. K-plane 1-bit definition; 1=black, 0=nothing (KRGB).
38
+ * 7. K-plane 8-bit definition; 255=black, 0=nothing (KxRGB).
42
#include "unistd_.h" /* for dup() */
48
#include "ijs_client.h"
52
/* This should go into gdevprn.h, or, better yet, gdevprn should
53
acquire an API for changing resolution. */
54
int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
56
private dev_proc_put_params(gsijs_put_params);
57
private dev_proc_finish_copydevice(gsijs_finish_copydevice);
59
+/* Following definitions are for krgb support. */
60
+private dev_proc_create_buf_device(gsijs_create_buf_device);
61
+private dev_proc_fill_rectangle(gsijs_fill_rectangle);
62
+private dev_proc_copy_mono(gsijs_copy_mono);
63
+private dev_proc_fill_mask(gsijs_fill_mask);
64
+private dev_proc_fill_path(gsijs_fill_path);
65
+private dev_proc_stroke_path(gsijs_stroke_path);
67
private const gx_device_procs gsijs_procs = {
69
NULL, /* get_initial_matrix */
75
+ /* Additional parameters for krgb support. */
76
+ int krgb_mode; /* 0=false, 1=true */
77
+ int k_bits; /* number of bits in k plane, 1 or 8 */
78
+ int k_path; /* k plane path, 0=false, 1=true */
79
+ int k_width; /* k plane width in pixels */
80
+ int k_band_size; /* k plane buffer size in bytes, byte aligned */
81
+ unsigned char *k_band; /* k plane buffer */
82
+ gx_device_procs prn_procs; /* banding playback procedures */
85
#define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */
87
FALSE, /* Tumble_set */
89
NULL, /* IjsClient *ctx */
91
+ 0, /* ijs_version */
96
+ 0, /* k_band_size */
97
+ NULL /* k_band buffer */
101
@@ -166,12 +224,299 @@
103
/**************************************************************************/
105
-/* ------ Private definitions ------ */
106
+/* ---------------- Low-level graphic procedures ---------------- */
108
+static unsigned char xmask[] =
120
+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
121
+ gx_color_index color)
123
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
125
+ if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0)
127
+ int raster = (ijsdev->k_width+7) >> 3;
128
+ register unsigned char *dest;
129
+ int dest_start_bit;
130
+ int band_height = ijsdev->k_band_size/raster;
132
+ unsigned char *beg = ijsdev->k_band;
133
+ unsigned char *end = ijsdev->k_band+ijsdev->k_band_size;
136
+ if (h <= 0 || w <= 0)
139
+ /* Check for out-of-band graphic. */
140
+ if (x >= ijsdev->k_width || y >= band_height)
141
+ return 0; /* out-of-band */
143
+ dest_start_bit = x & 7;
144
+ dest=ijsdev->k_band+(raster*y)+(x >> 3);
146
+ /* Note x,y orgin 0,0 is stored first byte 0 left to right. */
150
+ /* Color is black, store in k plane band instead of regular band. */
151
+ for (j=0; j<h; j++)
153
+ for (i=0; i<w; i++)
155
+ p = &dest[(dest_start_bit+i)>>3];
156
+ if (p >= beg && p <= end)
157
+ *p |= xmask[(dest_start_bit+i)&7];
165
+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */
166
+ for (j=0; j<h; j++)
168
+ for (i=0; i<w; i++)
170
+ p = &dest[(dest_start_bit+i)>>3];
171
+ if (p >= beg && p <= end)
172
+ *p &= ~xmask[(dest_start_bit+i)&7];
179
+ return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color);
182
+private int gsijs_copy_mono(gx_device * dev, const byte * data,
183
+ int dx, int draster, gx_bitmap_id id,
184
+ int x, int y, int w, int height, gx_color_index zero, gx_color_index one)
186
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
188
+ // if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0)
189
+ if (ijsdev->krgb_mode && ijsdev->k_path)
191
+ /* Store in k plane band instead of regular band. */
192
+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */
193
+ register unsigned char *dest;
194
+ register const unsigned char *scan;
195
+ int dest_start_bit;
196
+ int scan_start_bit;
197
+ int band_height = ijsdev->k_band_size/raster;
199
+ unsigned char *beg = ijsdev->k_band;
200
+ unsigned char *end = ijsdev->k_band+ijsdev->k_band_size;
203
+ if (h <= 0 || w <= 0)
206
+ /* Check for out-of-band graphic. */
207
+ if (x >= ijsdev->k_width || y >= band_height)
208
+ return 0; /* out-of-band */
210
+ scan=data+(dx >> 3);
211
+ dest_start_bit = x & 7;
212
+ scan_start_bit = dx & 7;
213
+ dest=ijsdev->k_band+(raster*y)+(x >> 3);
217
+ /* Color is black, store in k plane band instead of regular band. */
220
+ for (i=0; i<w; i++)
222
+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7])
224
+ p = &dest[(dest_start_bit+i)>>3];
225
+ if (p >= beg && p <= end)
226
+ *p |= xmask[(dest_start_bit+i)&7];
236
+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */
239
+ for (i=0; i<w; i++)
241
+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7])
243
+ p = &dest[(dest_start_bit+i)>>3];
244
+ if (p >= beg && p <= end)
245
+ *p &= ~xmask[(dest_start_bit+i)&7];
254
+ return (*ijsdev->prn_procs.copy_mono)(dev, data, dx, draster, id, x, y, w, height, zero, one);
257
+/* ---------------- High-level graphic procedures ---------------- */
259
+private int gsijs_fill_mask(gx_device * dev,
260
+ const byte * data, int dx, int raster, gx_bitmap_id id,
261
+ int x, int y, int w, int h,
262
+ const gx_drawing_color * pdcolor, int depth,
263
+ gs_logical_operation_t lop, const gx_clip_path * pcpath)
265
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
268
+ ijsdev->k_path = 1;
270
+ code = (*ijsdev->prn_procs.fill_mask)(dev, data, dx, raster, id, x, y, w, h, pdcolor, depth, lop, pcpath);
272
-/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
273
- require some workarounds. When more up-to-date hpijs versions
274
- become ubiquitous, all these workarounds should be removed. */
275
-#define HPIJS_1_0_VERSION 29
276
+ ijsdev->k_path = 0;
281
+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis,
282
+ gx_path * ppath, const gx_fill_params * params,
283
+ const gx_drawing_color * pdcolor,
284
+ const gx_clip_path * pcpath)
286
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
289
+ ijsdev->k_path = 1;
291
+ code = (*ijsdev->prn_procs.fill_path)(dev, pis, ppath, params, pdcolor, pcpath);
293
+ ijsdev->k_path = 0;
298
+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis,
299
+ gx_path * ppath, const gx_stroke_params * params,
300
+ const gx_drawing_color * pdcolor,
301
+ const gx_clip_path * pcpath)
303
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
306
+ ijsdev->k_path = 1;
308
+ code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath);
310
+ ijsdev->k_path = 0;
315
+/* ---------------- krgb banding playback procedures ---------------- */
317
+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data)
319
+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
320
+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
321
+ int band_height = cdev->page_info.band_params.BandHeight;
322
+ int band_number = y/band_height;
323
+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */
324
+ int y1=raster*(y-(band_height*band_number));
328
+ /* First raster for band, clear k_band. Banding playback occurs on first raster. */
329
+ memset(ijsdev->k_band, 0, ijsdev->k_band_size);
332
+ return gdev_prn_get_bits(pdev, y, str, actual_data); /* get raster from regular band */
335
+private int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data)
337
+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
338
+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
339
+ int band_height = cdev->page_info.band_params.BandHeight;
340
+ int band_number = y/band_height;
341
+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */
342
+ int y1=raster*(y-(band_height*band_number));
344
+ *actual_data = ijsdev->k_band+y1;
349
+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target,
350
+ const gx_render_plane_t *render_plane, gs_memory_t *mem, bool for_band)
352
+ gx_device_ijs *ijsdev = (gx_device_ijs *)target;
353
+ int n_chan = ijsdev->color_info.num_components;
354
+ int code = gx_default_create_buf_device(pbdev, target, render_plane, mem, for_band);
355
+ if (code < 0 || n_chan != 3)
358
+ /* Save buffer (vector) procedures so that we can hook them during banding playback. */
359
+ ijsdev->prn_procs = (*pbdev)->procs;
361
+ /* Replace buffer procedures with krgb procedures. */
362
+ set_dev_proc(*pbdev, fill_rectangle, gsijs_fill_rectangle);
363
+ set_dev_proc(*pbdev, copy_mono, gsijs_copy_mono);
364
+ set_dev_proc(*pbdev, fill_mask, gsijs_fill_mask);
365
+ set_dev_proc(*pbdev, fill_path, gsijs_fill_path);
366
+ set_dev_proc(*pbdev, stroke_path, gsijs_stroke_path);
371
+/* See if IJS server supports krgb. */
373
+gsijs_set_krgb_mode(gx_device_ijs *ijsdev)
376
+ int n_chan = ijsdev->color_info.num_components;
379
+ ijsdev->krgb_mode = 0; /* default is no krgb */
382
+ return 0; /* no krgb support, not RGB colorspace */
385
+ code = ijs_client_enum_param(ijsdev->ctx, 0, "ColorSpace", buf, sizeof(buf)-1);
388
+ if (strstr(buf, "KRGB") != NULL)
390
+ ijsdev->krgb_mode = 1; /* yes KRGB is supported */
391
+ ijsdev->k_bits = 1; /* KRGB = 1x8x8x8 */
393
+ else if (strstr(buf, "KxRGB") != NULL)
395
+ ijsdev->krgb_mode = 1; /* yes KRGB is supported */
396
+ ijsdev->k_bits = 8; /* KRGB = 8x8x8x8 */
402
+/* ------ Private definitions ------ */
405
gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
410
- * gsijs_set_generic_params_hpijs: Set generic IJS parameters.
412
- * This version is specialized for hpijs 1.0 through 1.0.2, and
413
- * accommodates a number of quirks.
416
-gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev)
421
- /* IjsParams, Duplex, and Tumble get set at this point because
422
- they may affect margins. */
423
- if (ijsdev->IjsParams) {
424
- code = gsijs_client_set_param(ijsdev, "IjsParams", ijsdev->IjsParams);
427
- if (code == 0 && ijsdev->Duplex_set) {
430
- duplex_val = ijsdev->Duplex ? (ijsdev->IjsTumble ? 1 : 2) : 0;
431
- sprintf (buf, "%d", duplex_val);
432
- code = gsijs_client_set_param(ijsdev, "Duplex", buf);
438
* gsijs_set_generic_params: Set generic IJS parameters.
445
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
446
- return gsijs_set_generic_params_hpijs(ijsdev);
448
/* Split IjsParams into separate parameters and send to ijs server */
450
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
455
- * gsijs_set_margin_params_hpijs: Do margin negotiation with IJS server.
457
- * This version is specialized for hpijs 1.0 through 1.0.2, and
458
- * accommodates a number of quirks.
461
-gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev)
467
- sprintf(buf, "%d", ijsdev->width);
468
- code = gsijs_client_set_param(ijsdev, "Width", buf);
471
- sprintf(buf, "%d", ijsdev->height);
472
- code = gsijs_client_set_param(ijsdev, "Height", buf);
476
- double printable_width, printable_height;
477
- double printable_left, printable_top;
480
- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableArea",
482
- if (code == IJS_EUNKPARAM)
483
- /* IJS server doesn't support margin negotiations.
486
- else if (code >= 0) {
487
- code = gsijs_parse_wxh(buf, code,
488
- &printable_width, &printable_height);
492
- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableTopLeft",
494
- if (code == IJS_EUNKPARAM)
496
- else if (code >= 0) {
497
- code = gsijs_parse_wxh(buf, code,
498
- &printable_left, &printable_top);
503
- m[0] = printable_left;
504
- m[1] = ijsdev->MediaSize[1] * (1.0 / 72) -
505
- printable_top - printable_height;
506
- m[2] = ijsdev->MediaSize[0] * (1.0 / 72) -
507
- printable_left - printable_width;
508
- m[3] = printable_top;
509
- gx_device_set_margins((gx_device *)ijsdev, m, true);
517
* gsijs_set_margin_params: Do margin negotiation with IJS server.
524
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
525
- return gsijs_set_margin_params_hpijs(ijsdev);
527
/* Split IjsParams into separate parameters and send to ijs server */
529
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
530
@@ -531,12 +780,18 @@
534
+ long max_bitmap = ijsdev->space_params.MaxBitmap;
536
if (strlen(ijsdev->IjsServer) == 0) {
537
eprintf("ijs server not specified\n");
538
return gs_note_error(gs_error_ioerror);
541
+ ijsdev->space_params.MaxBitmap = 0; /* force banding */
543
+ /* Set create_buf_device in printer device, so that we can hook the banding playback procedures. */
544
+ ijsdev->printer_procs.buf_procs.create_buf_device = gsijs_create_buf_device;
546
/* Decide whether to use OutputFile or OutputFD. Note: how to
547
determine this is a tricky question, so we just allow the
553
+ ijsdev->space_params.MaxBitmap = max_bitmap;
556
/* Note: dup() may not be portable to all interesting IJS
557
platforms. In that case, this branch should be #ifdef'ed out.
560
code = gsijs_set_margin_params(ijsdev);
563
+ code = gsijs_set_krgb_mode(ijsdev);
569
return min(width, end);
572
-private int ijs_all_white(unsigned char *data, int size)
576
- for (i = 0; i < size; i++)
578
- if (data[i] != 0xFF)
587
/* Print a page. Don't use normal printer gdev_prn_output_page
588
* because it opens the output file.
591
gx_device_printer *pdev = (gx_device_printer *)dev;
592
int raster = gdev_prn_raster(pdev);
593
int ijs_width, ijs_height;
595
+ int row_bytes, k_row_bytes=0;
596
int n_chan = pdev->color_info.num_components;
597
+ int krgb_mode = ijsdev->krgb_mode;
598
+ int k_bits = ijsdev->k_bits;
601
double xres = pdev->HWResolution[0];
602
@@ -732,13 +979,23 @@
604
/* Determine bitmap width and height */
605
ijs_height = gdev_prn_print_scan_lines(dev);
606
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) {
607
- ijs_width = pdev->width;
609
ijs_width = gsijs_raster_width(dev);
612
row_bytes = (ijs_width * pdev->color_info.depth + 7) >> 3;
616
+ gx_device_clist_common *cdev = (gx_device_clist_common *)dev;
617
+ int band_height = cdev->page_info.band_params.BandHeight;
618
+ k_row_bytes = (ijs_width + 7) >> 3;
620
+ /* Create banding buffer for k plane. */
621
+ ijsdev->k_width = ijs_width;
622
+ ijsdev->k_band_size = band_height * k_row_bytes;
623
+ if ((ijsdev->k_band = gs_malloc(pdev->memory, ijsdev->k_band_size, 1, "gsijs_output_page")) == (unsigned char *)NULL)
624
+ return gs_note_error(gs_error_VMerror);
627
/* Required page parameters */
628
sprintf(buf, "%d", n_chan);
629
gsijs_client_set_param(ijsdev, "NumChan", buf);
630
@@ -747,44 +1004,71 @@
632
/* This needs to become more sophisticated for DeviceN. */
633
strcpy(buf, (n_chan == 4) ? "DeviceCMYK" :
634
- ((n_chan == 3) ? "DeviceRGB" : "DeviceGray"));
635
+ ((n_chan == 3) ? (krgb_mode ? ((k_bits == 1) ? "KRGB" : "KxRGB") : "DeviceRGB") : "DeviceGray"));
636
gsijs_client_set_param(ijsdev, "ColorSpace", buf);
638
- /* If hpijs 1.0, don't set width and height here, because it
639
- expects them to be the paper size. */
640
- if (ijsdev->ijs_version != HPIJS_1_0_VERSION) {
641
- sprintf(buf, "%d", ijs_width);
642
- gsijs_client_set_param(ijsdev, "Width", buf);
643
- sprintf(buf, "%d", ijs_height);
644
- gsijs_client_set_param(ijsdev, "Height", buf);
646
+ sprintf(buf, "%d", ijs_width);
647
+ gsijs_client_set_param(ijsdev, "Width", buf);
648
+ sprintf(buf, "%d", ijs_height);
649
+ gsijs_client_set_param(ijsdev, "Height", buf);
651
sprintf(buf, "%gx%g", xres, yres);
652
gsijs_client_set_param(ijsdev, "Dpi", buf);
657
+ kfd = open("/tmp/k.pbm", O_CREAT | O_TRUNC | O_RDWR, 0644);
658
+ rgbfd = open("/tmp/rgb.ppm", O_CREAT | O_TRUNC | O_RDWR, 0644);
659
+ snprintf(sz, sizeof(sz), "P4\n#gdevijs test\n%d\n%d\n", ijs_width, ijs_height);
660
+ write(kfd, sz, strlen(sz));
661
+ snprintf(sz, sizeof(sz), "P6\n#gdevijs test\n%d\n%d\n255\n", ijs_width, ijs_height);
662
+ write(rgbfd, sz, strlen(sz));
665
for (i=0; i<num_copies; i++) {
666
unsigned char *actual_data;
667
ijs_client_begin_cmd (ijsdev->ctx, IJS_CMD_BEGIN_PAGE);
668
status = ijs_client_send_cmd_wait(ijsdev->ctx);
670
for (y = 0; y < ijs_height; y++) {
671
- code = gdev_prn_get_bits(pdev, y, data, &actual_data);
675
+ code = gsijs_get_bits(pdev, y, data, &actual_data);
677
+ code = gdev_prn_get_bits(pdev, y, data, &actual_data);
681
+ write(rgbfd, actual_data, row_bytes);
683
+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, row_bytes);
687
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION &&
688
- ijs_all_white(actual_data, row_bytes))
689
- status = ijs_client_send_data_wait(ijsdev->ctx, 0, NULL, 0);
691
- status = ijs_client_send_data_wait(ijsdev->ctx, 0,
692
- (char *)actual_data, row_bytes);
696
+ code = gsijs_k_get_bits(pdev, y, &actual_data);
700
+ write(kfd, actual_data, k_row_bytes);
702
+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, k_row_bytes);
707
ijs_client_begin_cmd(ijsdev->ctx, IJS_CMD_END_PAGE);
708
status = ijs_client_send_cmd_wait(ijsdev->ctx);
717
+ gs_free(pdev->memory, ijsdev->k_band, ijsdev->k_band_size, 1, "gsijs_output_page");
719
gs_free_object(pdev->memory, data, "gsijs_output_page");
721
endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
722
@@ -1090,7 +1374,6 @@
723
dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
729
gsijs_set_color_format(gx_device_ijs *ijsdev)
added
removed
prnt/hpijs/gdevijs-krgb-1.3-gs8.54.patch
