1
--- old/src/gdevijs.c 2005-05-27 02:43:24.000000000 -0300
2
+++ new/src/gdevijs.c 2006-02-24 12:11:23.761594071 -0300
4
* which is a security risk, since any program can be run.
5
* You should use -dSAFER which sets .LockSafetyParams to true
6
* before opening this device.
8
+ * 11/26/03 David Suffield (gdevijs-krgb-1.0.patch)
9
+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP
11
+ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher.
12
+ * 2. Added krgb support.
14
+ * 02/21/05 David Suffield (gdevijs-krgb-1.1.patch)
15
+ * 1. Fixed segfault issue with 1-bit color space.
16
+ * 2. Fixed z-order issue with colored text on black rectangle.
18
+ * 02/22/06 David Suffield (gdevijs-krgb-1.2.patch)
19
+ * 1. Fixed krgb buffer overflow issue with out-of-band data in
20
+ * fill_rectangle and copy_mono. This buffer overflow condition
21
+ * occurred with fullbleed print jobs that had k-band images.
24
#include "unistd_.h" /* for dup() */
27
#include "ijs_client.h"
34
/* This should go into gdevprn.h, or, better yet, gdevprn should
35
acquire an API for changing resolution. */
36
int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
38
private dev_proc_put_params(gsijs_put_params);
39
private dev_proc_finish_copydevice(gsijs_finish_copydevice);
41
+/* Following definitions are for krgb support. */
42
+private dev_proc_create_buf_device(gsijs_create_buf_device);
43
+private dev_proc_fill_rectangle(gsijs_fill_rectangle);
44
+private dev_proc_copy_mono(gsijs_copy_mono);
45
+private dev_proc_fill_mask(gsijs_fill_mask);
46
+private dev_proc_fill_path(gsijs_fill_path);
47
+private dev_proc_stroke_path(gsijs_stroke_path);
49
private const gx_device_procs gsijs_procs = {
51
NULL, /* get_initial_matrix */
57
+ /* Additional parameters for krgb support. */
58
+ int krgb_mode; /* 0=false, 1=true */
59
+ int k_path; /* k plane path, 0=false, 1=true */
60
+ int k_width; /* k plane width in pixels */
61
+ int k_band_size; /* k plane buffer size in bytes, byte aligned */
62
+ unsigned char *k_band; /* k plane buffer */
63
+ gx_device_procs prn_procs; /* banding playback procedures */
66
#define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */
68
FALSE, /* Tumble_set */
70
NULL, /* IjsClient *ctx */
72
+ 0, /* ijs_version */
76
+ 0, /* k_band_size */
77
+ NULL /* k_band buffer */
81
@@ -170,12 +211,355 @@
83
/**************************************************************************/
85
-/* ------ Private definitions ------ */
86
+/* ---------------- Low-level graphic procedures ---------------- */
88
+static unsigned char xmask[] =
100
+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
101
+ gx_color_index color)
103
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
105
+ if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0)
107
+ int raster = (ijsdev->k_width+7) >> 3;
108
+ register unsigned char *dest;
109
+ int dest_start_bit;
110
+ int band_height = ijsdev->k_band_size/raster;
111
+ int i,j,x1,y1,w1,h1;
113
+ if (h <= 0 || w <= 0)
116
+ /* Check for out-of-band graphic. */
117
+ if (x >= ijsdev->k_width || y >= band_height)
118
+ return 0; /* out-of-band */
120
+ /* Check for x clipping. */
126
+ else if ((x+w) > ijsdev->k_width)
129
+ w1 = ijsdev->k_width - x;
137
+ dest_start_bit = x1 & 7;
139
+ /* Check for y clipping. */
145
+ else if ((y+h) > band_height)
148
+ h1 = band_height - y;
156
+ dest=ijsdev->k_band+(raster*y1)+(x1 >> 3);
158
+ /* Note x,y orgin 0,0 is stored first byte 0 left to right. */
162
+ /* Color is black, store in k plane band instead of regular band. */
163
+ for (j=0; j<h1; j++)
165
+ for (i=0; i<w1; i++)
166
+ dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7];
173
+ /* Color is not black, remove any k plane bits
174
+ * for z-order dependencies, store in regular band. */
175
+ for (j=0; j<h1; j++)
177
+ for (i=0; i<w1; i++)
178
+ dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7];
184
+ return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color);
187
+private int gsijs_copy_mono(gx_device * dev, const byte * data,
188
+ int dx, int draster, gx_bitmap_id id,
189
+ int x, int y, int w, int height, gx_color_index zero, gx_color_index one)
191
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
193
+ // if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0)
194
+ if (ijsdev->krgb_mode && ijsdev->k_path)
196
+ /* Store in k plane band instead of regular band. */
197
+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes,
199
+ register unsigned char *dest;
200
+ register const unsigned char *scan;
201
+ int dest_start_bit;
202
+ int scan_start_bit;
203
+ int band_height = ijsdev->k_band_size/raster;
204
+ int i,x1,y1,w1,h1,h=height;
206
+ if (h <= 0 || w <= 0)
209
+ /* Check for out-of-band graphic. */
210
+ if (x >= ijsdev->k_width || y >= band_height)
211
+ return 0; /* out-of-band */
213
+ /* Check for x clipping. */
218
+ /* adj dx here?? */
220
+ else if ((x+w) > ijsdev->k_width)
223
+ w1 = ijsdev->k_width - x;
231
+ scan=data+(dx >> 3);
232
+ dest_start_bit = x1 & 7;
233
+ scan_start_bit = dx & 7;
235
+ /* Check for y clipping. */
240
+ scan+=draster*(h-h1);
242
+ else if ((y+h) > band_height)
245
+ h1 = band_height - y;
253
+ dest=ijsdev->k_band+(raster*y1)+(x1 >> 3);
257
+ /* Color is black, store in k plane band instead of regular band. */
260
+ for (i=0; i<w1; i++)
262
+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7])
263
+ dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7];
272
+ /* Color is not black, remove any k plane bits for
273
+ * z-order dependencies, store in regular band. */
276
+ for (i=0; i<w1; i++)
278
+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7])
279
+ dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7];
287
+ return (*ijsdev->prn_procs.copy_mono)(dev, data, dx, draster, id,
288
+ x, y, w, height, zero, one);
291
+/* ---------------- High-level graphic procedures ---------------- */
293
+private int gsijs_fill_mask(gx_device * dev,
294
+ const byte * data, int dx, int raster, gx_bitmap_id id,
295
+ int x, int y, int w, int h,
296
+ const gx_drawing_color * pdcolor, int depth,
297
+ gs_logical_operation_t lop, const gx_clip_path * pcpath)
299
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
302
+ ijsdev->k_path = 1;
304
+ code = (*ijsdev->prn_procs.fill_mask)(dev, data, dx, raster, id,
305
+ x, y, w, h, pdcolor, depth, lop, pcpath);
307
+ ijsdev->k_path = 0;
312
+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis,
313
+ gx_path * ppath, const gx_fill_params * params,
314
+ const gx_drawing_color * pdcolor,
315
+ const gx_clip_path * pcpath)
317
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
320
+ ijsdev->k_path = 1;
322
+ code = (*ijsdev->prn_procs.fill_path)(dev, pis, ppath, params,
325
+ ijsdev->k_path = 0;
330
+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis,
331
+ gx_path * ppath, const gx_stroke_params * params,
332
+ const gx_drawing_color * pdcolor,
333
+ const gx_clip_path * pcpath)
335
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
338
-/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
339
- require some workarounds. When more up-to-date hpijs versions
340
- become ubiquitous, all these workarounds should be removed. */
341
-#define HPIJS_1_0_VERSION 29
342
+ ijsdev->k_path = 1;
344
+ code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params,
347
+ ijsdev->k_path = 0;
352
+/* ---------------- krgb banding playback procedures ---------------- */
354
+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data)
356
+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
357
+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
358
+ int band_height = cdev->page_info.band_params.BandHeight;
359
+ int band_number = y/band_height;
360
+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes,
362
+ int y1=raster*(y-(band_height*band_number));
366
+ /* First raster for band, clear k_band.
367
+ * Banding playback occurs on first raster. */
368
+ memset(ijsdev->k_band, 0, ijsdev->k_band_size);
371
+ return gdev_prn_get_bits(pdev, y, str, actual_data); /* get raster from
375
+private int gsijs_k_get_bits(gx_device_printer * pdev, int y,
376
+ byte ** actual_data)
378
+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
379
+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
380
+ int band_height = cdev->page_info.band_params.BandHeight;
381
+ int band_number = y/band_height;
382
+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes,
384
+ int y1=raster*(y-(band_height*band_number));
386
+ *actual_data = ijsdev->k_band+y1;
391
+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target,
392
+ const gx_render_plane_t *render_plane, gs_memory_t *mem,
395
+ gx_device_ijs *ijsdev = (gx_device_ijs *)target;
396
+ int n_chan = ijsdev->color_info.num_components;
397
+ int code = gx_default_create_buf_device(pbdev, target, render_plane,
399
+ if (code < 0 || n_chan != 3)
402
+ /* Save buffer (vector) procedures so that
403
+ * we can hook them during banding playback. */
404
+ ijsdev->prn_procs = (*pbdev)->procs;
406
+ /* Replace buffer procedures with krgb procedures. */
407
+ set_dev_proc(*pbdev, fill_rectangle, gsijs_fill_rectangle);
408
+ set_dev_proc(*pbdev, copy_mono, gsijs_copy_mono);
409
+ set_dev_proc(*pbdev, fill_mask, gsijs_fill_mask);
410
+ set_dev_proc(*pbdev, fill_path, gsijs_fill_path);
411
+ set_dev_proc(*pbdev, stroke_path, gsijs_stroke_path);
416
+/* See if IJS server supports krgb. Return value: 0=false, 1=true. */
418
+gsijs_set_krgb_mode(gx_device_ijs *ijsdev)
421
+ int n_chan = ijsdev->color_info.num_components;
425
+ return 0; /* no krgb support, not RGB colorspace */
428
+ code = ijs_client_enum_param(ijsdev->ctx, 0, "ColorSpace",
429
+ buf, sizeof(buf)-1);
432
+ if (strstr(buf, "KRGB") == NULL)
433
+ return 0; /* no krgb support */
435
+ return 1; /* krgb is supported */
438
+/* ------ Private definitions ------ */
441
gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
446
- * gsijs_set_generic_params_hpijs: Set generic IJS parameters.
448
- * This version is specialized for hpijs 1.0 through 1.0.2, and
449
- * accommodates a number of quirks.
452
-gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev)
457
- /* IjsParams, Duplex, and Tumble get set at this point because
458
- they may affect margins. */
459
- if (ijsdev->IjsParams) {
460
- code = gsijs_client_set_param(ijsdev, "IjsParams", ijsdev->IjsParams);
463
- if (code == 0 && ijsdev->Duplex_set) {
466
- duplex_val = ijsdev->Duplex ? (ijsdev->IjsTumble ? 1 : 2) : 0;
467
- sprintf (buf, "%d", duplex_val);
468
- code = gsijs_client_set_param(ijsdev, "Duplex", buf);
474
* gsijs_set_generic_params: Set generic IJS parameters.
481
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
482
- return gsijs_set_generic_params_hpijs(ijsdev);
484
/* Split IjsParams into separate parameters and send to ijs server */
486
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
491
- * gsijs_set_margin_params_hpijs: Do margin negotiation with IJS server.
493
- * This version is specialized for hpijs 1.0 through 1.0.2, and
494
- * accommodates a number of quirks.
497
-gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev)
503
- sprintf(buf, "%d", ijsdev->width);
504
- code = gsijs_client_set_param(ijsdev, "Width", buf);
507
- sprintf(buf, "%d", ijsdev->height);
508
- code = gsijs_client_set_param(ijsdev, "Height", buf);
512
- double printable_width, printable_height;
513
- double printable_left, printable_top;
516
- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableArea",
518
- if (code == IJS_EUNKPARAM)
519
- /* IJS server doesn't support margin negotiations.
522
- else if (code >= 0) {
523
- code = gsijs_parse_wxh(buf, code,
524
- &printable_width, &printable_height);
528
- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableTopLeft",
530
- if (code == IJS_EUNKPARAM)
532
- else if (code >= 0) {
533
- code = gsijs_parse_wxh(buf, code,
534
- &printable_left, &printable_top);
539
- m[0] = printable_left;
540
- m[1] = ijsdev->MediaSize[1] * (1.0 / 72) -
541
- printable_top - printable_height;
542
- m[2] = ijsdev->MediaSize[0] * (1.0 / 72) -
543
- printable_left - printable_width;
544
- m[3] = printable_top;
545
- gx_device_set_margins((gx_device *)ijsdev, m, true);
553
* gsijs_set_margin_params: Do margin negotiation with IJS server.
560
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
561
- return gsijs_set_margin_params_hpijs(ijsdev);
563
/* Split IjsParams into separate parameters and send to ijs server */
565
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
566
@@ -535,12 +823,19 @@
570
+ long max_bitmap = ijsdev->space_params.MaxBitmap;
572
if (strlen(ijsdev->IjsServer) == 0) {
573
eprintf("ijs server not specified\n");
574
return gs_note_error(gs_error_ioerror);
577
+ ijsdev->space_params.MaxBitmap = 0; /* force banding */
579
+ /* Set create_buf_device in printer device,
580
+ * so that we can hook the banding playback procedures. */
581
+ ijsdev->printer_procs.buf_procs.create_buf_device = gsijs_create_buf_device;
583
/* Decide whether to use OutputFile or OutputFD. Note: how to
584
determine this is a tricky question, so we just allow the
590
+ ijsdev->space_params.MaxBitmap = max_bitmap;
593
/* Note: dup() may not be portable to all interesting IJS
594
platforms. In that case, this branch should be #ifdef'ed out.
597
code = gsijs_set_margin_params(ijsdev);
600
+ ijsdev->krgb_mode = gsijs_set_krgb_mode(ijsdev);
606
return min(width, end);
609
-private int ijs_all_white(unsigned char *data, int size)
613
- for (i = 0; i < size; i++)
615
- if (data[i] != 0xFF)
624
/* Print a page. Don't use normal printer gdev_prn_output_page
625
* because it opens the output file.
628
gx_device_printer *pdev = (gx_device_printer *)dev;
629
int raster = gdev_prn_raster(pdev);
630
int ijs_width, ijs_height;
632
+ int row_bytes, k_row_bytes=0;
633
int n_chan = pdev->color_info.num_components;
634
+ int krgb_mode = ijsdev->krgb_mode;
637
double xres = pdev->HWResolution[0];
638
@@ -736,13 +1022,24 @@
640
/* Determine bitmap width and height */
641
ijs_height = gdev_prn_print_scan_lines(dev);
642
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) {
643
- ijs_width = pdev->width;
645
- ijs_width = gsijs_raster_width(dev);
647
+ ijs_width = gsijs_raster_width(dev);
649
row_bytes = (ijs_width * pdev->color_info.depth + 7) >> 3;
653
+ gx_device_clist_common *cdev = (gx_device_clist_common *)dev;
654
+ int band_height = cdev->page_info.band_params.BandHeight;
655
+ k_row_bytes = (ijs_width + 7) >> 3;
657
+ /* Create banding buffer for k plane. */
658
+ ijsdev->k_width = ijs_width;
659
+ ijsdev->k_band_size = band_height * k_row_bytes;
660
+ if ((ijsdev->k_band = gs_malloc(pdev->memory, ijsdev->k_band_size,
661
+ 1, "gsijs_output_page")) == (unsigned char *)NULL)
662
+ return gs_note_error(gs_error_VMerror);
665
/* Required page parameters */
666
sprintf(buf, "%d", n_chan);
667
gsijs_client_set_param(ijsdev, "NumChan", buf);
668
@@ -751,44 +1048,76 @@
670
/* This needs to become more sophisticated for DeviceN. */
671
strcpy(buf, (n_chan == 4) ? "DeviceCMYK" :
672
- ((n_chan == 3) ? "DeviceRGB" : "DeviceGray"));
673
+ ((n_chan == 3) ? (krgb_mode ? "KRGB" : "DeviceRGB") : "DeviceGray"));
674
gsijs_client_set_param(ijsdev, "ColorSpace", buf);
676
- /* If hpijs 1.0, don't set width and height here, because it
677
- expects them to be the paper size. */
678
- if (ijsdev->ijs_version != HPIJS_1_0_VERSION) {
679
- sprintf(buf, "%d", ijs_width);
680
- gsijs_client_set_param(ijsdev, "Width", buf);
681
- sprintf(buf, "%d", ijs_height);
682
- gsijs_client_set_param(ijsdev, "Height", buf);
684
+ sprintf(buf, "%d", ijs_width);
685
+ gsijs_client_set_param(ijsdev, "Width", buf);
686
+ sprintf(buf, "%d", ijs_height);
687
+ gsijs_client_set_param(ijsdev, "Height", buf);
689
sprintf(buf, "%gx%g", xres, yres);
690
gsijs_client_set_param(ijsdev, "Dpi", buf);
695
+ kfd = open("/tmp/k.pbm", O_CREAT | O_TRUNC | O_RDWR, 0644);
696
+ rgbfd = open("/tmp/rgb.ppm", O_CREAT | O_TRUNC | O_RDWR, 0644);
697
+ snprintf(sz, sizeof(sz), "P4\n#gdevijs test\n%d\n%d\n",
698
+ ijs_width, ijs_height);
699
+ write(kfd, sz, strlen(sz));
700
+ snprintf(sz, sizeof(sz), "P6\n#gdevijs test\n%d\n%d\n255\n",
701
+ ijs_width, ijs_height);
702
+ write(rgbfd, sz, strlen(sz));
705
for (i=0; i<num_copies; i++) {
706
unsigned char *actual_data;
707
ijs_client_begin_cmd (ijsdev->ctx, IJS_CMD_BEGIN_PAGE);
708
status = ijs_client_send_cmd_wait(ijsdev->ctx);
710
for (y = 0; y < ijs_height; y++) {
711
- code = gdev_prn_get_bits(pdev, y, data, &actual_data);
715
+ code = gsijs_get_bits(pdev, y, data, &actual_data);
717
+ code = gdev_prn_get_bits(pdev, y, data, &actual_data);
721
+ write(rgbfd, actual_data, row_bytes);
723
+ status = ijs_client_send_data_wait(ijsdev->ctx, 0,
724
+ (char *)actual_data, row_bytes);
728
- if (ijsdev->ijs_version == HPIJS_1_0_VERSION &&
729
- ijs_all_white(actual_data, row_bytes))
730
- status = ijs_client_send_data_wait(ijsdev->ctx, 0, NULL, 0);
732
- status = ijs_client_send_data_wait(ijsdev->ctx, 0,
733
- (char *)actual_data, row_bytes);
737
+ code = gsijs_k_get_bits(pdev, y, &actual_data);
741
+ write(kfd, actual_data, k_row_bytes);
743
+ status = ijs_client_send_data_wait(ijsdev->ctx, 0,
744
+ (char *)actual_data, k_row_bytes);
749
ijs_client_begin_cmd(ijsdev->ctx, IJS_CMD_END_PAGE);
750
status = ijs_client_send_cmd_wait(ijsdev->ctx);
759
+ gs_free(pdev->memory, ijsdev->k_band, ijsdev->k_band_size,
760
+ 1, "gsijs_output_page");
762
gs_free_object(pdev->memory, data, "gsijs_output_page");
764
endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
765
@@ -1094,7 +1423,6 @@
766
dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
772
gsijs_set_color_format(gx_device_ijs *ijsdev)
added
removed
debian/gdevijs-krgb-1.2-gs8.53debian.patch
