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
277
278
279
280
281
282
283
284
|
--- cdr/src/lib/CDRCollector.h
+++ cdr/src/lib/CDRCollector.h
@@ -103,7 +103,7 @@ public:
virtual void collectOutlId(unsigned id) = 0;
virtual void collectFild(unsigned id, unsigned short fillType, const CDRColor &color1, const CDRColor &color2, const CDRGradient &gradient, const CDRImageFill &imageFill) = 0;
virtual void collectOutl(unsigned id, unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth,
- double stretch, double angle, const CDRColor &color, const std::vector<unsigned short> &dashArray,
+ double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
unsigned startMarkerId, unsigned endMarkerId) = 0;
virtual void collectRotate(double angle, double cx, double cy) = 0;
virtual void collectFlags(unsigned flags, bool considerFlags) = 0;
--- cdr/src/lib/CDRContentCollector.h
+++ cdr/src/lib/CDRContentCollector.h
@@ -67,7 +67,7 @@ public:
void collectOutlId(unsigned id);
void collectFild(unsigned, unsigned short, const CDRColor &, const CDRColor &, const CDRGradient &, const CDRImageFill &) {}
void collectOutl(unsigned, unsigned short, unsigned short, unsigned short, double, double, double, const CDRColor &,
- const std::vector<unsigned short> &, unsigned, unsigned) {}
+ const std::vector<unsigned> &, unsigned, unsigned) {}
void collectRotate(double angle, double cx, double cy);
void collectFlags(unsigned flags, bool considerFlags);
void collectPageSize(double, double, double, double) {}
--- cdr/src/lib/CDRParser.cpp
+++ cdr/src/lib/CDRParser.cpp
@@ -1376,7 +1376,7 @@ void libcdr::CDRParser::readWaldoOutl(WPXInputStream *input)
input->seek(7, WPX_SEEK_CUR);
unsigned short numDash = readU8(input);
int fixPosition = input->tell();
- std::vector<unsigned short> dashArray;
+ std::vector<unsigned> dashArray;
for (unsigned short i = 0; i < numDash; ++i)
dashArray.push_back(readU8(input));
input->seek(fixPosition + 10, WPX_SEEK_SET);
@@ -1870,7 +1870,7 @@ void libcdr::CDRParser::readOutl(WPXInputStream *input, unsigned length)
input->seek(16, WPX_SEEK_CUR);
unsigned short numDash = readU16(input);
int fixPosition = input->tell();
- std::vector<unsigned short> dashArray;
+ std::vector<unsigned> dashArray;
for (unsigned short i = 0; i < numDash; ++i)
dashArray.push_back(readU16(input));
if (m_version < 600)
--- cdr/src/lib/CDRStylesCollector.cpp
+++ cdr/src/lib/CDRStylesCollector.cpp
@@ -56,7 +56,7 @@ void libcdr::CDRStylesCollector::collectFild(unsigned id, unsigned short fillTyp
}
void libcdr::CDRStylesCollector::collectOutl(unsigned id, unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth,
- double stretch, double angle, const CDRColor &color, const std::vector<unsigned short> &dashArray,
+ double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
unsigned startMarkerId, unsigned endMarkerId)
{
m_ps.m_lineStyles[id] = CDRLineStyle(lineType, capsType, joinType, lineWidth, stretch, angle, color, dashArray, startMarkerId, endMarkerId);
--- cdr/src/lib/CDRStylesCollector.h
+++ cdr/src/lib/CDRStylesCollector.h
@@ -68,7 +68,7 @@ public:
void collectOutlId(unsigned) {}
void collectFild(unsigned id, unsigned short fillType, const CDRColor &color1, const CDRColor &color2, const CDRGradient &gradient, const CDRImageFill &imageFill);
void collectOutl(unsigned id, unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth,
- double stretch, double angle, const CDRColor &color, const std::vector<unsigned short> &dashArray,
+ double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
unsigned startMarkerId, unsigned endMarkerId);
void collectRotate(double,double,double) {}
void collectFlags(unsigned, bool) {}
--- cdr/src/lib/CDRTypes.h
+++ cdr/src/lib/CDRTypes.h
@@ -136,7 +136,7 @@ struct CDRLineStyle
double stretch;
double angle;
CDRColor color;
- std::vector<unsigned short> dashArray;
+ std::vector<unsigned> dashArray;
unsigned startMarkerId;
unsigned endMarkerId;
CDRLineStyle()
@@ -144,7 +144,7 @@ struct CDRLineStyle
stretch(0.0), angle(0.0), color(), dashArray(),
startMarkerId(0), endMarkerId(0) {}
CDRLineStyle(unsigned short lt, unsigned short ct, unsigned short jt,
- double lw, double st, double a, const CDRColor &c, const std::vector<unsigned short> &da,
+ double lw, double st, double a, const CDRColor &c, const std::vector<unsigned> &da,
unsigned smi, unsigned emi)
: lineType(lt), capsType(ct), joinType(jt), lineWidth(lw),
stretch(st), angle(a), color(c), dashArray(da),
--- cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:45:36.436443100 +0200
+++ cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:46:42.153510700 +0200
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Debug\bin\cdr2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Release\bin\cdr2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
--- cdr/build/win32/cdr2raw.vcxproj 2012-10-06 06:45:36.436443100 +0200
+++ cdr/build/win32/cdr2raw.vcxproj 2012-10-06 06:46:42.153510700 +0200
@@ -68,7 +68,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cdr2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -109,7 +109,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cdr2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- cdr/build/win32/cdr2xhtml.vcproj 2012-10-06 06:45:36.436443100 +0200
+++ cdr/build/win32/cdr2xhtml.vcproj 2012-10-06 06:46:42.169135300 +0200
@@ -67,7 +67,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Release\bin\cdr2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -156,7 +156,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Debug\bin\cdr2xhtml.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
--- cdr/build/win32/cdr2xhtml.vcxproj 2012-10-06 06:45:36.452067700 +0200
+++ cdr/build/win32/cdr2xhtml.vcxproj 2012-10-06 06:46:42.169135300 +0200
@@ -66,7 +66,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cdr2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -108,7 +108,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cdr2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- cdr/build/win32/cmx2raw.vcproj 2012-10-06 06:45:36.452067700 +0200
+++ cdr/build/win32/cmx2raw.vcproj 2012-10-06 06:46:42.169135300 +0200
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Debug\bin\cmx2raw.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Release\bin\cmx2raw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
--- cdr/build/win32/cmx2raw.vcxproj 2012-10-06 06:45:36.452067700 +0200
+++ cdr/build/win32/cmx2raw.vcxproj 2012-10-06 06:46:42.184759900 +0200
@@ -68,7 +68,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cmx2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -109,7 +109,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cmx2raw.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- cdr/build/win32/cmx2xhtml.vcproj 2012-10-06 06:45:36.452067700 +0200
+++ cdr/build/win32/cmx2xhtml.vcproj 2012-10-06 06:46:42.184759900 +0200
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Debug\bin\cmx2xhtml.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
OutputFile="Release\bin\cmx2xhtml.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
--- cdr/build/win32/cmx2xhtml.vcxproj 2012-10-06 06:45:36.467692300 +0200
+++ cdr/build/win32/cmx2xhtml.vcxproj 2012-10-06 06:46:42.184759900 +0200
@@ -68,7 +68,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Debug\bin\cmx2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -109,7 +109,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>Release\bin\cmx2xhtml.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- cdr/build/win32/libcdr.vcproj 2012-10-06 06:45:36.483316900 +0200
+++ cdr/build/win32/libcdr.vcproj 2012-10-06 06:46:42.216009100 +0200
@@ -67,7 +67,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="Debug\lib\libcdr-0.2.lib"
+ OutputFile="Debug\lib\libcdr-0.0.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="Release\lib\libcdr-0.2.lib"
+ OutputFile="Release\lib\libcdr-0.0.lib"
SuppressStartupBanner="true"
/>
<Tool
--- cdr/build/win32/libcdr.vcxproj 2012-10-06 06:45:36.483316900 +0200
+++ cdr/build/win32/libcdr.vcxproj 2012-10-06 06:46:42.231633700 +0200
@@ -61,7 +61,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>Debug\lib\libcdr-0.2.lib</OutputFile>
+ <OutputFile>Debug\lib\libcdr-0.0.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
@@ -91,7 +91,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>Release\lib\libcdr-0.2.lib</OutputFile>
+ <OutputFile>Release\lib\libcdr-0.0.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
|
