wok-next annotate dcmtk/stuff/patches/minor-fixes.patch @ rev 20636

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