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
|
From 2eaf51858354107641a97bfd0fb5539a5889e925 Mon Sep 17 00:00:00 2001
Message-Id: <2eaf51858354107641a97bfd0fb5539a5889e925.1595700971.git.maciek.borzecki@gmail.com>
From: Maciek Borzecki <maciek.borzecki@gmail.com>
Date: Sat, 25 Jul 2020 20:15:18 +0200
Subject: [PATCH] update x86-64 patch
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
---
src/filter.c | 13 ++++++++++---
src/mem.c | 1 +
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/filter.c b/src/filter.c
index 6d4ce86e4993b58f25b569cf014c9237f0726785..bc64487787464803839aa883e3020b6d40f052fb 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -39,6 +39,8 @@
#include "epson-escpr-api.h"
#include "epson-escpr-services.h"
#include "epson-escpr-mem.h"
+#include "epson-escpr-services.h"
+//#include "epson-escpage.h"
#include "err.h"
#include "mem.h"
@@ -47,6 +49,11 @@
#include "libprtX.h"
#include "optBase.h"
#include "linux_cmn.h"
+#include "xfifo.h"
+
+extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB*);
+extern EPS_ERR_CODE SendStartJob ();
+extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*);
#define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
@@ -430,7 +437,7 @@ main (int argc, char *argv[])
}
printJob.jobStatus = EPS_STATUS_ESTABLISHED;
- int printHeight = 0;
+ EPS_UINT32 printHeight = 0;
///////////////////////////////////////////////////////////////////////////////////////////////////////////
print_area_x = printJob.printableAreaWidth;
@@ -604,7 +611,7 @@ main (int argc, char *argv[])
memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3);
}
}
- PrintBand (rever_buf, bandBmp.widthBytes, &printHeight);
+ PrintBand ((const EPS_UINT8 *)rever_buf, bandBmp.widthBytes, &printHeight);
pos -= bandBmp.widthBytes;
}
@@ -897,7 +904,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt)
/* Get number of pages */
char page_num;
- read (STDIN_FILENO, &page_num, 1);
+ (void)read (STDIN_FILENO, &page_num, 1);
debug_msg("total pages = %d\n", page_num);
/* Others */
diff --git a/src/mem.c b/src/mem.c
index f53f2bc144c3dd5b4a6b9ed0c8bdf9fec963ef79..d6c945acbf6a493de0b921f11d700cabeb6d3ff4 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include "mem.h"
+#include "err.h"
void *
mem_malloc (unsigned int size, bool_t crit)
--
2.27.0
|