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