Mercurial > mxe-octave

annotate src/poppler-1-win32.patch @ 2609:dcc2a7e93901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package poppler
author Mark Brand <mabrand@mabrand.nl>
date Thu, 14 Jun 2012 17:25:04 +0200
parents 59d3f2a7aada
children 9aa687683a32
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
1 This file is part of MXE.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
2 See index.html for further information.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
3
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
4 From 5aede813b0cfdf672241f925bc34b766cf567a0f Mon Sep 17 00:00:00 2001
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
5 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
6 Date: Sat, 21 Apr 2012 09:34:46 +0200
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
7 Subject: [PATCH 1/3] Only check for Type1 fonts in custom directory if path
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
8 is non-NULL
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
9
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
10 Otherwise, programs using poppler may crash
2426
59d3f2a7aada Include upstream URLs in commit messages of poppler patch
Stefan Löffler <st.loeffler@gmail.com>
parents: 2425
diff changeset
11 Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
12 ---
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
13 poppler/GlobalParamsWin.cc | 2 +-
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
14 1 file changed, 1 insertion(+), 1 deletion(-)
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
15
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
16 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
17 index b77ac4f..f660224 100644
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
18 --- a/poppler/GlobalParamsWin.cc
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
19 +++ b/poppler/GlobalParamsWin.cc
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
20 @@ -423,7 +423,7 @@ void GlobalParams::setupBaseFonts(char * dir)
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
21 if (fontFiles->lookup(fontName))
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
22 continue;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
23
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
24 - if (dir) {
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
25 + if (dir && displayFontTab[i].t1FileName) {
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
26 GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName);
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
27 if (FileExists(fontPath->getCString()) ||
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
28 FileExists(replaceSuffix(fontPath, ".pfb", ".pfa")->getCString())) {
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
29 --
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
30 1.7.10.4
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
31
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
32
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
33 From 944b910b4ede55c0b1dca5169960068fb9d1d0a4 Mon Sep 17 00:00:00 2001
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
34 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
35 Date: Sat, 21 Apr 2012 13:19:54 +0200
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
36 Subject: [PATCH 2/3] Don't use dllimport/dllexport
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
37
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
38 Otherwise static linking fails
2426
59d3f2a7aada Include upstream URLs in commit messages of poppler patch
Stefan Löffler <st.loeffler@gmail.com>
parents: 2425
diff changeset
39 MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!)
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
40 ---
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
41 cpp/poppler-global.h | 5 -----
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
42 poppler/XpdfPluginAPI.h | 18 ------------------
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
43 qt4/src/poppler-export.h | 5 -----
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
44 3 files changed, 28 deletions(-)
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
45
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
46 diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
47 index 5650182..6c3e01b 100644
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
48 --- a/cpp/poppler-global.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
49 +++ b/cpp/poppler-global.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
50 @@ -20,13 +20,8 @@
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
51 #ifndef POPPLER_GLOBAL_H
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
52 #define POPPLER_GLOBAL_H
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
53
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
54 -#if defined(_WIN32)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
55 -# define LIB_EXPORT __declspec(dllexport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
56 -# define LIB_IMPORT __declspec(dllimport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
57 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
58 # define LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
59 # define LIB_IMPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
60 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
61
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
62 #if defined(poppler_cpp_EXPORTS)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
63 # define POPPLER_CPP_EXPORT LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
64 diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
65 index b0165c0..5a10595 100644
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
66 --- a/poppler/XpdfPluginAPI.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
67 +++ b/poppler/XpdfPluginAPI.h
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
68 @@ -42,19 +42,11 @@ extern "C" {
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
69 */
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
70 #define xpdfPluginAPIVersion 1
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
71
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
72 -#ifdef _WIN32
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
73 -# ifdef __cplusplus
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
74 -# define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
75 -# else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
76 -# define PLUGINFUNC(retType) extern __declspec(dllexport) retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
77 -# endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
78 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
79 # ifdef __cplusplus
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
80 # define PLUGINFUNC(retType) extern "C" retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
81 # else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
82 # define PLUGINFUNC(retType) extern retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
83 # endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
84 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
85
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
86 /*------------------------------------------------------------------------
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
87 * Plugin setup/cleanup
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
88 @@ -281,22 +273,12 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler);
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
89
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
90 } XpdfPluginVecTable;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
91
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
92 -#ifdef _WIN32
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
93 -
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
94 -extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
95 -
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
96 -#define xpdfPluginSetup \
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
97 - extern __declspec(dllexport) \
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
98 - XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
99 -
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
100 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
101
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
102 extern XpdfPluginVecTable xpdfPluginVecTable;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
103
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
104 #define xpdfPluginSetup \
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
105 XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
106
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
107 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
108
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
109 #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
110 #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
111 diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
112 index 7661fe9..ebb1e18 100644
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
113 --- a/qt4/src/poppler-export.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
114 +++ b/qt4/src/poppler-export.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
115 @@ -2,13 +2,8 @@
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
116 * This file is used to set the poppler_qt4_EXPORT macros right.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
117 * This is needed for setting the visibility on windows, it will have no effect on other platforms.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
118 */
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
119 -#if defined(_WIN32)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
120 -# define LIB_EXPORT __declspec(dllexport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
121 -# define LIB_IMPORT __declspec(dllimport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
122 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
123 # define LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
124 # define LIB_IMPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
125 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
126
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
127 #ifdef poppler_qt4_EXPORTS
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
128 # define POPPLER_QT4_EXPORT LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
129 --
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
130 1.7.10.4
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
131
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
132
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
133 From 66acb0dedae6564d1975d652abca10b18ab4eb46 Mon Sep 17 00:00:00 2001
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
134 From: Mark Brand <mabrand@mabrand.nl>
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
135 Date: Thu, 14 Jun 2012 17:08:58 +0200
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
136 Subject: [PATCH 3/3] fix typo
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
137
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
138 taken from
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
139 https://bugs.freedesktop.org/show_bug.cgi?id=51079
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
140 ---
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
141 poppler/GlobalParamsWin.cc | 2 +-
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
142 1 file changed, 1 insertion(+), 1 deletion(-)
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
143
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
144 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
145 index f660224..0e691eb 100644
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
146 --- a/poppler/GlobalParamsWin.cc
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
147 +++ b/poppler/GlobalParamsWin.cc
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
148 @@ -573,7 +573,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
149 *type = fi->type;
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
150 *fontNum = fi->fontNum;
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
151 if (substituteFontName)
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
152 - substituteFontName.Set(fi->substituteName->getCString());
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
153 + substituteFontName->Set(fi->substituteName->getCString());
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
154 } else {
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
155 GooString *substFontName = new GooString(findSubstituteName(font, fontFiles,
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
156 substFiles,
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
157 --
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
158 1.7.10.4
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
159