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
|
--- build/win32/libwpd.vcproj
+++ build/win32/libwpd.vcproj
@@ -42,7 +42,7 @@
Optimization="0"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
RuntimeTypeInfo="true"
PrecompiledHeaderFile=".\Debug/libwpd.pch"
AssemblerListingLocation=".\Debug/"
@@ -115,7 +115,7 @@
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
PrecompiledHeaderFile=".\Release/libwpd.pch"
--- build/win32/libwpdstream.vcproj
+++ build/win32/libwpdstream.vcproj
@@ -43,7 +43,7 @@
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/libwpdstream.pch"
AssemblerListingLocation=".\Release/"
@@ -114,7 +114,7 @@
Optimization="0"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
PrecompiledHeaderFile=".\Debug/libwpdstream.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
diff --git a/build/win32/wpd2html.vcproj b/build/win32/wpd2html.vcproj
index a41eef2..bdc44cc 100644
--- build/win32/wpd2html.vcproj
+++ build/win32/wpd2html.vcproj
@@ -46,7 +46,7 @@
Optimization="4"
AdditionalIncludeDirectories="..\..\src\lib"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
PrecompiledHeaderFile=".\Release/wpd2html.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
@@ -134,7 +134,7 @@
AdditionalIncludeDirectories="..\..\src\lib"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
PrecompiledHeaderFile=".\Debug/wpd2html.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
diff --git a/build/win32/wpd2raw.vcproj b/build/win32/wpd2raw.vcproj
index a41318a..9a057e5 100644
--- build/win32/wpd2raw.vcproj
+++ build/win32/wpd2raw.vcproj
@@ -47,7 +47,7 @@
Optimization="4"
AdditionalIncludeDirectories="..\..\src\lib"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
PrecompiledHeaderFile=".\Release/wpd2raw.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
@@ -136,7 +136,7 @@
AdditionalIncludeDirectories="..\..\src\lib"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
PrecompiledHeaderFile=".\Debug/wpd2raw.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
diff --git a/build/win32/wpd2text.vcproj b/build/win32/wpd2text.vcproj
index 8c02ed1..f4ae836 100644
--- build/win32/wpd2text.vcproj
+++ build/win32/wpd2text.vcproj
@@ -47,7 +47,7 @@
AdditionalIncludeDirectories="..\..\src\lib"
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
PrecompiledHeaderFile=".\Debug/wpd2text.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
@@ -136,7 +136,7 @@
Optimization="4"
AdditionalIncludeDirectories="..\..\src\lib"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
PrecompiledHeaderFile=".\Release/wpd2text.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
--- src/lib/WP6BoxGroup.cpp
+++ src/lib/WP6BoxGroup.cpp
@@ -304,8 +304,8 @@ void WP6BoxGroup::parse(WP6Listener *listener)
if (!m_nativeHeight && gbsPacket)
m_nativeHeight = gbsPacket->getNativeHeight();
- std::vector<uint16_t> graphicsDataIds;
- std::vector<uint16_t>::iterator gdiIter;
+ std::vector<unsigned> graphicsDataIds;
+ std::vector<unsigned>::iterator gdiIter;
WP6SubDocument *subDocument = 0;
// Get the box content
@@ -389,7 +389,7 @@ void WP6BoxGroup::parse(WP6Listener *listener)
if (tmpContentType == 0x03)
{
for (gdiIter = graphicsDataIds.begin(); gdiIter != graphicsDataIds.end(); gdiIter++)
- listener->insertGraphicsData((*gdiIter));
+ listener->insertGraphicsData(((uint16_t)*gdiIter));
}
if ((tmpContentType == 0x01) && (subDocument))
{
--- src/lib/WP6BoxGroup.h
+++ src/lib/WP6BoxGroup.h
@@ -28,7 +28,6 @@
#define WP6BOXGROUP_H
#include "WP6VariableLengthGroup.h"
-#include <vector>
#include "libwpd_internal.h"
class WPXInputStream;
--- src/lib/WP6GraphicsFilenamePacket.cpp
+++ src/lib/WP6GraphicsFilenamePacket.cpp
@@ -50,4 +50,9 @@ void WP6GraphicsFilenamePacket::_readContents(WPXInputStream *input, WPXEncrypti
m_childIds.push_back(readU16(input, encryption));
}
+const std::vector<unsigned> WP6GraphicsFilenamePacket::getChildIds() const
+{
+ return m_childIds;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- src/lib/WP6GraphicsFilenamePacket.h
+++ src/lib/WP6GraphicsFilenamePacket.h
@@ -39,16 +39,12 @@ public:
~WP6GraphicsFilenamePacket();
void _readContents(WPXInputStream *input, WPXEncryption *encryption);
void parse(WP6Listener * /*listener */) const {}
- const std::vector<uint16_t> &getChildIds() const
- {
- return m_childIds;
- }
-
+ const std::vector<unsigned> getChildIds() const;
private:
WP6GraphicsFilenamePacket(const WP6GraphicsFilenamePacket &);
WP6GraphicsFilenamePacket &operator=(const WP6GraphicsFilenamePacket &);
- std::vector<uint16_t> m_childIds;
+ std::vector<unsigned> m_childIds;
const uint8_t m_flags;
};
|
