Mercurial > mxe-octave

annotate src/dcmtk-1-fixes.patch @ 2304:e2767e842034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package dcmtk: gcc 4.7.0 compatibility fixes --- src/dcmtk-1-fixes.patch | 361 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 src/dcmtk-1-fixes.patch
author Mark Brand <mabrand@mabrand.nl>
date Sat, 24 Mar 2012 02:56:03 +0100
parents
children 31f5cbd108a2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2304
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 From b374977b85b63b3fbe820a109a2f676c9b8c7662 Mon Sep 17 00:00:00 2001
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 From: mingw-cross-env
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Sat, 24 Mar 2012 02:07:22 +0100
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 Subject: [PATCH] gcc 4.7.0 compatibility fix
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 7e3894d..a25c1f7 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -91,7 +91,7 @@ class DiARGBPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 { // not very much optimized, but no one really uses ARGB !!
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 register T2 value;
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 index 5357780..4050ec6 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 --- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 +++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 @@ -87,7 +87,7 @@ class DiCMYKPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 // use the number of input pixels derived from the length of the 'PixelData'
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 // attribute), but not more than the size of the intermediate buffer
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 index 0c06de7..9770770 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 --- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 +++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 @@ -86,7 +86,7 @@ class DiColorCopyTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 inline void copy(const T *pixel[3],
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 const unsigned long offset)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 for (int j = 0; j < 3; j++)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 index a5bed81..9c339f6 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 --- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 +++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 @@ -98,14 +98,14 @@ class DiColorFlipTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 const int horz,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 const int vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 if (horz && vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 - flipHorzVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 + this->flipHorzVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 else if (horz)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 - flipHorz(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 + this->flipHorz(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 else if (vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 - flipVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 + this->flipVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 };
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 index 2bcd71e..9169f41 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76 --- a/dcmimage/include/dcmtk/dcmimage/dicorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 +++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 @@ -98,14 +98,14 @@ class DiColorRotateTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 inline void rotate(const T *pixel[3],
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 const int degree)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 if (degree == 90)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 - rotateRight(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 + this->rotateRight(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 else if (degree == 180)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 - rotateTopDown(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 + this->rotateTopDown(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91 else if (degree == 270)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92 - rotateLeft(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 + this->rotateLeft(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
94 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
95 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96 };
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97 diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
98 index 006a829..045b04f 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
99 --- a/dcmimage/include/dcmtk/dcmimage/dicosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
100 +++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
101 @@ -107,8 +107,8 @@ class DiColorScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
102 inline void scale(const T *pixel[3],
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103 const int interpolate)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
105 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 - scaleData(pixel, this->Data, interpolate);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108 + this->scaleData(pixel, this->Data, interpolate);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110 };
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112 diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113 index 10d8b70..d2c160b 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 --- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115 +++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
116 @@ -87,7 +87,7 @@ class DiHSVPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
118 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
122 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123 register T2 *r = this->Data[0];
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 register T2 *g = this->Data[1];
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125 diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 index 2e5eef7..875dac8 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 --- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
128 +++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
129 @@ -92,7 +92,7 @@ class DiPalettePixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
130 void convert(const T1 *pixel,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
131 DiLookupTable *palette[3])
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
132 { // can be optimized if necessary !
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
133 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
134 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
135 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
136 register const T1 *p = pixel;
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
137 register T2 value = 0;
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
138 diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
139 index 85f973d..ff18aaf 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
140 --- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
141 +++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
142 @@ -87,7 +87,7 @@ class DiRGBPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
143 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
144 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
145 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
146 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
147 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
148 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
149 // use the number of input pixels derived from the length of the 'PixelData'
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
150 // attribute), but not more than the size of the intermediate buffer
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
151 diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
152 index 6b523fb..1aff8d0 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
153 --- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
154 +++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
155 @@ -91,7 +91,7 @@ class DiYBRPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
156 const int bits,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
157 const OFBool rgb)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
158 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
159 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
160 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
161 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
162 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
163 // use the number of input pixels derived from the length of the 'PixelData'
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
164 diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
165 index ed27796..34343e5 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
166 --- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
167 +++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
168 @@ -95,7 +95,7 @@ class DiYBR422PixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
169 const int bits,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
170 const OFBool rgb)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
171 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
172 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
173 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
174 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
175 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
176 register unsigned long i;
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
177 diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
178 index 518fed7..0c86165 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
179 --- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
180 +++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
181 @@ -91,7 +91,7 @@ class DiYBRPart422PixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
182 void convert(const T1 *pixel,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
183 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
184 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
185 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
186 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
187 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
188 register T2 *r = this->Data[0];
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
189 register T2 *g = this->Data[1];
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
190 diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
191 index 4933fe1..cb8d5e1 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
192 --- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
193 +++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
194 @@ -129,7 +129,7 @@ class DiFlipTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
195 else if (vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
196 flipVert(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
197 else
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
198 - copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
199 + this->copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
200 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
201 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
202
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
203 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
204 index a88ab9d..da860fe 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
205 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
206 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
207 @@ -106,11 +106,11 @@ class DiMonoFlipTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
208 if (this->Data != NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
209 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
210 if (horz && vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
211 - flipHorzVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
212 + this->flipHorzVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
213 else if (horz)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
214 - flipHorz(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
215 + this->flipHorz(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
216 else if (vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
217 - flipVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
218 + this->flipVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
219 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
220 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
221 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
222 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
223 index e815e90..51603ea 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
224 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
225 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
226 @@ -76,10 +76,10 @@ class DiMonoInputPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
227 else if ((this->Modality != NULL) && this->Modality->hasRescaling())
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
228 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
229 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
230 - determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
231 + this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
232 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
233 rescale(pixel); // "copy" or reference pixel data
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
234 - determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
235 + this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
236 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
237 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
238 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
239 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
240 index 4ef277d..19f9a98 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
241 --- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
242 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
243 @@ -105,11 +105,11 @@ class DiMonoRotateTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
244 if (this->Data != NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
245 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
246 if (degree == 90)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
247 - rotateRight(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
248 + this->rotateRight(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
249 else if (degree == 180)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
250 - rotateTopDown(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
251 + this->rotateTopDown(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
252 else if (degree == 270)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
253 - rotateLeft(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
254 + this->rotateLeft(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
255 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
256 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
257 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
258 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
259 index 60c9abb..9a46187 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
260 --- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
261 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
262 @@ -124,7 +124,7 @@ class DiMonoScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
263 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
264 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
265 OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
266 - scaleData(&pixel, &this->Data, interpolate, value);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
267 + this->scaleData(&pixel, &this->Data, interpolate, value);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
268 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
269 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
270 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
271 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
272 index edb452e..6ae6bbe 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
273 --- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
274 +++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
275 @@ -132,7 +132,7 @@ class DiRotateTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
276 else if (degree == 270)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
277 rotateLeft(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
278 else
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
279 - copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
280 + this->copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
281 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
282
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
283
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
284 diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
285 index 758dde2..5ccf0f6 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
286 --- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
287 +++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
288 @@ -206,17 +206,17 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
289 (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
290 { // no image to be displayed
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
291 DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
292 - fillPixel(dest, value); // ... fill bitmap
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
293 + this->fillPixel(dest, value); // ... fill bitmap
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
294 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
295 else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
296 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
297 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
298 - copyPixel(src, dest); // copying
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
299 + this->copyPixel(src, dest); // copying
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
300 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
301 (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
302 - clipPixel(src, dest); // clipping
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
303 + this->clipPixel(src, dest); // clipping
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
304 else
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
305 - clipBorderPixel(src, dest, value); // clipping (with border)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
306 + this->clipBorderPixel(src, dest, value); // clipping (with border)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
307 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
308 else if ((interpolate == 1) && (this->Bits <= MAX_INTERPOLATION_BITS))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
309 interpolatePixel(src, dest); // interpolation (pbmplus)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
310 @@ -567,7 +567,7 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
311 if ((xtemp == NULL) || (xvalue == NULL))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
312 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
313 DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
314 - clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
315 + this->clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
316 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
317 for (int j = 0; j < this->Planes; ++j)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
318 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
319 @@ -905,7 +905,7 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
320 if (pTemp == NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
321 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
322 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
323 - clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
324 + this->clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
325 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
326
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
327 /*
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
328 @@ -1029,7 +1029,7 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
329 if (pTemp == NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
330 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
331 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
332 - clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
333 + this->clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
334 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
335
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
336 /*
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
337 diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
338 index 1a7f208..ee48743 100644
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
339 --- a/ofstd/include/dcmtk/ofstd/ofoset.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
340 +++ b/ofstd/include/dcmtk/ofstd/ofoset.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
341 @@ -146,7 +146,7 @@ template <class T> class OFOrderedSet : public OFSet<T>
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
342 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
343 // if size equals num, we need more space
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
344 if( this->size == this->num )
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
345 - Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
346 + this->Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
347
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
348 // copy item
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
349 T *newItem = new T( item );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
350 @@ -189,7 +189,7 @@ template <class T> class OFOrderedSet : public OFSet<T>
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
351 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
352 // if size equals num, we need more space
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
353 if( this->size == this->num )
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
354 - Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
355 + this->Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
356
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
357 // copy item
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
358 T *newItem = new T( item );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
359 --
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
360 1.7.9.2
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
361