1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
--- src/filter.c.orig 2020-10-12 02:31:41 UTC
+++ src/filter.c
@@ -32,7 +32,10 @@
#include "epson-protocol.h"
#include "epson-escpr-api.h"
+#include "epson-escpr-api-private.h"
+#include "epson-escpr-services.h"
#include "epson-escpr-mem.h"
+#include "epson-escpage.h"
#include "err.h"
#include "mem.h"
@@ -41,6 +44,7 @@
#include "libprtX.h"
#include "optBase.h"
#include "linux_cmn.h"
+#include "xfifo.h"
#define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
@@ -225,7 +229,7 @@ main (int argc, char *argv[])
EPS_BANDBMP bandBmp;
/* Fifo for Backend */
-// context = (void*)XFIFOOpen();
+ context = (void*)XFIFOOpen();
///////////////////////////////////////////////////////////////////////////////////////////////////////////
memset (&jobAttr, 0, sizeof(jobAttr));
@@ -380,7 +384,7 @@ main (int argc, char *argv[])
}
printJob.jobStatus = EPS_STATUS_ESTABLISHED;
- int printHeight = 0;
+ EPS_UINT32 printHeight = 0;
///////////////////////////////////////////////////////////////////////////////////////////////////////////
print_area_x = printJob.printableAreaWidth;
@@ -409,7 +413,7 @@ main (int argc, char *argv[])
while ((read_page_no = read (STDIN_FILENO, &page_num, 1)) > 0) // 最初に page番号を読み込み
{
long x_count, y_count;
- int band_line_count;
+ EPS_UINT32 band_line_count;
y_count = 0;
band_line_count = 0;
@@ -497,7 +501,11 @@ main (int argc, char *argv[])
pagebuf+= bandBmp.widthBytes;
posbuf+=bandBmp.widthBytes;
+ if (band_line_count > printHeight) {
band_line_count -= printHeight;
+ } else {
+ band_line_count = 0;
+ }
bandBmp.bits += band_line_count;
}
@@ -508,13 +516,17 @@ main (int argc, char *argv[])
memcpy(pagebuf, bandBmp.bits, bandBmp.widthBytes);
pagebuf+= bandBmp.widthBytes;
posbuf+= bandBmp.widthBytes;
+ if (band_line_count > printHeight) {
band_line_count -= printHeight;
+ } else {
+ band_line_count = 0;
+ }
bandBmp.bits += band_line_count;
}
int revert = 0;
int pos = posbuf - bandBmp.widthBytes ;
- char *rever_buf = malloc(bandBmp.widthBytes + 1000);
+ EPS_UINT8 *rever_buf = (EPS_UINT8 *)malloc(bandBmp.widthBytes + 1000);
for (revert = print_area_y; revert > 0; revert--)
{
if (3 != byte_par_pixel)
@@ -658,7 +670,11 @@ main (int argc, char *argv[])
#endif
debug_msg("printHeight = %d\n", printHeight);
debug_msg("widthByte = %d\n", bandBmp.widthBytes);
+ if (band_line_count > printHeight) {
band_line_count -= printHeight;
+ } else {
+ band_line_count = 0;
+ }
bandBmp.bits += band_line_count;
}
@@ -680,7 +696,11 @@ main (int argc, char *argv[])
fprintf(fp, "\n");
fclose(fp);
#endif
+ if (band_line_count > printHeight) {
band_line_count -= printHeight;
+ } else {
+ band_line_count = 0;
+ }
bandBmp.bits += band_line_count;
}
@@ -710,7 +730,7 @@ quit:;
mem_free(paper);
debug_msg("PRINT SUCCESS\n");
-// XFIFOClose(&context);
+ XFIFOClose(&context);
return 0;
}
@@ -871,7 +891,7 @@ static int getMediaTypeID(char *rsc_name)
EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT8* pBuf, EPS_UINT32 cbBuf)
{
-#if 1
+#if 0
long int i;
for (i = 0; i < cbBuf; i++)
putc(*(pBuf + i), outfp);
@@ -879,7 +899,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
// fwrite (pBuf, cbBuf, 1, outfp);
-// XFIFOWrite(context, pBuf, cbBuf);
+ XFIFOWrite(context, (char *)pBuf, cbBuf);
return 1;
}
|
