wok-next view dcmtk/stuff/patches/minor-fixes.patch @ rev 20636
Fix "can't execute '/usr/bin/update-mime-database': No such file or directory"
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Apr 27 15:12:17 2018 +0300 (2018-04-27) |
parents | |
children |
line source
1 From dbadc0d8f3760f65504406c8b2cb8633f868a258 Mon Sep 17 00:00:00 2001
2 From: Joerg Riesmeier <dicom@offis.de>
3 Date: Thu, 17 Nov 2011 16:13:14 +0000
4 Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang
5 compiler) quiet.
7 ---
8 CHANGES.361 | 24 ++++++++++++++++++++++++
9 dcmimage/include/dcmtk/dcmimage/diargpxt.h | 25 ++++++++++++++-----------
10 dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 11 +++++++----
11 dcmimage/include/dcmtk/dcmimage/dicocpt.h | 11 +++++++----
12 dcmimage/include/dcmtk/dcmimage/dicoflt.h | 17 ++++++++++-------
13 dcmimage/include/dcmtk/dcmimage/dicorot.h | 17 ++++++++++-------
14 dcmimage/include/dcmtk/dcmimage/dicosct.h | 13 ++++++++-----
15 dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 11 +++++++----
16 dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 11 +++++++----
17 dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 15 +++++++++------
18 dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 15 +++++++++------
19 dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 11 +++++++----
20 dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 11 +++++++----
21 dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 11 +++++++----
22 dcmimgle/include/dcmtk/dcmimgle/dimoflt.h | 15 +++++++++------
23 dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 13 ++++++++-----
24 dcmimgle/include/dcmtk/dcmimgle/dimorot.h | 15 +++++++++------
25 dcmimgle/include/dcmtk/dcmimgle/dimosct.h | 11 +++++++----
26 dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 11 +++++++----
27 dcmimgle/include/dcmtk/dcmimgle/discalet.h | 19 +++++++++++--------
28 ofstd/include/dcmtk/ofstd/ofoset.h | 13 ++++++++-----
29 ofstd/libsrc/ofchrenc.cc | 13 +++++++++++--
30 22 files changed, 203 insertions(+), 110 deletions(-)
32 diff --git a/CHANGES.361 b/CHANGES.361
33 index 193378a0c..2d756bddd 100644
34 --- a/CHANGES.361
35 +++ b/CHANGES.361
36 @@ -3,6 +3,30 @@ Changes between releases are documented here.
38 **** Changes from 2011.11.17 (riesmeier)
40 +- Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
41 + Thanks to Daniele Giunchi <d.giunchi@scsitaly.com> for the suggested patch.
42 + Affects: dcmimage/include/dcmtk/dcmimage/diargpxt.h
43 + dcmimage/include/dcmtk/dcmimage/dicmypxt.h
44 + dcmimage/include/dcmtk/dcmimage/dicocpt.h
45 + dcmimage/include/dcmtk/dcmimage/dicoflt.h
46 + dcmimage/include/dcmtk/dcmimage/dicorot.h
47 + dcmimage/include/dcmtk/dcmimage/dicosct.h
48 + dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
49 + dcmimage/include/dcmtk/dcmimage/dipalpxt.h
50 + dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
51 + dcmimage/include/dcmtk/dcmimage/diybrpxt.h
52 + dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
53 + dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
54 + dcmimgle/include/dcmtk/dcmimgle/diflipt.h
55 + dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
56 + dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
57 + dcmimgle/include/dcmtk/dcmimgle/dimorot.h
58 + dcmimgle/include/dcmtk/dcmimgle/dimosct.h
59 + dcmimgle/include/dcmtk/dcmimgle/dirotat.h
60 + dcmimgle/include/dcmtk/dcmimgle/discalet.h
61 + ofstd/include/dcmtk/ofstd/ofoset.h
62 + ofstd/libsrc/ofchrenc.cc
63 +
64 - Slightly modified code in order to avoid the use of the OFCondition default
65 constructor.
66 Affects: dcmdata/libsrc/dcdicdir.cc
67 diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
68 index 7e3894d53..1ed9291e8 100644
69 --- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h
70 +++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
71 @@ -1,6 +1,6 @@
72 /*
73 *
74 - * Copyright (C) 1996-2010, OFFIS e.V.
75 + * Copyright (C) 1996-2011, OFFIS e.V.
76 * All rights reserved. See COPYRIGHT file for details.
77 *
78 * This software and supporting documentation were developed by
79 @@ -18,8 +18,8 @@
80 * Purpose: DicomARGBPixelTemplate (Header) - UNTESTED !!!
81 *
82 * Last Update: $Author: joergr $
83 - * Update Date: $Date: 2010-10-14 13:16:29 $
84 - * CVS/RCS Revision: $Revision: 1.21 $
85 + * Update Date: $Date: 2011-11-17 16:13:14 $
86 + * CVS/RCS Revision: $Revision: 1.22 $
87 * Status: $State: Exp $
88 *
89 * CVS/RCS Log at end of file
90 @@ -91,7 +91,7 @@ class DiARGBPixelTemplate
91 const unsigned long planeSize,
92 const int bits)
93 { // not very much optimized, but no one really uses ARGB !!
94 - if (Init(pixel))
95 + if (this->Init(pixel))
96 {
97 register T2 value;
98 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
99 @@ -103,9 +103,9 @@ class DiARGBPixelTemplate
100 /*
101 register const T1 *a = pixel; // points to alpha plane
102 const T1 *rgb[3];
103 - rgb[0] = a + this->InputCount; // points to red plane
104 - rgb[1] = rgb[0] + this->InputCount; // points to green plane
105 - rgb[2] = rgb[1] + this->InputCount; // points to blue plane
106 + rgb[0] = a + this->InputCount; // points to red plane
107 + rgb[1] = rgb[0] + this->InputCount; // points to green plane
108 + rgb[2] = rgb[1] + this->InputCount; // points to blue plane
109 for (i = 0; i < count; ++i)
110 {
111 value = OFstatic_cast(T2, *(a++)); // get alpha value
112 @@ -141,10 +141,10 @@ class DiARGBPixelTemplate
113 /* convert a single frame */
114 for (l = planeSize; (l != 0) && (i < count); --l, ++i)
115 {
116 - value = OFstatic_cast(T2, *(a++)); // get alpha value
117 + value = OFstatic_cast(T2, *(a++)); // get alpha value
118 if (value > 0)
119 {
120 - for (int j = 0; j < 3; ++j) // set palette color
121 + for (int j = 0; j < 3; ++j) // set palette color
122 {
123 if (value <= palette[j]->getFirstEntry(value))
124 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getFirstValue());
125 @@ -152,12 +152,12 @@ class DiARGBPixelTemplate
126 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getLastValue());
127 else
128 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getValue(value));
129 - ++rgb[j]; // skip RGB values
130 + ++rgb[j]; // skip RGB values
131 }
132 }
133 else
134 {
135 - for (int j = 0; j < 3; ++j) // copy RGB values
136 + for (int j = 0; j < 3; ++j) // copy RGB values
137 this->Data[j][i] = OFstatic_cast(T3, removeSign(*(rgb[j]++), offset));
138 }
139 }
140 @@ -204,6 +204,9 @@ class DiARGBPixelTemplate
141 *
142 * CVS/RCS Log:
143 * $Log: diargpxt.h,v $
144 + * Revision 1.22 2011-11-17 16:13:14 joergr
145 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
146 + *
147 * Revision 1.21 2010-10-14 13:16:29 joergr
148 * Updated copyright header. Added reference to COPYRIGHT file.
149 *
150 diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
151 index 5357780e9..bf1161ec2 100644
152 --- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
153 +++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
154 @@ -1,6 +1,6 @@
155 /*
156 *
157 - * Copyright (C) 1996-2010, OFFIS e.V.
158 + * Copyright (C) 1996-2011, OFFIS e.V.
159 * All rights reserved. See COPYRIGHT file for details.
160 *
161 * This software and supporting documentation were developed by
162 @@ -18,8 +18,8 @@
163 * Purpose: DicomCMYKPixelTemplate (Header)
164 *
165 * Last Update: $Author: joergr $
166 - * Update Date: $Date: 2010-10-14 13:16:29 $
167 - * CVS/RCS Revision: $Revision: 1.20 $
168 + * Update Date: $Date: 2011-11-17 16:13:14 $
169 + * CVS/RCS Revision: $Revision: 1.21 $
170 * Status: $State: Exp $
171 *
172 * CVS/RCS Log at end of file
173 @@ -87,7 +87,7 @@ class DiCMYKPixelTemplate
174 const unsigned long planeSize,
175 const int bits)
176 {
177 - if (Init(pixel))
178 + if (this->Init(pixel))
179 {
180 // use the number of input pixels derived from the length of the 'PixelData'
181 // attribute), but not more than the size of the intermediate buffer
182 @@ -157,6 +157,9 @@ class DiCMYKPixelTemplate
183 *
184 * CVS/RCS Log:
185 * $Log: dicmypxt.h,v $
186 + * Revision 1.21 2011-11-17 16:13:14 joergr
187 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
188 + *
189 * Revision 1.20 2010-10-14 13:16:29 joergr
190 * Updated copyright header. Added reference to COPYRIGHT file.
191 *
192 diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
193 index 0c06de70f..3f03b6bd9 100644
194 --- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h
195 +++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
196 @@ -1,6 +1,6 @@
197 /*
198 *
199 - * Copyright (C) 1998-2010, OFFIS e.V.
200 + * Copyright (C) 1998-2011, OFFIS e.V.
201 * All rights reserved. See COPYRIGHT file for details.
202 *
203 * This software and supporting documentation were developed by
204 @@ -18,8 +18,8 @@
205 * Purpose: DicomColorCopyTemplate (Header)
206 *
207 * Last Update: $Author: joergr $
208 - * Update Date: $Date: 2010-10-14 13:16:29 $
209 - * CVS/RCS Revision: $Revision: 1.12 $
210 + * Update Date: $Date: 2011-11-17 16:13:14 $
211 + * CVS/RCS Revision: $Revision: 1.13 $
212 * Status: $State: Exp $
213 *
214 * CVS/RCS Log at end of file
215 @@ -86,7 +86,7 @@ class DiColorCopyTemplate
216 inline void copy(const T *pixel[3],
217 const unsigned long offset)
218 {
219 - if (Init(pixel))
220 + if (this->Init(pixel))
221 {
222 for (int j = 0; j < 3; j++)
223 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
224 @@ -102,6 +102,9 @@ class DiColorCopyTemplate
225 *
226 * CVS/RCS Log:
227 * $Log: dicocpt.h,v $
228 + * Revision 1.13 2011-11-17 16:13:14 joergr
229 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
230 + *
231 * Revision 1.12 2010-10-14 13:16:29 joergr
232 * Updated copyright header. Added reference to COPYRIGHT file.
233 *
234 diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
235 index a5bed8155..bc809ab6b 100644
236 --- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h
237 +++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
238 @@ -1,6 +1,6 @@
239 /*
240 *
241 - * Copyright (C) 1998-2010, OFFIS e.V.
242 + * Copyright (C) 1998-2011, OFFIS e.V.
243 * All rights reserved. See COPYRIGHT file for details.
244 *
245 * This software and supporting documentation were developed by
246 @@ -18,8 +18,8 @@
247 * Purpose: DicomColorFlipTemplate (Header)
248 *
249 * Last Update: $Author: joergr $
250 - * Update Date: $Date: 2010-10-14 13:16:29 $
251 - * CVS/RCS Revision: $Revision: 1.15 $
252 + * Update Date: $Date: 2011-11-17 16:13:14 $
253 + * CVS/RCS Revision: $Revision: 1.16 $
254 * Status: $State: Exp $
255 *
256 * CVS/RCS Log at end of file
257 @@ -98,14 +98,14 @@ class DiColorFlipTemplate
258 const int horz,
259 const int vert)
260 {
261 - if (Init(pixel))
262 + if (this->Init(pixel))
263 {
264 if (horz && vert)
265 - flipHorzVert(pixel, this->Data);
266 + this->flipHorzVert(pixel, this->Data);
267 else if (horz)
268 - flipHorz(pixel, this->Data);
269 + this->flipHorz(pixel, this->Data);
270 else if (vert)
271 - flipVert(pixel, this->Data);
272 + this->flipVert(pixel, this->Data);
273 }
274 }
275 };
276 @@ -118,6 +118,9 @@ class DiColorFlipTemplate
277 *
278 * CVS/RCS Log:
279 * $Log: dicoflt.h,v $
280 + * Revision 1.16 2011-11-17 16:13:14 joergr
281 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
282 + *
283 * Revision 1.15 2010-10-14 13:16:29 joergr
284 * Updated copyright header. Added reference to COPYRIGHT file.
285 *
286 diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h
287 index 2bcd71e41..c8afd7003 100644
288 --- a/dcmimage/include/dcmtk/dcmimage/dicorot.h
289 +++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h
290 @@ -1,6 +1,6 @@
291 /*
292 *
293 - * Copyright (C) 1998-2010, OFFIS e.V.
294 + * Copyright (C) 1998-2011, OFFIS e.V.
295 * All rights reserved. See COPYRIGHT file for details.
296 *
297 * This software and supporting documentation were developed by
298 @@ -18,8 +18,8 @@
299 * Purpose: DicomColorRotateTemplate (Header)
300 *
301 * Last Update: $Author: joergr $
302 - * Update Date: $Date: 2010-10-14 13:16:29 $
303 - * CVS/RCS Revision: $Revision: 1.15 $
304 + * Update Date: $Date: 2011-11-17 16:13:14 $
305 + * CVS/RCS Revision: $Revision: 1.16 $
306 * Status: $State: Exp $
307 *
308 * CVS/RCS Log at end of file
309 @@ -98,14 +98,14 @@ class DiColorRotateTemplate
310 inline void rotate(const T *pixel[3],
311 const int degree)
312 {
313 - if (Init(pixel))
314 + if (this->Init(pixel))
315 {
316 if (degree == 90)
317 - rotateRight(pixel, this->Data);
318 + this->rotateRight(pixel, this->Data);
319 else if (degree == 180)
320 - rotateTopDown(pixel, this->Data);
321 + this->rotateTopDown(pixel, this->Data);
322 else if (degree == 270)
323 - rotateLeft(pixel, this->Data);
324 + this->rotateLeft(pixel, this->Data);
325 }
326 }
327 };
328 @@ -118,6 +118,9 @@ class DiColorRotateTemplate
329 *
330 * CVS/RCS Log:
331 * $Log: dicorot.h,v $
332 + * Revision 1.16 2011-11-17 16:13:14 joergr
333 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
334 + *
335 * Revision 1.15 2010-10-14 13:16:29 joergr
336 * Updated copyright header. Added reference to COPYRIGHT file.
337 *
338 diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h
339 index 006a82997..3bccc452e 100644
340 --- a/dcmimage/include/dcmtk/dcmimage/dicosct.h
341 +++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h
342 @@ -1,6 +1,6 @@
343 /*
344 *
345 - * Copyright (C) 1996-2010, OFFIS e.V.
346 + * Copyright (C) 1996-2011, OFFIS e.V.
347 * All rights reserved. See COPYRIGHT file for details.
348 *
349 * This software and supporting documentation were developed by
350 @@ -18,8 +18,8 @@
351 * Purpose: DicomColorScaleTemplate (Header)
352 *
353 * Last Update: $Author: joergr $
354 - * Update Date: $Date: 2010-10-14 13:16:29 $
355 - * CVS/RCS Revision: $Revision: 1.21 $
356 + * Update Date: $Date: 2011-11-17 16:13:14 $
357 + * CVS/RCS Revision: $Revision: 1.22 $
358 * Status: $State: Exp $
359 *
360 * CVS/RCS Log at end of file
361 @@ -107,8 +107,8 @@ class DiColorScaleTemplate
362 inline void scale(const T *pixel[3],
363 const int interpolate)
364 {
365 - if (Init(pixel))
366 - scaleData(pixel, this->Data, interpolate);
367 + if (this->Init(pixel))
368 + this->scaleData(pixel, this->Data, interpolate);
369 }
370 };
372 @@ -120,6 +120,9 @@ class DiColorScaleTemplate
373 *
374 * CVS/RCS Log:
375 * $Log: dicosct.h,v $
376 + * Revision 1.22 2011-11-17 16:13:14 joergr
377 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
378 + *
379 * Revision 1.21 2010-10-14 13:16:29 joergr
380 * Updated copyright header. Added reference to COPYRIGHT file.
381 *
382 diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
383 index 10d8b70ab..52580ec51 100644
384 --- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
385 +++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
386 @@ -1,6 +1,6 @@
387 /*
388 *
389 - * Copyright (C) 1996-2010, OFFIS e.V.
390 + * Copyright (C) 1996-2011, OFFIS e.V.
391 * All rights reserved. See COPYRIGHT file for details.
392 *
393 * This software and supporting documentation were developed by
394 @@ -18,8 +18,8 @@
395 * Purpose: DicomHSVPixelTemplate (Header)
396 *
397 * Last Update: $Author: joergr $
398 - * Update Date: $Date: 2010-10-14 13:16:29 $
399 - * CVS/RCS Revision: $Revision: 1.25 $
400 + * Update Date: $Date: 2011-11-17 16:13:14 $
401 + * CVS/RCS Revision: $Revision: 1.26 $
402 * Status: $State: Exp $
403 *
404 * CVS/RCS Log at end of file
405 @@ -87,7 +87,7 @@ class DiHSVPixelTemplate
406 const unsigned long planeSize,
407 const int bits)
408 {
409 - if (Init(pixel))
410 + if (this->Init(pixel))
411 {
412 register T2 *r = this->Data[0];
413 register T2 *g = this->Data[1];
414 @@ -221,6 +221,9 @@ class DiHSVPixelTemplate
415 *
416 * CVS/RCS Log:
417 * $Log: dihsvpxt.h,v $
418 + * Revision 1.26 2011-11-17 16:13:14 joergr
419 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
420 + *
421 * Revision 1.25 2010-10-14 13:16:29 joergr
422 * Updated copyright header. Added reference to COPYRIGHT file.
423 *
424 diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
425 index 2e5eef7a0..1ae235279 100644
426 --- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
427 +++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
428 @@ -1,6 +1,6 @@
429 /*
430 *
431 - * Copyright (C) 1996-2010, OFFIS e.V.
432 + * Copyright (C) 1996-2011, OFFIS e.V.
433 * All rights reserved. See COPYRIGHT file for details.
434 *
435 * This software and supporting documentation were developed by
436 @@ -18,8 +18,8 @@
437 * Purpose: DicomPalettePixelTemplate (Header)
438 *
439 * Last Update: $Author: joergr $
440 - * Update Date: $Date: 2010-10-14 13:16:29 $
441 - * CVS/RCS Revision: $Revision: 1.24 $
442 + * Update Date: $Date: 2011-11-17 16:13:14 $
443 + * CVS/RCS Revision: $Revision: 1.25 $
444 * Status: $State: Exp $
445 *
446 * CVS/RCS Log at end of file
447 @@ -92,7 +92,7 @@ class DiPalettePixelTemplate
448 void convert(const T1 *pixel,
449 DiLookupTable *palette[3])
450 { // can be optimized if necessary !
451 - if (Init(pixel))
452 + if (this->Init(pixel))
453 {
454 register const T1 *p = pixel;
455 register T2 value = 0;
456 @@ -126,6 +126,9 @@ class DiPalettePixelTemplate
457 *
458 * CVS/RCS Log:
459 * $Log: dipalpxt.h,v $
460 + * Revision 1.25 2011-11-17 16:13:14 joergr
461 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
462 + *
463 * Revision 1.24 2010-10-14 13:16:29 joergr
464 * Updated copyright header. Added reference to COPYRIGHT file.
465 *
466 diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
467 index 85f973d6b..d9cc7edb7 100644
468 --- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
469 +++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
470 @@ -1,6 +1,6 @@
471 /*
472 *
473 - * Copyright (C) 1996-2010, OFFIS e.V.
474 + * Copyright (C) 1996-2011, OFFIS e.V.
475 * All rights reserved. See COPYRIGHT file for details.
476 *
477 * This software and supporting documentation were developed by
478 @@ -18,8 +18,8 @@
479 * Purpose: DicomRGBPixelTemplate (Header)
480 *
481 * Last Update: $Author: joergr $
482 - * Update Date: $Date: 2010-10-14 13:16:30 $
483 - * CVS/RCS Revision: $Revision: 1.18 $
484 + * Update Date: $Date: 2011-11-17 16:13:14 $
485 + * CVS/RCS Revision: $Revision: 1.19 $
486 * Status: $State: Exp $
487 *
488 * CVS/RCS Log at end of file
489 @@ -87,7 +87,7 @@ class DiRGBPixelTemplate
490 const unsigned long planeSize,
491 const int bits)
492 {
493 - if (Init(pixel))
494 + if (this->Init(pixel))
495 {
496 // use the number of input pixels derived from the length of the 'PixelData'
497 // attribute), but not more than the size of the intermediate buffer
498 @@ -129,9 +129,9 @@ class DiRGBPixelTemplate
499 {
500 register int j;
501 register unsigned long i;
502 - for (i = 0; i < count; ++i) /* for all pixel ... */
503 + for (i = 0; i < count; ++i) /* for all pixel ... */
504 for (j = 0; j < 3; ++j)
505 - this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
506 + this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
507 }
508 }
509 }
510 @@ -145,6 +145,9 @@ class DiRGBPixelTemplate
511 *
512 * CVS/RCS Log:
513 * $Log: dirgbpxt.h,v $
514 + * Revision 1.19 2011-11-17 16:13:14 joergr
515 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
516 + *
517 * Revision 1.18 2010-10-14 13:16:30 joergr
518 * Updated copyright header. Added reference to COPYRIGHT file.
519 *
520 diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
521 index 6b523fbca..ecd2038a1 100644
522 --- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
523 +++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
524 @@ -1,6 +1,6 @@
525 /*
526 *
527 - * Copyright (C) 1998-2010, OFFIS e.V.
528 + * Copyright (C) 1998-2011, OFFIS e.V.
529 * All rights reserved. See COPYRIGHT file for details.
530 *
531 * This software and supporting documentation were developed by
532 @@ -18,8 +18,8 @@
533 * Purpose: DicomYBRPixelTemplate (Header)
534 *
535 * Last Update: $Author: joergr $
536 - * Update Date: $Date: 2010-10-14 13:16:30 $
537 - * CVS/RCS Revision: $Revision: 1.19 $
538 + * Update Date: $Date: 2011-11-17 16:13:14 $
539 + * CVS/RCS Revision: $Revision: 1.20 $
540 * Status: $State: Exp $
541 *
542 * CVS/RCS Log at end of file
543 @@ -91,7 +91,7 @@ class DiYBRPixelTemplate
544 const int bits,
545 const OFBool rgb)
546 {
547 - if (Init(pixel))
548 + if (this->Init(pixel))
549 {
550 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
551 // use the number of input pixels derived from the length of the 'PixelData'
552 @@ -266,9 +266,9 @@ class DiYBRPixelTemplate
553 {
554 register int j;
555 register unsigned long i;
556 - for (i = 0; i < count; ++i) /* for all pixel ... */
557 + for (i = 0; i < count; ++i) /* for all pixel ... */
558 for (j = 0; j < 3; ++j)
559 - this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
560 + this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
561 }
562 }
563 }
564 @@ -295,6 +295,9 @@ class DiYBRPixelTemplate
565 *
566 * CVS/RCS Log:
567 * $Log: diybrpxt.h,v $
568 + * Revision 1.20 2011-11-17 16:13:14 joergr
569 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
570 + *
571 * Revision 1.19 2010-10-14 13:16:30 joergr
572 * Updated copyright header. Added reference to COPYRIGHT file.
573 *
574 diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
575 index ed27796c1..93d28cca7 100644
576 --- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
577 +++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
578 @@ -1,6 +1,6 @@
579 /*
580 *
581 - * Copyright (C) 1998-2010, OFFIS e.V.
582 + * Copyright (C) 1998-2011, OFFIS e.V.
583 * All rights reserved. See COPYRIGHT file for details.
584 *
585 * This software and supporting documentation were developed by
586 @@ -18,8 +18,8 @@
587 * Purpose: DicomYBR422PixelTemplate (Header)
588 *
589 * Last Update: $Author: joergr $
590 - * Update Date: $Date: 2010-10-14 13:16:30 $
591 - * CVS/RCS Revision: $Revision: 1.25 $
592 + * Update Date: $Date: 2011-11-17 16:13:14 $
593 + * CVS/RCS Revision: $Revision: 1.26 $
594 * Status: $State: Exp $
595 *
596 * CVS/RCS Log at end of file
597 @@ -95,7 +95,7 @@ class DiYBR422PixelTemplate
598 const int bits,
599 const OFBool rgb)
600 {
601 - if (Init(pixel))
602 + if (this->Init(pixel))
603 {
604 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
605 register unsigned long i;
606 @@ -167,6 +167,9 @@ class DiYBR422PixelTemplate
607 *
608 * CVS/RCS Log:
609 * $Log: diyf2pxt.h,v $
610 + * Revision 1.26 2011-11-17 16:13:14 joergr
611 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
612 + *
613 * Revision 1.25 2010-10-14 13:16:30 joergr
614 * Updated copyright header. Added reference to COPYRIGHT file.
615 *
616 diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
617 index 518fed701..0dd9d5b21 100644
618 --- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
619 +++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
620 @@ -1,6 +1,6 @@
621 /*
622 *
623 - * Copyright (C) 1998-2010, OFFIS e.V.
624 + * Copyright (C) 1998-2011, OFFIS e.V.
625 * All rights reserved. See COPYRIGHT file for details.
626 *
627 * This software and supporting documentation were developed by
628 @@ -18,8 +18,8 @@
629 * Purpose: DicomYBRPart422PixelTemplate (Header)
630 *
631 * Last Update: $Author: joergr $
632 - * Update Date: $Date: 2010-10-14 13:16:30 $
633 - * CVS/RCS Revision: $Revision: 1.23 $
634 + * Update Date: $Date: 2011-11-17 16:13:14 $
635 + * CVS/RCS Revision: $Revision: 1.24 $
636 * Status: $State: Exp $
637 *
638 * CVS/RCS Log at end of file
639 @@ -91,7 +91,7 @@ class DiYBRPart422PixelTemplate
640 void convert(const T1 *pixel,
641 const int bits)
642 {
643 - if (Init(pixel))
644 + if (this->Init(pixel))
645 {
646 register T2 *r = this->Data[0];
647 register T2 *g = this->Data[1];
648 @@ -147,6 +147,9 @@ class DiYBRPart422PixelTemplate
649 *
650 * CVS/RCS Log:
651 * $Log: diyp2pxt.h,v $
652 + * Revision 1.24 2011-11-17 16:13:14 joergr
653 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
654 + *
655 * Revision 1.23 2010-10-14 13:16:30 joergr
656 * Updated copyright header. Added reference to COPYRIGHT file.
657 *
658 diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
659 index 4933fe1a8..05c198c1a 100644
660 --- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
661 +++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
662 @@ -1,6 +1,6 @@
663 /*
664 *
665 - * Copyright (C) 1996-2010, OFFIS e.V.
666 + * Copyright (C) 1996-2011, OFFIS e.V.
667 * All rights reserved. See COPYRIGHT file for details.
668 *
669 * This software and supporting documentation were developed by
670 @@ -18,8 +18,8 @@
671 * Purpose: DicomFlipTemplate (Header)
672 *
673 * Last Update: $Author: joergr $
674 - * Update Date: $Date: 2010-10-14 13:16:26 $
675 - * CVS/RCS Revision: $Revision: 1.23 $
676 + * Update Date: $Date: 2011-11-17 16:13:16 $
677 + * CVS/RCS Revision: $Revision: 1.24 $
678 * Status: $State: Exp $
679 *
680 * CVS/RCS Log at end of file
681 @@ -129,7 +129,7 @@ class DiFlipTemplate
682 else if (vert)
683 flipVert(src, dest);
684 else
685 - copyPixel(src, dest);
686 + this->copyPixel(src, dest);
687 }
688 }
690 @@ -345,6 +345,9 @@ class DiFlipTemplate
691 *
692 * CVS/RCS Log:
693 * $Log: diflipt.h,v $
694 + * Revision 1.24 2011-11-17 16:13:16 joergr
695 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
696 + *
697 * Revision 1.23 2010-10-14 13:16:26 joergr
698 * Updated copyright header. Added reference to COPYRIGHT file.
699 *
700 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
701 index a88ab9d58..52d71a381 100644
702 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
703 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
704 @@ -1,6 +1,6 @@
705 /*
706 *
707 - * Copyright (C) 1996-2010, OFFIS e.V.
708 + * Copyright (C) 1996-2011, OFFIS e.V.
709 * All rights reserved. See COPYRIGHT file for details.
710 *
711 * This software and supporting documentation were developed by
712 @@ -18,8 +18,8 @@
713 * Purpose: DicomMonochromeFlipTemplate (Header)
714 *
715 * Last Update: $Author: joergr $
716 - * Update Date: $Date: 2010-10-14 13:16:26 $
717 - * CVS/RCS Revision: $Revision: 1.15 $
718 + * Update Date: $Date: 2011-11-17 16:13:16 $
719 + * CVS/RCS Revision: $Revision: 1.16 $
720 * Status: $State: Exp $
721 *
722 * CVS/RCS Log at end of file
723 @@ -106,11 +106,11 @@ class DiMonoFlipTemplate
724 if (this->Data != NULL)
725 {
726 if (horz && vert)
727 - flipHorzVert(&pixel, &this->Data);
728 + this->flipHorzVert(&pixel, &this->Data);
729 else if (horz)
730 - flipHorz(&pixel, &this->Data);
731 + this->flipHorz(&pixel, &this->Data);
732 else if (vert)
733 - flipVert(&pixel, &this->Data);
734 + this->flipVert(&pixel, &this->Data);
735 }
736 }
737 }
738 @@ -124,6 +124,9 @@ class DiMonoFlipTemplate
739 *
740 * CVS/RCS Log:
741 * $Log: dimoflt.h,v $
742 + * Revision 1.16 2011-11-17 16:13:16 joergr
743 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
744 + *
745 * Revision 1.15 2010-10-14 13:16:26 joergr
746 * Updated copyright header. Added reference to COPYRIGHT file.
747 *
748 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
749 index e815e90a5..c190dd6da 100644
750 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
751 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
752 @@ -1,6 +1,6 @@
753 /*
754 *
755 - * Copyright (C) 1996-2010, OFFIS e.V.
756 + * Copyright (C) 1996-2011, OFFIS e.V.
757 * All rights reserved. See COPYRIGHT file for details.
758 *
759 * This software and supporting documentation were developed by
760 @@ -18,8 +18,8 @@
761 * Purpose: DicomMonochromeInputPixelTemplate (Header)
762 *
763 * Last Update: $Author: joergr $
764 - * Update Date: $Date: 2010-10-14 13:16:26 $
765 - * CVS/RCS Revision: $Revision: 1.40 $
766 + * Update Date: $Date: 2011-11-17 16:13:16 $
767 + * CVS/RCS Revision: $Revision: 1.41 $
768 * Status: $State: Exp $
769 *
770 * CVS/RCS Log at end of file
771 @@ -76,10 +76,10 @@ class DiMonoInputPixelTemplate
772 else if ((this->Modality != NULL) && this->Modality->hasRescaling())
773 {
774 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
775 - determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
776 + this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
777 } else {
778 rescale(pixel); // "copy" or reference pixel data
779 - determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
780 + this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
781 }
782 }
783 }
784 @@ -280,6 +280,9 @@ class DiMonoInputPixelTemplate
785 *
786 * CVS/RCS Log:
787 * $Log: dimoipxt.h,v $
788 + * Revision 1.41 2011-11-17 16:13:16 joergr
789 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
790 + *
791 * Revision 1.40 2010-10-14 13:16:26 joergr
792 * Updated copyright header. Added reference to COPYRIGHT file.
793 *
794 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
795 index 4ef277d87..e729424af 100644
796 --- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
797 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
798 @@ -1,6 +1,6 @@
799 /*
800 *
801 - * Copyright (C) 1996-2010, OFFIS e.V.
802 + * Copyright (C) 1996-2011, OFFIS e.V.
803 * All rights reserved. See COPYRIGHT file for details.
804 *
805 * This software and supporting documentation were developed by
806 @@ -18,8 +18,8 @@
807 * Purpose: DicomMonochromeRotateTemplate (Header)
808 *
809 * Last Update: $Author: joergr $
810 - * Update Date: $Date: 2010-10-14 13:16:26 $
811 - * CVS/RCS Revision: $Revision: 1.16 $
812 + * Update Date: $Date: 2011-11-17 16:13:16 $
813 + * CVS/RCS Revision: $Revision: 1.17 $
814 * Status: $State: Exp $
815 *
816 * CVS/RCS Log at end of file
817 @@ -105,11 +105,11 @@ class DiMonoRotateTemplate
818 if (this->Data != NULL)
819 {
820 if (degree == 90)
821 - rotateRight(&pixel, &(this->Data));
822 + this->rotateRight(&pixel, &(this->Data));
823 else if (degree == 180)
824 - rotateTopDown(&pixel, &(this->Data));
825 + this->rotateTopDown(&pixel, &(this->Data));
826 else if (degree == 270)
827 - rotateLeft(&pixel, &(this->Data));
828 + this->rotateLeft(&pixel, &(this->Data));
829 }
830 }
831 }
832 @@ -123,6 +123,9 @@ class DiMonoRotateTemplate
833 *
834 * CVS/RCS Log:
835 * $Log: dimorot.h,v $
836 + * Revision 1.17 2011-11-17 16:13:16 joergr
837 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
838 + *
839 * Revision 1.16 2010-10-14 13:16:26 joergr
840 * Updated copyright header. Added reference to COPYRIGHT file.
841 *
842 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
843 index 60c9abb83..8f898557d 100644
844 --- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
845 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
846 @@ -1,6 +1,6 @@
847 /*
848 *
849 - * Copyright (C) 1996-2010, OFFIS e.V.
850 + * Copyright (C) 1996-2011, OFFIS e.V.
851 * All rights reserved. See COPYRIGHT file for details.
852 *
853 * This software and supporting documentation were developed by
854 @@ -18,8 +18,8 @@
855 * Purpose: DicomMonochromeScaleTemplate (Header)
856 *
857 * Last Update: $Author: joergr $
858 - * Update Date: $Date: 2010-10-14 13:16:26 $
859 - * CVS/RCS Revision: $Revision: 1.20 $
860 + * Update Date: $Date: 2011-11-17 16:13:16 $
861 + * CVS/RCS Revision: $Revision: 1.21 $
862 * Status: $State: Exp $
863 *
864 * CVS/RCS Log at end of file
865 @@ -124,7 +124,7 @@ class DiMonoScaleTemplate
866 {
867 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
868 OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
869 - scaleData(&pixel, &this->Data, interpolate, value);
870 + this->scaleData(&pixel, &this->Data, interpolate, value);
871 }
872 }
873 }
874 @@ -138,6 +138,9 @@ class DiMonoScaleTemplate
875 *
876 * CVS/RCS Log:
877 * $Log: dimosct.h,v $
878 + * Revision 1.21 2011-11-17 16:13:16 joergr
879 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
880 + *
881 * Revision 1.20 2010-10-14 13:16:26 joergr
882 * Updated copyright header. Added reference to COPYRIGHT file.
883 *
884 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
885 index edb452e45..2e7e3a095 100644
886 --- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
887 +++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
888 @@ -1,6 +1,6 @@
889 /*
890 *
891 - * Copyright (C) 1996-2010, OFFIS e.V.
892 + * Copyright (C) 1996-2011, OFFIS e.V.
893 * All rights reserved. See COPYRIGHT file for details.
894 *
895 * This software and supporting documentation were developed by
896 @@ -18,8 +18,8 @@
897 * Purpose: DicomRotateTemplate (Header)
898 *
899 * Last Update: $Author: joergr $
900 - * Update Date: $Date: 2010-10-14 13:16:27 $
901 - * CVS/RCS Revision: $Revision: 1.21 $
902 + * Update Date: $Date: 2011-11-17 16:13:16 $
903 + * CVS/RCS Revision: $Revision: 1.22 $
904 * Status: $State: Exp $
905 *
906 * CVS/RCS Log at end of file
907 @@ -132,7 +132,7 @@ class DiRotateTemplate
908 else if (degree == 270)
909 rotateLeft(src, dest);
910 else
911 - copyPixel(src, dest);
912 + this->copyPixel(src, dest);
913 }
916 @@ -358,6 +358,9 @@ class DiRotateTemplate
917 *
918 * CVS/RCS Log:
919 * $Log: dirotat.h,v $
920 + * Revision 1.22 2011-11-17 16:13:16 joergr
921 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
922 + *
923 * Revision 1.21 2010-10-14 13:16:27 joergr
924 * Updated copyright header. Added reference to COPYRIGHT file.
925 *
926 diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
927 index 758dde2cd..0bcbc70f4 100644
928 --- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h
929 +++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
930 @@ -1,6 +1,6 @@
931 /*
932 *
933 - * Copyright (C) 1996-2010, OFFIS e.V.
934 + * Copyright (C) 1996-2011, OFFIS e.V.
935 * All rights reserved. See COPYRIGHT file for details.
936 *
937 * This software and supporting documentation were developed by
938 @@ -18,8 +18,8 @@
939 * Purpose: DicomScaleTemplates (Header)
940 *
941 * Last Update: $Author: joergr $
942 - * Update Date: $Date: 2010-10-14 13:16:27 $
943 - * CVS/RCS Revision: $Revision: 1.35 $
944 + * Update Date: $Date: 2011-11-17 16:13:16 $
945 + * CVS/RCS Revision: $Revision: 1.36 $
946 * Status: $State: Exp $
947 *
948 * CVS/RCS Log at end of file
949 @@ -206,12 +206,12 @@ class DiScaleTemplate
950 (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
951 { // no image to be displayed
952 DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
953 - fillPixel(dest, value); // ... fill bitmap
954 + this->fillPixel(dest, value); // ... fill bitmap
955 }
956 else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
957 {
958 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
959 - copyPixel(src, dest); // copying
960 + this->copyPixel(src, dest); // copying
961 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
962 (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
963 clipPixel(src, dest); // clipping
964 @@ -567,7 +567,7 @@ class DiScaleTemplate
965 if ((xtemp == NULL) || (xvalue == NULL))
966 {
967 DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
968 - clearPixel(dest);
969 + this->clearPixel(dest);
970 } else {
971 for (int j = 0; j < this->Planes; ++j)
972 {
973 @@ -905,7 +905,7 @@ class DiScaleTemplate
974 if (pTemp == NULL)
975 {
976 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
977 - clearPixel(dest);
978 + this->clearPixel(dest);
979 } else {
981 /*
982 @@ -1029,7 +1029,7 @@ class DiScaleTemplate
983 if (pTemp == NULL)
984 {
985 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
986 - clearPixel(dest);
987 + this->clearPixel(dest);
988 } else {
990 /*
991 @@ -1190,6 +1190,9 @@ class DiScaleTemplate
992 *
993 * CVS/RCS Log:
994 * $Log: discalet.h,v $
995 + * Revision 1.36 2011-11-17 16:13:16 joergr
996 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
997 + *
998 * Revision 1.35 2010-10-14 13:16:27 joergr
999 * Updated copyright header. Added reference to COPYRIGHT file.
1000 *
1001 diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h
1002 index 1a7f208c8..a534ebfab 100644
1003 --- a/ofstd/include/dcmtk/ofstd/ofoset.h
1004 +++ b/ofstd/include/dcmtk/ofstd/ofoset.h
1005 @@ -1,6 +1,6 @@
1006 /*
1007 *
1008 - * Copyright (C) 2002-2010, OFFIS e.V.
1009 + * Copyright (C) 2002-2011, OFFIS e.V.
1010 * All rights reserved. See COPYRIGHT file for details.
1011 *
1012 * This software and supporting documentation were developed by
1013 @@ -19,8 +19,8 @@
1014 * of an arbitrary type.
1015 *
1016 * Last Update: $Author: joergr $
1017 - * Update Date: $Date: 2010-10-14 13:15:50 $
1018 - * CVS/RCS Revision: $Revision: 1.11 $
1019 + * Update Date: $Date: 2011-11-17 16:13:18 $
1020 + * CVS/RCS Revision: $Revision: 1.12 $
1021 * Status: $State: Exp $
1022 *
1023 * CVS/RCS Log at end of file
1024 @@ -146,7 +146,7 @@ template <class T> class OFOrderedSet : public OFSet<T>
1025 {
1026 // if size equals num, we need more space
1027 if( this->size == this->num )
1028 - Resize( this->size * 2 );
1029 + this->Resize( this->size * 2 );
1031 // copy item
1032 T *newItem = new T( item );
1033 @@ -189,7 +189,7 @@ template <class T> class OFOrderedSet : public OFSet<T>
1034 {
1035 // if size equals num, we need more space
1036 if( this->size == this->num )
1037 - Resize( this->size * 2 );
1038 + this->Resize( this->size * 2 );
1040 // copy item
1041 T *newItem = new T( item );
1042 @@ -508,6 +508,9 @@ template <class T> class OFOrderedSet : public OFSet<T>
1043 /*
1044 ** CVS/RCS Log:
1045 ** $Log: ofoset.h,v $
1046 +** Revision 1.12 2011-11-17 16:13:18 joergr
1047 +** Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
1048 +**
1049 ** Revision 1.11 2010-10-14 13:15:50 joergr
1050 ** Updated copyright header. Added reference to COPYRIGHT file.
1051 **
1052 diff --git a/ofstd/libsrc/ofchrenc.cc b/ofstd/libsrc/ofchrenc.cc
1053 index d3bc48bad..4c2a6e444 100644
1054 --- a/ofstd/libsrc/ofchrenc.cc
1055 +++ b/ofstd/libsrc/ofchrenc.cc
1056 @@ -18,8 +18,8 @@
1057 * Purpose: Class for character encoding conversion (Source)
1058 *
1059 * Last Update: $Author: joergr $
1060 - * Update Date: $Date: 2011-11-09 14:05:39 $
1061 - * CVS/RCS Revision: $Revision: 1.9 $
1062 + * Update Date: $Date: 2011-11-17 16:13:19 $
1063 + * CVS/RCS Revision: $Revision: 1.10 $
1064 * Status: $State: Exp $
1065 *
1066 * CVS/RCS Log at end of file
1067 @@ -37,6 +37,12 @@
1068 #include <localcharset.h>
1069 #endif
1071 +BEGIN_EXTERN_C
1072 +#ifdef HAVE_SYS_ERRNO_H
1073 +#include <sys/errno.h>
1074 +#endif
1075 +END_EXTERN_C
1076 +
1078 #define ILLEGAL_DESCRIPTOR OFreinterpret_cast(OFCharacterEncoding::T_Descriptor, -1)
1079 #define CONVERSION_ERROR OFstatic_cast(size_t, -1)
1080 @@ -359,6 +365,9 @@ size_t OFCharacterEncoding::countCharactersInUTF8String(const OFString &utf8Stri
1081 *
1082 * CVS/RCS Log:
1083 * $Log: ofchrenc.cc,v $
1084 + * Revision 1.10 2011-11-17 16:13:19 joergr
1085 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
1086 + *
1087 * Revision 1.9 2011-11-09 14:05:39 joergr
1088 * Avoid wrong error message / status code that a conversion descriptor cannot
1089 * be closed when libiconv is not available.
1090 --
1091 2.11.0