summaryrefslogtreecommitdiff
path: root/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
diff options
context:
space:
mode:
Diffstat (limited to 'print/ghostscript-afpl/files/patch-eplaser:gdevescv.c')
-rw-r--r--print/ghostscript-afpl/files/patch-eplaser:gdevescv.c47
1 files changed, 39 insertions, 8 deletions
diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
index 3578352b1b7e..e52c4569c06a 100644
--- a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c
@@ -1,15 +1,28 @@
---- eplaser/gdevescv.c.orig Fri Jul 25 20:59:58 2003
-+++ eplaser/gdevescv.c Tue Sep 9 22:03:50 2003
-@@ -37,8 +37,6 @@
+--- eplaser/gdevescv.c.orig Thu Oct 30 21:41:16 2003
++++ eplaser/gdevescv.c Wed Dec 17 00:51:21 2003
+@@ -37,10 +37,6 @@
*/
-#include <stdlib.h>
-#include <unistd.h>
- #include <string.h>
-
+-#include <string.h>
+-
#include "math_.h"
-@@ -321,6 +319,16 @@
+ #include "gx.h"
+ #include "gserrors.h"
+@@ -62,6 +58,10 @@
+ #include "gspath.h"
+ #include "gzpath.h"
+
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
+ /* ---------------- Device definition ---------------- */
+
+ /* Device procedures */
+@@ -335,6 +335,16 @@
};
/* Vector device implementation */
@@ -26,7 +39,7 @@
private int escv_beginpage(P1(gx_device_vector * vdev));
private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -329,10 +337,25 @@
+@@ -343,10 +353,25 @@
private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff));
@@ -52,7 +65,7 @@
private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
-@@ -345,6 +368,7 @@
+@@ -359,6 +384,7 @@
floatp x_start, floatp y_start, gx_path_type_t type));
private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
@@ -60,3 +73,21 @@
private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -1570,7 +1596,7 @@
+ pdev->MaskState = 1;
+ }
+ color_set_pure(&color, one);
+- code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
++ code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
+
+ /* ここを通過したら以下の色設定は無意味? */
+ }
+@@ -1669,7 +1695,7 @@
+ if (w <= 0 || h <= 0) return 0;
+
+ if (depth > 1 ||
+- gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
++ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
+ gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
+ gdev_vector_update_log_op(vdev, lop) < 0
+ )