summaryrefslogtreecommitdiff
path: root/print/ghostscript7-x11/files/patch-src-gdevijs.c
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-06-17 23:28:04 +0000
committerMathieu Arnold <mat@FreeBSD.org>2016-06-17 23:28:04 +0000
commit1a8a092d9fefcbd7f960c82c59802c61807867a6 (patch)
tree48e47bf661e0e5d6ed9c060e8aea683b30d4540f /print/ghostscript7-x11/files/patch-src-gdevijs.c
parent- Update to 1.7.1 (diff)
Rename all files containing a : in their filename.
While there, run make makepatch on affected ports, and rename patches accordingly. Sponsored by: Absolight
Diffstat (limited to '')
-rw-r--r--print/ghostscript7-x11/files/patch-src_gdevijs.c (renamed from print/ghostscript7-x11/files/patch-src-gdevijs.c)48
1 files changed, 24 insertions, 24 deletions
diff --git a/print/ghostscript7-x11/files/patch-src-gdevijs.c b/print/ghostscript7-x11/files/patch-src_gdevijs.c
index fed73ce2599f..1affce3e86d8 100644
--- a/print/ghostscript7-x11/files/patch-src-gdevijs.c
+++ b/print/ghostscript7-x11/files/patch-src_gdevijs.c
@@ -1,5 +1,5 @@
---- src/gdevijs.c.orig Fri Jan 17 09:49:00 2003
-+++ src/gdevijs.c Thu May 26 01:00:57 2005
+--- src/gdevijs.c.orig 2003-01-17 00:49:00 UTC
++++ src/gdevijs.c
@@ -29,15 +29,29 @@
* which is a security risk, since any program can be run.
* You should use -dSAFER which sets .LockSafetyParams to true
@@ -30,7 +30,7 @@
/* This should go into gdevprn.h, or, better yet, gdevprn should
acquire an API for changing resolution. */
int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
-@@ -53,6 +67,14 @@
+@@ -53,6 +67,14 @@ private dev_proc_output_page(gsijs_outpu
private dev_proc_get_params(gsijs_get_params);
private dev_proc_put_params(gsijs_put_params);
@@ -45,7 +45,7 @@
private const gx_device_procs gsijs_procs =
prn_color_params_procs(gsijs_open, gsijs_output_page, gsijs_close,
gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb,
-@@ -85,6 +107,14 @@
+@@ -85,6 +107,14 @@ struct gx_device_ijs_s {
IjsClientCtx *ctx;
int ijs_version;
@@ -60,7 +60,7 @@
};
#define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */
-@@ -112,7 +142,12 @@
+@@ -112,7 +142,12 @@ gx_device_ijs gs_ijs_device =
FALSE, /* Tumble_set */
NULL, /* IjsClient *ctx */
@@ -74,13 +74,17 @@
};
-@@ -128,12 +163,254 @@
+@@ -128,12 +163,254 @@ private int gsijs_read_string(gs_param_l
/**************************************************************************/
-/* ------ Private definitions ------ */
+/* ---------------- Low-level graphic procedures ---------------- */
-+
+
+-/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
+- require some workarounds. When more up-to-date hpijs versions
+- become ubiquitous, all these workarounds should be removed. */
+-#define HPIJS_1_0_VERSION 29
+static unsigned char xmask[] =
+{
+ 0x80, /* x=0 */
@@ -241,11 +245,7 @@
+ int code;
+
+ ijsdev->k_path = 1;
-
--/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
-- require some workarounds. When more up-to-date hpijs versions
-- become ubiquitous, all these workarounds should be removed. */
--#define HPIJS_1_0_VERSION 29
++
+ code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath);
+
+ ijsdev->k_path = 0;
@@ -334,7 +334,7 @@
private int
gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
-@@ -171,34 +448,6 @@
+@@ -171,34 +448,6 @@ gsijs_parse_wxh (const char *val, int si
}
/**
@@ -369,7 +369,7 @@
* gsijs_set_generic_params: Set generic IJS parameters.
**/
private int
-@@ -209,9 +458,6 @@
+@@ -209,9 +458,6 @@ gsijs_set_generic_params(gx_device_ijs *
int i, j;
char *value;
@@ -379,7 +379,7 @@
/* Split IjsParams into separate parameters and send to ijs server */
value = NULL;
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -252,68 +498,6 @@
+@@ -252,68 +498,6 @@ gsijs_set_generic_params(gx_device_ijs *
}
/**
@@ -448,7 +448,7 @@
* gsijs_set_margin_params: Do margin negotiation with IJS server.
**/
private int
-@@ -324,9 +508,6 @@
+@@ -324,9 +508,6 @@ gsijs_set_margin_params(gx_device_ijs *i
int i, j;
char *value;
@@ -458,7 +458,7 @@
/* Split IjsParams into separate parameters and send to ijs server */
value = NULL;
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -493,12 +674,18 @@
+@@ -493,12 +674,18 @@ gsijs_open(gx_device *dev)
char buf[256];
bool use_outputfd;
int fd = -1;
@@ -477,7 +477,7 @@
/* Decide whether to use OutputFile or OutputFD. Note: how to
determine this is a tricky question, so we just allow the
user to set it.
-@@ -513,6 +700,8 @@
+@@ -513,6 +700,8 @@ gsijs_open(gx_device *dev)
if (code < 0)
return code;
@@ -486,7 +486,7 @@
if (use_outputfd) {
/* Note: dup() may not be portable to all interesting IJS
platforms. In that case, this branch should be #ifdef'ed out.
-@@ -572,6 +761,9 @@
+@@ -572,6 +761,9 @@ gsijs_open(gx_device *dev)
if (code >= 0)
code = gsijs_set_margin_params(ijsdev);
@@ -496,7 +496,7 @@
return code;
};
-@@ -631,21 +823,6 @@
+@@ -631,21 +823,6 @@ gsijs_raster_width(gx_device *pdev)
return min(width, end);
}
@@ -518,7 +518,7 @@
/* Print a page. Don't use normal printer gdev_prn_output_page
* because it opens the output file.
*/
-@@ -656,8 +833,9 @@
+@@ -656,8 +833,9 @@ gsijs_output_page(gx_device *dev, int nu
gx_device_printer *pdev = (gx_device_printer *)dev;
int raster = gdev_prn_raster(pdev);
int ijs_width, ijs_height;
@@ -529,7 +529,7 @@
unsigned char *data;
char buf[256];
double xres = pdev->HWResolution[0];
-@@ -673,13 +851,23 @@
+@@ -673,13 +851,23 @@ gsijs_output_page(gx_device *dev, int nu
/* Determine bitmap width and height */
ijs_height = gdev_prn_print_scan_lines(dev);
@@ -557,7 +557,7 @@
/* Required page parameters */
sprintf(buf, "%d", n_chan);
gsijs_client_set_param(ijsdev, "NumChan", buf);
-@@ -688,44 +876,71 @@
+@@ -688,44 +876,71 @@ gsijs_output_page(gx_device *dev, int nu
/* This needs to become more sophisticated for DeviceN. */
strcpy(buf, (n_chan == 4) ? "DeviceCMYK" :
@@ -649,7 +649,7 @@
gs_free_object(pdev->memory, data, "gsijs_output_page");
endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
-@@ -1029,7 +1244,6 @@
+@@ -1029,7 +1244,6 @@ gsijs_client_set_param(gx_device_ijs *ij
dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
return code;
}