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
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
|
=== modified file 'filter/pdf.cxx'
--- filter/pdf.cxx 2012-08-19 22:31:27 +0000
+++ filter/pdf.cxx 2013-08-01 15:48:06 +0000
@@ -17,6 +17,10 @@
#include "pdf.h"
#include <PDFDoc.h>
+#include <config.h>
+#ifdef HAVE_CPP_POPPLER_VERSION_H
+#include "cpp/poppler-version.h"
+#endif
extern "C" pdf_t * pdf_load_template(const char *filename)
@@ -343,7 +347,11 @@
{
}
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+ Goffset getPos()
+#else
int getPos()
+#endif
{
return this->pos;
}
=== modified file 'filter/pdftoijs.cxx'
--- filter/pdftoijs.cxx 2012-09-20 22:53:10 +0000
+++ filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000
@@ -70,8 +70,13 @@
}
#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+void CDECL myErrorFun(void *data, ErrorCategory category,
+ Goffset pos, char *msg)
+#else
void CDECL myErrorFun(void *data, ErrorCategory category,
int pos, char *msg)
+#endif
{
if (pos >= 0) {
fprintf(stderr, "ERROR (%d): ", pos);
@@ -297,19 +302,15 @@
if (argc == 6) {
/* stdin */
int fd;
- Object obj;
- BaseStream *str;
- FILE *fp;
+ char name[BUFSIZ];
char buf[BUFSIZ];
int n;
- fd = cupsTempFd(buf,sizeof(buf));
+ fd = cupsTempFd(name,sizeof(name));
if (fd < 0) {
pdfError(-1,"Can't create temporary file");
exit(1);
}
- /* remove name */
- unlink(buf);
/* copy stdin to the tmp file */
while ((n = read(0,buf,BUFSIZ)) > 0) {
@@ -319,23 +320,10 @@
exit(1);
}
}
- if (lseek(fd,0,SEEK_SET) < 0) {
- pdfError(-1,"Can't rewind temporary file");
- close(fd);
- exit(1);
- }
-
- if ((fp = fdopen(fd,"rb")) == 0) {
- pdfError(-1,"Can't fdopen temporary file");
- close(fd);
- exit(1);
- }
-
- obj.initNull();
-// parsePDFTOPDFComment(fp); // TODO?
- rewind(fp);
- str = new FileStream(fp,0,gFalse,0,&obj);
- doc = new PDFDoc(str);
+ close(fd);
+ doc = new PDFDoc(new GooString(name));
+ /* remove name */
+ unlink(name);
} else {
GooString *fileName = new GooString(argv[6]);
/* argc == 7 filenmae is specified */
=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
--- filter/pdftoopvp/pdftoopvp.cxx 2012-07-20 08:32:55 +0000
+++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000
@@ -112,8 +112,13 @@
#define MAX_OPVP_OPTIONS 20
#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+void CDECL myErrorFun(void *data, ErrorCategory category,
+ Goffset pos, char *msg)
+#else
void CDECL myErrorFun(void *data, ErrorCategory category,
int pos, char *msg)
+#endif
{
if (pos >= 0) {
fprintf(stderr, "ERROR (%d): ", pos);
@@ -619,9 +624,6 @@
char *s;
GooString name;
int fd;
- Object obj;
- BaseStream *str;
- FILE *fp;
char buf[4096];
int n;
@@ -633,8 +635,6 @@
}
name.append("/XXXXXX");
fd = mkstemp(name.getCString());
- /* remove name */
- unlink(name.getCString());
if (fd < 0) {
opvpError(-1,"Can't create temporary file");
exitCode = 2;
@@ -675,23 +675,10 @@
goto err0;
}
}
- if (lseek(fd,0,SEEK_SET) < 0) {
- opvpError(-1,"Can't rewind temporary file");
- close(fd);
- exitCode = 2;
- goto err0;
- }
-
- if ((fp = fdopen(fd,"rb")) == 0) {
- opvpError(-1,"Can't fdopen temporary file");
- close(fd);
- exitCode = 2;
- goto err0;
- }
-
- obj.initNull();
- str = new FileStream(fp,0,gFalse,0,&obj);
- doc = new PDFDoc(str);
+ close(fd);
+ doc = new PDFDoc(&name);
+ /* remove name */
+ unlink(name.getCString());
} else {
/* no jcl check */
doc = new PDFDoc(fileName.copy());
=== modified file 'filter/pdftoraster.cxx'
--- filter/pdftoraster.cxx 2013-07-30 17:00:43 +0000
+++ filter/pdftoraster.cxx 2013-08-01 15:48:06 +0000
@@ -186,8 +186,13 @@
}
#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+void CDECL myErrorFun(void *data, ErrorCategory category,
+ Goffset pos, char *msg)
+#else
void CDECL myErrorFun(void *data, ErrorCategory category,
int pos, char *msg)
+#endif
{
if (pos >= 0) {
fprintf(stderr, "ERROR (%d): ", pos);
@@ -1776,19 +1781,15 @@
if (argc == 6) {
/* stdin */
int fd;
- Object obj;
- BaseStream *str;
- FILE *fp;
+ char name[BUFSIZ];
char buf[BUFSIZ];
int n;
- fd = cupsTempFd(buf,sizeof(buf));
+ fd = cupsTempFd(name,sizeof(name));
if (fd < 0) {
pdfError(-1,const_cast<char *>("Can't create temporary file"));
exit(1);
}
- /* remove name */
- unlink(buf);
/* copy stdin to the tmp file */
while ((n = read(0,buf,BUFSIZ)) > 0) {
@@ -1798,23 +1799,10 @@
exit(1);
}
}
- if (lseek(fd,0,SEEK_SET) < 0) {
- pdfError(-1,const_cast<char *>("Can't rewind temporary file"));
- close(fd);
- exit(1);
- }
-
- if ((fp = fdopen(fd,"rb")) == 0) {
- pdfError(-1,const_cast<char *>("Can't fdopen temporary file"));
- close(fd);
- exit(1);
- }
-
- obj.initNull();
- parsePDFTOPDFComment(fp);
- rewind(fp);
- str = new FileStream(fp,0,gFalse,0,&obj);
- doc = new PDFDoc(str);
+ close(fd);
+ doc = new PDFDoc(new GooString(name));
+ /* remove name */
+ unlink(name);
} else {
GooString *fileName = new GooString(argv[6]);
/* argc == 7 filenmae is specified */
=== modified file 'filter/pdftoijs.cxx'
--- filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000
+++ filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000
@@ -79,7 +79,11 @@
#endif
{
if (pos >= 0) {
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+ fprintf(stderr, "ERROR (%lld): ", pos);
+#else
fprintf(stderr, "ERROR (%d): ", pos);
+#endif
} else {
fprintf(stderr, "ERROR: ");
}
=== modified file 'filter/pdftoraster.cxx'
--- filter/pdftoraster.cxx 2013-08-02 11:13:38 +0000
+++ filter/pdftoraster.cxx 2013-08-02 13:52:04 +0000
@@ -199,7 +199,11 @@
#endif
{
if (pos >= 0) {
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+ fprintf(stderr, "ERROR (%lld): ", pos);
+#else
fprintf(stderr, "ERROR (%d): ", pos);
+#endif
} else {
fprintf(stderr, "ERROR: ");
}
=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
--- filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000
+++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000
@@ -121,7 +121,11 @@
#endif
{
if (pos >= 0) {
+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
+ fprintf(stderr, "ERROR (%lld): ", pos);
+#else
fprintf(stderr, "ERROR (%d): ", pos);
+#endif
} else {
fprintf(stderr, "ERROR: ");
}
|
