blob: 2d590b3f56d1f71a239a0731c8762adbab7046cc (
plain)
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
|
diff -Nur scribus-1.3.6.orig/scribus/pdflib_core.cpp scribus-1.3.6/scribus/pdflib_core.cpp
--- scribus-1.3.6.orig/scribus/pdflib_core.cpp 2010-03-16 14:14:03.000000000 -0700
+++ scribus-1.3.6/scribus/pdflib_core.cpp 2010-04-30 15:09:29.297220587 -0700
@@ -6364,7 +6364,9 @@
}
*/
char * mbuffer = NULL;
-#if defined(pdf_long)
+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
+ PoDoFo::pdf_long mlen = 0;
+#elif defined(pdf_long)
pdf_long mlen = 0;
#else
long mlen = 0;
@@ -6631,7 +6633,9 @@
if (obj->HasStream())
{
char * mbuffer = NULL;
-#if defined(pdf_long)
+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
+ PoDoFo::pdf_long mlen = 0;
+#elif defined(pdf_long)
pdf_long mlen = 0;
#else
long mlen = 0;
diff -Nur scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp
--- scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp 2010-02-17 14:08:03.000000000 -0800
+++ scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp 2010-04-30 15:11:14.985832229 -0700
@@ -413,7 +413,9 @@
data = priv->GetIndirectKey(PoDoFo::PdfName(Key.toUtf8().data()));
PoDoFo::PdfStream const *stream = data->GetStream();
char *Buffer;
-#if defined(pdf_long)
+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
+ PoDoFo::pdf_long bLen = 0;
+#elif defined(pdf_long)
pdf_long bLen = 0;
#else
long bLen = 0;
@@ -432,7 +434,9 @@
break;
PoDoFo::PdfStream const *stream = data->GetStream();
char *Buffer;
-#if defined(pdf_long)
+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
+ PoDoFo::pdf_long bLen = 0;
+#elif defined(pdf_long)
pdf_long bLen = 0;
#else
long bLen = 0;
|
GitWeb
