100 lines
3.9 KiB
C
100 lines
3.9 KiB
C
--- eplaser/gdevescv.c.orig Mon May 17 14:25:19 2004
|
||
+++ eplaser/gdevescv.c Mon Aug 2 14:04:30 2004
|
||
@@ -37,10 +37,6 @@
|
||
|
||
*/
|
||
|
||
-#include <stdlib.h>
|
||
-#include <unistd.h>
|
||
-#include <string.h>
|
||
-
|
||
#include "math_.h"
|
||
#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 */
|
||
@@ -342,6 +342,16 @@
|
||
};
|
||
|
||
/* Vector device implementation */
|
||
+#if GS_VERSION_MAJOR >= 8
|
||
+private int escv_beginpage(gx_device_vector * vdev);
|
||
+private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
|
||
+private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
|
||
+private int escv_setdash(gx_device_vector * vdev, const float *pattern,
|
||
+ uint count, floatp offset);
|
||
+private int escv_setflat(gx_device_vector * vdev, floatp flatness);
|
||
+private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
|
||
+ gs_logical_operation_t diff);
|
||
+#else
|
||
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));
|
||
@@ -350,10 +360,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));
|
||
+#endif
|
||
private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
|
||
fixed y1, gx_path_type_t type);
|
||
private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
|
||
gx_path_type_t type);
|
||
+#if GS_VERSION_MAJOR >= 8
|
||
+private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
|
||
+private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
|
||
+ floatp x, floatp y, gx_path_type_t type);
|
||
+private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
|
||
+ floatp x, floatp y, gx_path_type_t type);
|
||
+private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
|
||
+ floatp x1, floatp y1, floatp x2, floatp y2,
|
||
+ floatp x3, floatp y3, gx_path_type_t type);
|
||
+private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y,
|
||
+ floatp x_start, floatp y_start, gx_path_type_t type);
|
||
+
|
||
+private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type);
|
||
+#else
|
||
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));
|
||
@@ -366,6 +391,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));
|
||
+#endif
|
||
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);
|
||
@@ -1578,7 +1604,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);
|
||
|
||
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̲ᤷ<CCB2><E1A4B7><EFBFBD><EFBFBD><EFBFBD>ʲ<EFBFBD><CAB2>ο<EFBFBD><CEBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><CCB5>̣<EFBFBD><CCA3> */
|
||
}
|
||
@@ -1671,13 +1697,13 @@
|
||
gs_logical_operation_t lop, const gx_clip_path * pcpath)
|
||
{
|
||
gx_device_vector const *vdev = (gx_device_vector *) dev;
|
||
- gx_device_escv const *pdev = (gx_device_escv *) dev;
|
||
+ gx_device_escv *pdev = (gx_device_escv *) dev;
|
||
stream *s = gdev_vector_stream(vdev);
|
||
|
||
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
|
||
)
|