]> git.pld-linux.org Git - packages/dcmtk.git/blame - dcmtk-0008-Compiler-Fixes.patch
projects / packages / dcmtk.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- fix building with current gcc (patch from fedora)
[packages/dcmtk.git] / dcmtk-0008-Compiler-Fixes.patch
CommitLineData
21e54736
JR		 1diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diargpxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diargpxt.h
2--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diargpxt.h 2010-10-14 09:16:29.000000000 -0400
3+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diargpxt.h 2012-07-25 21:32:05.291213110 -0400
4@@ -1,6 +1,6 @@
5 /*
6 *
7- * Copyright (C) 1996-2010, OFFIS e.V.
8+ * Copyright (C) 1996-2011, OFFIS e.V.
9 * All rights reserved. See COPYRIGHT file for details.
10 *
11 * This software and supporting documentation were developed by
12@@ -18,8 +18,8 @@
13 * Purpose: DicomARGBPixelTemplate (Header) - UNTESTED !!!
14 *
15 * Last Update: $Author: joergr $
16- * Update Date: $Date: 2010-10-14 13:16:29 $
17- * CVS/RCS Revision: $Revision: 1.21 $
18+ * Update Date: $Date: 2011-11-17 16:13:14 $
19+ * CVS/RCS Revision: $Revision: 1.22 $
20 * Status: $State: Exp $
21 *
22 * CVS/RCS Log at end of file
23@@ -91,7 +91,7 @@
24 const unsigned long planeSize,
25 const int bits)
26 { // not very much optimized, but no one really uses ARGB !!
27- if (Init(pixel))
28+ if (this->Init(pixel))
29 {
30 register T2 value;
31 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
32@@ -103,9 +103,9 @@
33 /*
34 register const T1 *a = pixel; // points to alpha plane
35 const T1 *rgb[3];
36- rgb[0] = a + this->InputCount; // points to red plane
37- rgb[1] = rgb[0] + this->InputCount; // points to green plane
38- rgb[2] = rgb[1] + this->InputCount; // points to blue plane
39+ rgb[0] = a + this->InputCount; // points to red plane
40+ rgb[1] = rgb[0] + this->InputCount; // points to green plane
41+ rgb[2] = rgb[1] + this->InputCount; // points to blue plane
42 for (i = 0; i < count; ++i)
43 {
44 value = OFstatic_cast(T2, *(a++)); // get alpha value
45@@ -141,10 +141,10 @@
46 /* convert a single frame */
47 for (l = planeSize; (l != 0) && (i < count); --l, ++i)
48 {
49- value = OFstatic_cast(T2, *(a++)); // get alpha value
50+ value = OFstatic_cast(T2, *(a++)); // get alpha value
51 if (value > 0)
52 {
53- for (int j = 0; j < 3; ++j) // set palette color
54+ for (int j = 0; j < 3; ++j) // set palette color
55 {
56 if (value <= palette[j]->getFirstEntry(value))
57 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getFirstValue());
58@@ -152,12 +152,12 @@
59 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getLastValue());
60 else
61 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getValue(value));
62- ++rgb[j]; // skip RGB values
63+ ++rgb[j]; // skip RGB values
64 }
65 }
66 else
67 {
68- for (int j = 0; j < 3; ++j) // copy RGB values
69+ for (int j = 0; j < 3; ++j) // copy RGB values
70 this->Data[j][i] = OFstatic_cast(T3, removeSign(*(rgb[j]++), offset));
71 }
72 }
73@@ -204,6 +204,9 @@
74 *
75 * CVS/RCS Log:
76 * $Log: diargpxt.h,v $
77+ * Revision 1.22 2011-11-17 16:13:14 joergr
78+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
79+ *
80 * Revision 1.21 2010-10-14 13:16:29 joergr
81 * Updated copyright header. Added reference to COPYRIGHT file.
82 *
83diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicmypxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
84--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 2010-10-14 09:16:29.000000000 -0400
85+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 2012-07-25 21:32:05.291213110 -0400
86@@ -1,6 +1,6 @@
87 /*
88 *
89- * Copyright (C) 1996-2010, OFFIS e.V.
90+ * Copyright (C) 1996-2011, OFFIS e.V.
91 * All rights reserved. See COPYRIGHT file for details.
92 *
93 * This software and supporting documentation were developed by
94@@ -18,8 +18,8 @@
95 * Purpose: DicomCMYKPixelTemplate (Header)
96 *
97 * Last Update: $Author: joergr $
98- * Update Date: $Date: 2010-10-14 13:16:29 $
99- * CVS/RCS Revision: $Revision: 1.20 $
100+ * Update Date: $Date: 2011-11-17 16:13:14 $
101+ * CVS/RCS Revision: $Revision: 1.21 $
102 * Status: $State: Exp $
103 *
104 * CVS/RCS Log at end of file
105@@ -87,7 +87,7 @@
106 const unsigned long planeSize,
107 const int bits)
108 {
109- if (Init(pixel))
110+ if (this->Init(pixel))
111 {
112 // use the number of input pixels derived from the length of the 'PixelData'
113 // attribute), but not more than the size of the intermediate buffer
114@@ -157,6 +157,9 @@
115 *
116 * CVS/RCS Log:
117 * $Log: dicmypxt.h,v $
118+ * Revision 1.21 2011-11-17 16:13:14 joergr
119+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
120+ *
121 * Revision 1.20 2010-10-14 13:16:29 joergr
122 * Updated copyright header. Added reference to COPYRIGHT file.
123 *
124diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicocpt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicocpt.h
125--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicocpt.h 2010-10-14 09:16:29.000000000 -0400
126+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicocpt.h 2012-07-25 21:32:05.292213078 -0400
127@@ -1,6 +1,6 @@
128 /*
129 *
130- * Copyright (C) 1998-2010, OFFIS e.V.
131+ * Copyright (C) 1998-2011, OFFIS e.V.
132 * All rights reserved. See COPYRIGHT file for details.
133 *
134 * This software and supporting documentation were developed by
135@@ -18,8 +18,8 @@
136 * Purpose: DicomColorCopyTemplate (Header)
137 *
138 * Last Update: $Author: joergr $
139- * Update Date: $Date: 2010-10-14 13:16:29 $
140- * CVS/RCS Revision: $Revision: 1.12 $
141+ * Update Date: $Date: 2011-11-17 16:13:14 $
142+ * CVS/RCS Revision: $Revision: 1.13 $
143 * Status: $State: Exp $
144 *
145 * CVS/RCS Log at end of file
146@@ -86,7 +86,7 @@
147 inline void copy(const T *pixel[3],
148 const unsigned long offset)
149 {
150- if (Init(pixel))
151+ if (this->Init(pixel))
152 {
153 for (int j = 0; j < 3; j++)
154 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
155@@ -102,6 +102,9 @@
156 *
157 * CVS/RCS Log:
158 * $Log: dicocpt.h,v $
159+ * Revision 1.13 2011-11-17 16:13:14 joergr
160+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
161+ *
162 * Revision 1.12 2010-10-14 13:16:29 joergr
163 * Updated copyright header. Added reference to COPYRIGHT file.
164 *
165diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicoflt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicoflt.h
166--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicoflt.h 2010-10-14 09:16:29.000000000 -0400
167+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicoflt.h 2012-07-25 21:32:05.292213078 -0400
168@@ -1,6 +1,6 @@
169 /*
170 *
171- * Copyright (C) 1998-2010, OFFIS e.V.
172+ * Copyright (C) 1998-2011, OFFIS e.V.
173 * All rights reserved. See COPYRIGHT file for details.
174 *
175 * This software and supporting documentation were developed by
176@@ -18,8 +18,8 @@
177 * Purpose: DicomColorFlipTemplate (Header)
178 *
179 * Last Update: $Author: joergr $
180- * Update Date: $Date: 2010-10-14 13:16:29 $
181- * CVS/RCS Revision: $Revision: 1.15 $
182+ * Update Date: $Date: 2011-11-17 16:13:14 $
183+ * CVS/RCS Revision: $Revision: 1.16 $
184 * Status: $State: Exp $
185 *
186 * CVS/RCS Log at end of file
187@@ -98,14 +98,14 @@
188 const int horz,
189 const int vert)
190 {
191- if (Init(pixel))
192+ if (this->Init(pixel))
193 {
194 if (horz && vert)
195- flipHorzVert(pixel, this->Data);
196+ this->flipHorzVert(pixel, this->Data);
197 else if (horz)
198- flipHorz(pixel, this->Data);
199+ this->flipHorz(pixel, this->Data);
200 else if (vert)
201- flipVert(pixel, this->Data);
202+ this->flipVert(pixel, this->Data);
203 }
204 }
205 };
206@@ -118,6 +118,9 @@
207 *
208 * CVS/RCS Log:
209 * $Log: dicoflt.h,v $
210+ * Revision 1.16 2011-11-17 16:13:14 joergr
211+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
212+ *
213 * Revision 1.15 2010-10-14 13:16:29 joergr
214 * Updated copyright header. Added reference to COPYRIGHT file.
215 *
216diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicorot.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicorot.h
217--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicorot.h 2010-10-14 09:16:29.000000000 -0400
218+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicorot.h 2012-07-25 21:32:05.293213022 -0400
219@@ -1,6 +1,6 @@
220 /*
221 *
222- * Copyright (C) 1998-2010, OFFIS e.V.
223+ * Copyright (C) 1998-2011, OFFIS e.V.
224 * All rights reserved. See COPYRIGHT file for details.
225 *
226 * This software and supporting documentation were developed by
227@@ -18,8 +18,8 @@
228 * Purpose: DicomColorRotateTemplate (Header)
229 *
230 * Last Update: $Author: joergr $
231- * Update Date: $Date: 2010-10-14 13:16:29 $
232- * CVS/RCS Revision: $Revision: 1.15 $
233+ * Update Date: $Date: 2011-11-17 16:13:14 $
234+ * CVS/RCS Revision: $Revision: 1.16 $
235 * Status: $State: Exp $
236 *
237 * CVS/RCS Log at end of file
238@@ -98,14 +98,14 @@
239 inline void rotate(const T *pixel[3],
240 const int degree)
241 {
242- if (Init(pixel))
243+ if (this->Init(pixel))
244 {
245 if (degree == 90)
246- rotateRight(pixel, this->Data);
247+ this->rotateRight(pixel, this->Data);
248 else if (degree == 180)
249- rotateTopDown(pixel, this->Data);
250+ this->rotateTopDown(pixel, this->Data);
251 else if (degree == 270)
252- rotateLeft(pixel, this->Data);
253+ this->rotateLeft(pixel, this->Data);
254 }
255 }
256 };
257@@ -118,6 +118,9 @@
258 *
259 * CVS/RCS Log:
260 * $Log: dicorot.h,v $
261+ * Revision 1.16 2011-11-17 16:13:14 joergr
262+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
263+ *
264 * Revision 1.15 2010-10-14 13:16:29 joergr
265 * Updated copyright header. Added reference to COPYRIGHT file.
266 *
267diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicosct.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicosct.h
268--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicosct.h 2010-10-14 09:16:29.000000000 -0400
269+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicosct.h 2012-07-25 21:32:05.293213022 -0400
270@@ -1,6 +1,6 @@
271 /*
272 *
273- * Copyright (C) 1996-2010, OFFIS e.V.
274+ * Copyright (C) 1996-2011, OFFIS e.V.
275 * All rights reserved. See COPYRIGHT file for details.
276 *
277 * This software and supporting documentation were developed by
278@@ -18,8 +18,8 @@
279 * Purpose: DicomColorScaleTemplate (Header)
280 *
281 * Last Update: $Author: joergr $
282- * Update Date: $Date: 2010-10-14 13:16:29 $
283- * CVS/RCS Revision: $Revision: 1.21 $
284+ * Update Date: $Date: 2011-11-17 16:13:14 $
285+ * CVS/RCS Revision: $Revision: 1.22 $
286 * Status: $State: Exp $
287 *
288 * CVS/RCS Log at end of file
289@@ -107,8 +107,8 @@
290 inline void scale(const T *pixel[3],
291 const int interpolate)
292 {
293- if (Init(pixel))
294- scaleData(pixel, this->Data, interpolate);
295+ if (this->Init(pixel))
296+ this->scaleData(pixel, this->Data, interpolate);
297 }
298 };
299
300@@ -120,6 +120,9 @@
301 *
302 * CVS/RCS Log:
303 * $Log: dicosct.h,v $
304+ * Revision 1.22 2011-11-17 16:13:14 joergr
305+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
306+ *
307 * Revision 1.21 2010-10-14 13:16:29 joergr
308 * Updated copyright header. Added reference to COPYRIGHT file.
309 *
310diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
311--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 2010-10-14 09:16:29.000000000 -0400
312+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 2012-07-25 21:32:05.294212963 -0400
313@@ -1,6 +1,6 @@
314 /*
315 *
316- * Copyright (C) 1996-2010, OFFIS e.V.
317+ * Copyright (C) 1996-2011, OFFIS e.V.
318 * All rights reserved. See COPYRIGHT file for details.
319 *
320 * This software and supporting documentation were developed by
321@@ -18,8 +18,8 @@
322 * Purpose: DicomHSVPixelTemplate (Header)
323 *
324 * Last Update: $Author: joergr $
325- * Update Date: $Date: 2010-10-14 13:16:29 $
326- * CVS/RCS Revision: $Revision: 1.25 $
327+ * Update Date: $Date: 2011-11-17 16:13:14 $
328+ * CVS/RCS Revision: $Revision: 1.26 $
329 * Status: $State: Exp $
330 *
331 * CVS/RCS Log at end of file
332@@ -87,7 +87,7 @@
333 const unsigned long planeSize,
334 const int bits)
335 {
336- if (Init(pixel))
337+ if (this->Init(pixel))
338 {
339 register T2 *r = this->Data[0];
340 register T2 *g = this->Data[1];
341@@ -221,6 +221,9 @@
342 *
343 * CVS/RCS Log:
344 * $Log: dihsvpxt.h,v $
345+ * Revision 1.26 2011-11-17 16:13:14 joergr
346+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
347+ *
348 * Revision 1.25 2010-10-14 13:16:29 joergr
349 * Updated copyright header. Added reference to COPYRIGHT file.
350 *
351diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dipalpxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
352--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 2010-10-14 09:16:29.000000000 -0400
353+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 2012-07-25 21:32:05.294212963 -0400
354@@ -1,6 +1,6 @@
355 /*
356 *
357- * Copyright (C) 1996-2010, OFFIS e.V.
358+ * Copyright (C) 1996-2011, OFFIS e.V.
359 * All rights reserved. See COPYRIGHT file for details.
360 *
361 * This software and supporting documentation were developed by
362@@ -18,8 +18,8 @@
363 * Purpose: DicomPalettePixelTemplate (Header)
364 *
365 * Last Update: $Author: joergr $
366- * Update Date: $Date: 2010-10-14 13:16:29 $
367- * CVS/RCS Revision: $Revision: 1.24 $
368+ * Update Date: $Date: 2011-11-17 16:13:14 $
369+ * CVS/RCS Revision: $Revision: 1.25 $
370 * Status: $State: Exp $
371 *
372 * CVS/RCS Log at end of file
373@@ -92,7 +92,7 @@
374 void convert(const T1 *pixel,
375 DiLookupTable *palette[3])
376 { // can be optimized if necessary !
377- if (Init(pixel))
378+ if (this->Init(pixel))
379 {
380 register const T1 *p = pixel;
381 register T2 value = 0;
382@@ -126,6 +126,9 @@
383 *
384 * CVS/RCS Log:
385 * $Log: dipalpxt.h,v $
386+ * Revision 1.25 2011-11-17 16:13:14 joergr
387+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
388+ *
389 * Revision 1.24 2010-10-14 13:16:29 joergr
390 * Updated copyright header. Added reference to COPYRIGHT file.
391 *
392diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
393--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 2010-10-14 09:16:30.000000000 -0400
394+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 2012-07-25 21:32:05.295212904 -0400
395@@ -1,6 +1,6 @@
396 /*
397 *
398- * Copyright (C) 1996-2010, OFFIS e.V.
399+ * Copyright (C) 1996-2011, OFFIS e.V.
400 * All rights reserved. See COPYRIGHT file for details.
401 *
402 * This software and supporting documentation were developed by
403@@ -18,8 +18,8 @@
404 * Purpose: DicomRGBPixelTemplate (Header)
405 *
406 * Last Update: $Author: joergr $
407- * Update Date: $Date: 2010-10-14 13:16:30 $
408- * CVS/RCS Revision: $Revision: 1.18 $
409+ * Update Date: $Date: 2011-11-17 16:13:14 $
410+ * CVS/RCS Revision: $Revision: 1.19 $
411 * Status: $State: Exp $
412 *
413 * CVS/RCS Log at end of file
414@@ -87,7 +87,7 @@
415 const unsigned long planeSize,
416 const int bits)
417 {
418- if (Init(pixel))
419+ if (this->Init(pixel))
420 {
421 // use the number of input pixels derived from the length of the 'PixelData'
422 // attribute), but not more than the size of the intermediate buffer
423@@ -129,9 +129,9 @@
424 {
425 register int j;
426 register unsigned long i;
427- for (i = 0; i < count; ++i) /* for all pixel ... */
428+ for (i = 0; i < count; ++i) /* for all pixel ... */
429 for (j = 0; j < 3; ++j)
430- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
431+ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
432 }
433 }
434 }
435@@ -145,6 +145,9 @@
436 *
437 * CVS/RCS Log:
438 * $Log: dirgbpxt.h,v $
439+ * Revision 1.19 2011-11-17 16:13:14 joergr
440+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
441+ *
442 * Revision 1.18 2010-10-14 13:16:30 joergr
443 * Updated copyright header. Added reference to COPYRIGHT file.
444 *
445diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diybrpxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
446--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 2010-10-14 09:16:30.000000000 -0400
447+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 2012-07-25 21:32:05.296212847 -0400
448@@ -1,6 +1,6 @@
449 /*
450 *
451- * Copyright (C) 1998-2010, OFFIS e.V.
452+ * Copyright (C) 1998-2011, OFFIS e.V.
453 * All rights reserved. See COPYRIGHT file for details.
454 *
455 * This software and supporting documentation were developed by
456@@ -18,8 +18,8 @@
457 * Purpose: DicomYBRPixelTemplate (Header)
458 *
459 * Last Update: $Author: joergr $
460- * Update Date: $Date: 2010-10-14 13:16:30 $
461- * CVS/RCS Revision: $Revision: 1.19 $
462+ * Update Date: $Date: 2011-11-17 16:13:14 $
463+ * CVS/RCS Revision: $Revision: 1.20 $
464 * Status: $State: Exp $
465 *
466 * CVS/RCS Log at end of file
467@@ -91,7 +91,7 @@
468 const int bits,
469 const OFBool rgb)
470 {
471- if (Init(pixel))
472+ if (this->Init(pixel))
473 {
474 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
475 // use the number of input pixels derived from the length of the 'PixelData'
476@@ -266,9 +266,9 @@
477 {
478 register int j;
479 register unsigned long i;
480- for (i = 0; i < count; ++i) /* for all pixel ... */
481+ for (i = 0; i < count; ++i) /* for all pixel ... */
482 for (j = 0; j < 3; ++j)
483- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
484+ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
485 }
486 }
487 }
488@@ -295,6 +295,9 @@
489 *
490 * CVS/RCS Log:
491 * $Log: diybrpxt.h,v $
492+ * Revision 1.20 2011-11-17 16:13:14 joergr
493+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
494+ *
495 * Revision 1.19 2010-10-14 13:16:30 joergr
496 * Updated copyright header. Added reference to COPYRIGHT file.
497 *
498diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
499--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 2010-10-14 09:16:30.000000000 -0400
500+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 2012-07-25 21:32:05.296212847 -0400
501@@ -1,6 +1,6 @@
502 /*
503 *
504- * Copyright (C) 1998-2010, OFFIS e.V.
505+ * Copyright (C) 1998-2011, OFFIS e.V.
506 * All rights reserved. See COPYRIGHT file for details.
507 *
508 * This software and supporting documentation were developed by
509@@ -18,8 +18,8 @@
510 * Purpose: DicomYBR422PixelTemplate (Header)
511 *
512 * Last Update: $Author: joergr $
513- * Update Date: $Date: 2010-10-14 13:16:30 $
514- * CVS/RCS Revision: $Revision: 1.25 $
515+ * Update Date: $Date: 2011-11-17 16:13:14 $
516+ * CVS/RCS Revision: $Revision: 1.26 $
517 * Status: $State: Exp $
518 *
519 * CVS/RCS Log at end of file
520@@ -95,7 +95,7 @@
521 const int bits,
522 const OFBool rgb)
523 {
524- if (Init(pixel))
525+ if (this->Init(pixel))
526 {
527 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
528 register unsigned long i;
529@@ -167,6 +167,9 @@
530 *
531 * CVS/RCS Log:
532 * $Log: diyf2pxt.h,v $
533+ * Revision 1.26 2011-11-17 16:13:14 joergr
534+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
535+ *
536 * Revision 1.25 2010-10-14 13:16:30 joergr
537 * Updated copyright header. Added reference to COPYRIGHT file.
538 *
539diff -Naur dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
540--- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 2010-10-14 09:16:30.000000000 -0400
541+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 2012-07-25 21:32:05.297212792 -0400
542@@ -1,6 +1,6 @@
543 /*
544 *
545- * Copyright (C) 1998-2010, OFFIS e.V.
546+ * Copyright (C) 1998-2011, OFFIS e.V.
547 * All rights reserved. See COPYRIGHT file for details.
548 *
549 * This software and supporting documentation were developed by
550@@ -18,8 +18,8 @@
551 * Purpose: DicomYBRPart422PixelTemplate (Header)
552 *
553 * Last Update: $Author: joergr $
554- * Update Date: $Date: 2010-10-14 13:16:30 $
555- * CVS/RCS Revision: $Revision: 1.23 $
556+ * Update Date: $Date: 2011-11-17 16:13:14 $
557+ * CVS/RCS Revision: $Revision: 1.24 $
558 * Status: $State: Exp $
559 *
560 * CVS/RCS Log at end of file
561@@ -91,7 +91,7 @@
562 void convert(const T1 *pixel,
563 const int bits)
564 {
565- if (Init(pixel))
566+ if (this->Init(pixel))
567 {
568 register T2 *r = this->Data[0];
569 register T2 *g = this->Data[1];
570@@ -147,6 +147,9 @@
571 *
572 * CVS/RCS Log:
573 * $Log: diyp2pxt.h,v $
574+ * Revision 1.24 2011-11-17 16:13:14 joergr
575+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
576+ *
577 * Revision 1.23 2010-10-14 13:16:30 joergr
578 * Updated copyright header. Added reference to COPYRIGHT file.
579 *
580diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/diflipt.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
581--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 2010-10-14 09:16:26.000000000 -0400
582+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 2012-07-25 21:32:05.297212792 -0400
583@@ -1,6 +1,6 @@
584 /*
585 *
586- * Copyright (C) 1996-2010, OFFIS e.V.
587+ * Copyright (C) 1996-2011, OFFIS e.V.
588 * All rights reserved. See COPYRIGHT file for details.
589 *
590 * This software and supporting documentation were developed by
591@@ -18,8 +18,8 @@
592 * Purpose: DicomFlipTemplate (Header)
593 *
594 * Last Update: $Author: joergr $
595- * Update Date: $Date: 2010-10-14 13:16:26 $
596- * CVS/RCS Revision: $Revision: 1.23 $
597+ * Update Date: $Date: 2011-11-17 16:13:16 $
598+ * CVS/RCS Revision: $Revision: 1.24 $
599 * Status: $State: Exp $
600 *
601 * CVS/RCS Log at end of file
602@@ -129,7 +129,7 @@
603 else if (vert)
604 flipVert(src, dest);
605 else
606- copyPixel(src, dest);
607+ this->copyPixel(src, dest);
608 }
609 }
610
611@@ -345,6 +345,9 @@
612 *
613 * CVS/RCS Log:
614 * $Log: diflipt.h,v $
615+ * Revision 1.24 2011-11-17 16:13:16 joergr
616+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
617+ *
618 * Revision 1.23 2010-10-14 13:16:26 joergr
619 * Updated copyright header. Added reference to COPYRIGHT file.
620 *
621diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
622--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 2010-10-14 09:16:26.000000000 -0400
623+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 2012-07-25 21:32:05.298212739 -0400
624@@ -1,6 +1,6 @@
625 /*
626 *
627- * Copyright (C) 1996-2010, OFFIS e.V.
628+ * Copyright (C) 1996-2011, OFFIS e.V.
629 * All rights reserved. See COPYRIGHT file for details.
630 *
631 * This software and supporting documentation were developed by
632@@ -18,8 +18,8 @@
633 * Purpose: DicomMonochromeFlipTemplate (Header)
634 *
635 * Last Update: $Author: joergr $
636- * Update Date: $Date: 2010-10-14 13:16:26 $
637- * CVS/RCS Revision: $Revision: 1.15 $
638+ * Update Date: $Date: 2011-11-17 16:13:16 $
639+ * CVS/RCS Revision: $Revision: 1.16 $
640 * Status: $State: Exp $
641 *
642 * CVS/RCS Log at end of file
643@@ -106,11 +106,11 @@
644 if (this->Data != NULL)
645 {
646 if (horz && vert)
647- flipHorzVert(&pixel, &this->Data);
648+ this->flipHorzVert(&pixel, &this->Data);
649 else if (horz)
650- flipHorz(&pixel, &this->Data);
651+ this->flipHorz(&pixel, &this->Data);
652 else if (vert)
653- flipVert(&pixel, &this->Data);
654+ this->flipVert(&pixel, &this->Data);
655 }
656 }
657 }
658@@ -124,6 +124,9 @@
659 *
660 * CVS/RCS Log:
661 * $Log: dimoflt.h,v $
662+ * Revision 1.16 2011-11-17 16:13:16 joergr
663+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
664+ *
665 * Revision 1.15 2010-10-14 13:16:26 joergr
666 * Updated copyright header. Added reference to COPYRIGHT file.
667 *
668diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
669--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 2010-10-14 09:16:26.000000000 -0400
670+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 2012-07-25 21:32:05.298212739 -0400
671@@ -1,6 +1,6 @@
672 /*
673 *
674- * Copyright (C) 1996-2010, OFFIS e.V.
675+ * Copyright (C) 1996-2011, OFFIS e.V.
676 * All rights reserved. See COPYRIGHT file for details.
677 *
678 * This software and supporting documentation were developed by
679@@ -18,8 +18,8 @@
680 * Purpose: DicomMonochromeInputPixelTemplate (Header)
681 *
682 * Last Update: $Author: joergr $
683- * Update Date: $Date: 2010-10-14 13:16:26 $
684- * CVS/RCS Revision: $Revision: 1.40 $
685+ * Update Date: $Date: 2011-11-17 16:13:16 $
686+ * CVS/RCS Revision: $Revision: 1.41 $
687 * Status: $State: Exp $
688 *
689 * CVS/RCS Log at end of file
690@@ -76,10 +76,10 @@
691 else if ((this->Modality != NULL) && this->Modality->hasRescaling())
692 {
693 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
694- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
695+ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
696 } else {
697 rescale(pixel); // "copy" or reference pixel data
698- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
699+ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
700 }
701 }
702 }
703@@ -280,6 +280,9 @@
704 *
705 * CVS/RCS Log:
706 * $Log: dimoipxt.h,v $
707+ * Revision 1.41 2011-11-17 16:13:16 joergr
708+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
709+ *
710 * Revision 1.40 2010-10-14 13:16:26 joergr
711 * Updated copyright header. Added reference to COPYRIGHT file.
712 *
713diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimorot.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
714--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 2010-10-14 09:16:26.000000000 -0400
715+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 2012-07-25 21:32:05.299212688 -0400
716@@ -1,6 +1,6 @@
717 /*
718 *
719- * Copyright (C) 1996-2010, OFFIS e.V.
720+ * Copyright (C) 1996-2011, OFFIS e.V.
721 * All rights reserved. See COPYRIGHT file for details.
722 *
723 * This software and supporting documentation were developed by
724@@ -18,8 +18,8 @@
725 * Purpose: DicomMonochromeRotateTemplate (Header)
726 *
727 * Last Update: $Author: joergr $
728- * Update Date: $Date: 2010-10-14 13:16:26 $
729- * CVS/RCS Revision: $Revision: 1.16 $
730+ * Update Date: $Date: 2011-11-17 16:13:16 $
731+ * CVS/RCS Revision: $Revision: 1.17 $
732 * Status: $State: Exp $
733 *
734 * CVS/RCS Log at end of file
735@@ -105,11 +105,11 @@
736 if (this->Data != NULL)
737 {
738 if (degree == 90)
739- rotateRight(&pixel, &(this->Data));
740+ this->rotateRight(&pixel, &(this->Data));
741 else if (degree == 180)
742- rotateTopDown(&pixel, &(this->Data));
743+ this->rotateTopDown(&pixel, &(this->Data));
744 else if (degree == 270)
745- rotateLeft(&pixel, &(this->Data));
746+ this->rotateLeft(&pixel, &(this->Data));
747 }
748 }
749 }
750@@ -123,6 +123,9 @@
751 *
752 * CVS/RCS Log:
753 * $Log: dimorot.h,v $
754+ * Revision 1.17 2011-11-17 16:13:16 joergr
755+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
756+ *
757 * Revision 1.16 2010-10-14 13:16:26 joergr
758 * Updated copyright header. Added reference to COPYRIGHT file.
759 *
760diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimosct.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
761--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 2010-10-14 09:16:26.000000000 -0400
762+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 2012-07-25 21:32:05.299212688 -0400
763@@ -1,6 +1,6 @@
764 /*
765 *
766- * Copyright (C) 1996-2010, OFFIS e.V.
767+ * Copyright (C) 1996-2011, OFFIS e.V.
768 * All rights reserved. See COPYRIGHT file for details.
769 *
770 * This software and supporting documentation were developed by
771@@ -18,8 +18,8 @@
772 * Purpose: DicomMonochromeScaleTemplate (Header)
773 *
774 * Last Update: $Author: joergr $
775- * Update Date: $Date: 2010-10-14 13:16:26 $
776- * CVS/RCS Revision: $Revision: 1.20 $
777+ * Update Date: $Date: 2011-11-17 16:13:16 $
778+ * CVS/RCS Revision: $Revision: 1.21 $
779 * Status: $State: Exp $
780 *
781 * CVS/RCS Log at end of file
782@@ -124,7 +124,7 @@
783 {
784 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
785 OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
786- scaleData(&pixel, &this->Data, interpolate, value);
787+ this->scaleData(&pixel, &this->Data, interpolate, value);
788 }
789 }
790 }
791@@ -138,6 +138,9 @@
792 *
793 * CVS/RCS Log:
794 * $Log: dimosct.h,v $
795+ * Revision 1.21 2011-11-17 16:13:16 joergr
796+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
797+ *
798 * Revision 1.20 2010-10-14 13:16:26 joergr
799 * Updated copyright header. Added reference to COPYRIGHT file.
800 *
801diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dirotat.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
802--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 2010-10-14 09:16:27.000000000 -0400
803+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 2012-07-25 21:32:05.300212639 -0400
804@@ -1,6 +1,6 @@
805 /*
806 *
807- * Copyright (C) 1996-2010, OFFIS e.V.
808+ * Copyright (C) 1996-2011, OFFIS e.V.
809 * All rights reserved. See COPYRIGHT file for details.
810 *
811 * This software and supporting documentation were developed by
812@@ -18,8 +18,8 @@
813 * Purpose: DicomRotateTemplate (Header)
814 *
815 * Last Update: $Author: joergr $
816- * Update Date: $Date: 2010-10-14 13:16:27 $
817- * CVS/RCS Revision: $Revision: 1.21 $
818+ * Update Date: $Date: 2011-11-17 16:13:16 $
819+ * CVS/RCS Revision: $Revision: 1.22 $
820 * Status: $State: Exp $
821 *
822 * CVS/RCS Log at end of file
823@@ -132,7 +132,7 @@
824 else if (degree == 270)
825 rotateLeft(src, dest);
826 else
827- copyPixel(src, dest);
828+ this->copyPixel(src, dest);
829 }
830
831
832@@ -358,6 +358,9 @@
833 *
834 * CVS/RCS Log:
835 * $Log: dirotat.h,v $
836+ * Revision 1.22 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.21 2010-10-14 13:16:27 joergr
840 * Updated copyright header. Added reference to COPYRIGHT file.
841 *
842diff -Naur dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/discalet.h dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/discalet.h
843--- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/discalet.h 2010-10-14 09:16:27.000000000 -0400
844+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/discalet.h 2012-07-25 21:32:05.300212639 -0400
845@@ -1,6 +1,6 @@
846 /*
847 *
848- * Copyright (C) 1996-2010, OFFIS e.V.
849+ * Copyright (C) 1996-2011, OFFIS e.V.
850 * All rights reserved. See COPYRIGHT file for details.
851 *
852 * This software and supporting documentation were developed by
853@@ -18,8 +18,8 @@
854 * Purpose: DicomScaleTemplates (Header)
855 *
856 * Last Update: $Author: joergr $
857- * Update Date: $Date: 2010-10-14 13:16:27 $
858- * CVS/RCS Revision: $Revision: 1.35 $
859+ * Update Date: $Date: 2011-11-17 16:13:16 $
860+ * CVS/RCS Revision: $Revision: 1.36 $
861 * Status: $State: Exp $
862 *
863 * CVS/RCS Log at end of file
864@@ -206,12 +206,12 @@
865 (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
866 { // no image to be displayed
867 DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
868- fillPixel(dest, value); // ... fill bitmap
869+ this->fillPixel(dest, value); // ... fill bitmap
870 }
871 else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
872 {
873 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
874- copyPixel(src, dest); // copying
875+ this->copyPixel(src, dest); // copying
876 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
877 (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
878 clipPixel(src, dest); // clipping
879@@ -567,7 +567,7 @@
880 if ((xtemp == NULL) || (xvalue == NULL))
881 {
882 DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
883- clearPixel(dest);
884+ this->clearPixel(dest);
885 } else {
886 for (int j = 0; j < this->Planes; ++j)
887 {
888@@ -905,7 +905,7 @@
889 if (pTemp == NULL)
890 {
891 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
892- clearPixel(dest);
893+ this->clearPixel(dest);
894 } else {
895
896 /*
897@@ -1029,7 +1029,7 @@
898 if (pTemp == NULL)
899 {
900 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
901- clearPixel(dest);
902+ this->clearPixel(dest);
903 } else {
904
905 /*
906@@ -1190,6 +1190,9 @@
907 *
908 * CVS/RCS Log:
909 * $Log: discalet.h,v $
910+ * Revision 1.36 2011-11-17 16:13:16 joergr
911+ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
912+ *
913 * Revision 1.35 2010-10-14 13:16:27 joergr
914 * Updated copyright header. Added reference to COPYRIGHT file.
915 *
916diff -Naur dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/ofoset.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/ofoset.h
917--- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/ofoset.h 2010-10-14 09:15:50.000000000 -0400
918+++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/ofoset.h 2012-07-25 21:32:05.301212592 -0400
919@@ -1,6 +1,6 @@
920 /*
921 *
922- * Copyright (C) 2002-2010, OFFIS e.V.
923+ * Copyright (C) 2002-2011, OFFIS e.V.
924 * All rights reserved. See COPYRIGHT file for details.
925 *
926 * This software and supporting documentation were developed by
927@@ -19,8 +19,8 @@
928 * of an arbitrary type.
929 *
930 * Last Update: $Author: joergr $
931- * Update Date: $Date: 2010-10-14 13:15:50 $
932- * CVS/RCS Revision: $Revision: 1.11 $
933+ * Update Date: $Date: 2011-11-17 16:13:18 $
934+ * CVS/RCS Revision: $Revision: 1.12 $
935 * Status: $State: Exp $
936 *
937 * CVS/RCS Log at end of file
938@@ -146,7 +146,7 @@
939 {
940 // if size equals num, we need more space
941 if( this->size == this->num )
942- Resize( this->size * 2 );
943+ this->Resize( this->size * 2 );
944
945 // copy item
946 T *newItem = new T( item );
947@@ -189,7 +189,7 @@
948 {
949 // if size equals num, we need more space
950 if( this->size == this->num )
951- Resize( this->size * 2 );
952+ this->Resize( this->size * 2 );
953
954 // copy item
955 T *newItem = new T( item );
956@@ -508,6 +508,9 @@
957 /*
958 ** CVS/RCS Log:
959 ** $Log: ofoset.h,v $
960+** Revision 1.12 2011-11-17 16:13:18 joergr
961+** Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
962+**
963 ** Revision 1.11 2010-10-14 13:15:50 joergr
964 ** Updated copyright header. Added reference to COPYRIGHT file.
965 **
DICOM Toolkit - implementation of DICOM/MEDICOM standard
This page took 0.189563 seconds and 4 git commands to generate.