wok-next rev 20291
dcmtk: add patch
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Nov 08 18:13:10 2017 +0100 (2017-11-08) |
| parents | e5c33b869503 |
| children | d3adbeea3a9f |
| files | dcmtk-dev/receipt dcmtk/receipt dcmtk/stuff/patches/minor-fixes.patch dcmtk/stuff/patches/series |
line diff
1.1 --- a/dcmtk-dev/receipt Wed Nov 08 17:35:25 2017 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,19 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="dcmtk-dev" 1.7 -VERSION="3.6.0" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="The DICOM Toolkit, development files." 1.10 -MAINTAINER="pascal.bellard@slitaz.org" 1.11 -LICENSE="other" 1.12 -WEB_SITE="http://dicom.offis.de/dcmtk" 1.13 -WANTED="dcmtk" 1.14 -DEPENDS="dcmtk" 1.15 - 1.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.17 -genpkg_rules() 1.18 -{ 1.19 - mkdir -p $fs/usr/include/dcmtk $fs/usr/lib 1.20 - cp -a $src/*/include/dcmtk/* $fs/usr/include/dcmtk 1.21 - cp -a $src/*/*/*a $fs/usr/lib 1.22 -}
2.1 --- a/dcmtk/receipt Wed Nov 08 17:35:25 2017 +0100 2.2 +++ b/dcmtk/receipt Wed Nov 08 18:13:10 2017 +0100 2.3 @@ -1,17 +1,17 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="dcmtk" 2.8 VERSION="3.6.0" 2.9 CATEGORY="misc" 2.10 -SHORT_DESC="The DICOM Toolkit." 2.11 +SHORT_DESC="The DICOM Toolkit" 2.12 MAINTAINER="pascal.bellard@slitaz.org" 2.13 LICENSE="other" 2.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.15 WEB_SITE="http://dicom.offis.de/dcmtk" 2.16 WGET_URL="ftp://dicom.offis.de/pub/dicom/offis/software/$PACKAGE/$PACKAGE${VERSION//./}/$TARBALL" 2.17 2.18 -DEPENDS="libxml2 tiff libpng libwrap" 2.19 BUILD_DEPENDS="libxml2-dev tiff-dev libpng-dev zlib-dev libwrap-dev" 2.20 +SPLIT="dcmtk dcmtk-dev" 2.21 2.22 # Rules to configure and make the package. 2.23 compile_rules() 2.24 @@ -27,5 +27,18 @@ 2.25 # Rules to gen a SliTaz package suitable for Tazpkg. 2.26 genpkg_rules() 2.27 { 2.28 - cp -a $install/* $fs/ 2.29 + case $PACKAGE in 2.30 + dcmtk) 2.31 + DEPENDS="libxml2 tiff libpng libwrap" 2.32 + cp -a $install/* $fs/ 2.33 + ;; 2.34 + dcmtk-dev) 2.35 + CAT="development|development files" 2.36 + MAINTAINER="pascal.bellard@slitaz.org" 2.37 + DEPENDS="dcmtk" 2.38 + mkdir -p $fs/usr/include/dcmtk $fs/usr/lib 2.39 + cp -a $src/*/include/dcmtk/* $fs/usr/include/dcmtk 2.40 + cp -a $src/*/*/*a $fs/usr/lib 2.41 + ;; 2.42 + esac 2.43 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/dcmtk/stuff/patches/minor-fixes.patch Wed Nov 08 18:13:10 2017 +0100 3.3 @@ -0,0 +1,1092 @@ 3.4 +From dbadc0d8f3760f65504406c8b2cb8633f868a258 Mon Sep 17 00:00:00 2001 3.5 +From: Joerg Riesmeier <dicom@offis.de> 3.6 +Date: Thu, 17 Nov 2011 16:13:14 +0000 3.7 +Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang 3.8 + compiler) quiet. 3.9 + 3.10 +--- 3.11 + CHANGES.361 | 24 ++++++++++++++++++++++++ 3.12 + dcmimage/include/dcmtk/dcmimage/diargpxt.h | 25 ++++++++++++++----------- 3.13 + dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 11 +++++++---- 3.14 + dcmimage/include/dcmtk/dcmimage/dicocpt.h | 11 +++++++---- 3.15 + dcmimage/include/dcmtk/dcmimage/dicoflt.h | 17 ++++++++++------- 3.16 + dcmimage/include/dcmtk/dcmimage/dicorot.h | 17 ++++++++++------- 3.17 + dcmimage/include/dcmtk/dcmimage/dicosct.h | 13 ++++++++----- 3.18 + dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 11 +++++++---- 3.19 + dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 11 +++++++---- 3.20 + dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 15 +++++++++------ 3.21 + dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 15 +++++++++------ 3.22 + dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 11 +++++++---- 3.23 + dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 11 +++++++---- 3.24 + dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 11 +++++++---- 3.25 + dcmimgle/include/dcmtk/dcmimgle/dimoflt.h | 15 +++++++++------ 3.26 + dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 13 ++++++++----- 3.27 + dcmimgle/include/dcmtk/dcmimgle/dimorot.h | 15 +++++++++------ 3.28 + dcmimgle/include/dcmtk/dcmimgle/dimosct.h | 11 +++++++---- 3.29 + dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 11 +++++++---- 3.30 + dcmimgle/include/dcmtk/dcmimgle/discalet.h | 19 +++++++++++-------- 3.31 + ofstd/include/dcmtk/ofstd/ofoset.h | 13 ++++++++----- 3.32 + ofstd/libsrc/ofchrenc.cc | 13 +++++++++++-- 3.33 + 22 files changed, 203 insertions(+), 110 deletions(-) 3.34 + 3.35 +diff --git a/CHANGES.361 b/CHANGES.361 3.36 +index 193378a0c..2d756bddd 100644 3.37 +--- a/CHANGES.361 3.38 ++++ b/CHANGES.361 3.39 +@@ -3,6 +3,30 @@ Changes between releases are documented here. 3.40 + 3.41 + **** Changes from 2011.11.17 (riesmeier) 3.42 + 3.43 ++- Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.44 ++ Thanks to Daniele Giunchi <d.giunchi@scsitaly.com> for the suggested patch. 3.45 ++ Affects: dcmimage/include/dcmtk/dcmimage/diargpxt.h 3.46 ++ dcmimage/include/dcmtk/dcmimage/dicmypxt.h 3.47 ++ dcmimage/include/dcmtk/dcmimage/dicocpt.h 3.48 ++ dcmimage/include/dcmtk/dcmimage/dicoflt.h 3.49 ++ dcmimage/include/dcmtk/dcmimage/dicorot.h 3.50 ++ dcmimage/include/dcmtk/dcmimage/dicosct.h 3.51 ++ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 3.52 ++ dcmimage/include/dcmtk/dcmimage/dipalpxt.h 3.53 ++ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 3.54 ++ dcmimage/include/dcmtk/dcmimage/diybrpxt.h 3.55 ++ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 3.56 ++ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 3.57 ++ dcmimgle/include/dcmtk/dcmimgle/diflipt.h 3.58 ++ dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 3.59 ++ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 3.60 ++ dcmimgle/include/dcmtk/dcmimgle/dimorot.h 3.61 ++ dcmimgle/include/dcmtk/dcmimgle/dimosct.h 3.62 ++ dcmimgle/include/dcmtk/dcmimgle/dirotat.h 3.63 ++ dcmimgle/include/dcmtk/dcmimgle/discalet.h 3.64 ++ ofstd/include/dcmtk/ofstd/ofoset.h 3.65 ++ ofstd/libsrc/ofchrenc.cc 3.66 ++ 3.67 + - Slightly modified code in order to avoid the use of the OFCondition default 3.68 + constructor. 3.69 + Affects: dcmdata/libsrc/dcdicdir.cc 3.70 +diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h 3.71 +index 7e3894d53..1ed9291e8 100644 3.72 +--- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h 3.73 ++++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h 3.74 +@@ -1,6 +1,6 @@ 3.75 + /* 3.76 + * 3.77 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.78 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.79 + * All rights reserved. See COPYRIGHT file for details. 3.80 + * 3.81 + * This software and supporting documentation were developed by 3.82 +@@ -18,8 +18,8 @@ 3.83 + * Purpose: DicomARGBPixelTemplate (Header) - UNTESTED !!! 3.84 + * 3.85 + * Last Update: $Author: joergr $ 3.86 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.87 +- * CVS/RCS Revision: $Revision: 1.21 $ 3.88 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.89 ++ * CVS/RCS Revision: $Revision: 1.22 $ 3.90 + * Status: $State: Exp $ 3.91 + * 3.92 + * CVS/RCS Log at end of file 3.93 +@@ -91,7 +91,7 @@ class DiARGBPixelTemplate 3.94 + const unsigned long planeSize, 3.95 + const int bits) 3.96 + { // not very much optimized, but no one really uses ARGB !! 3.97 +- if (Init(pixel)) 3.98 ++ if (this->Init(pixel)) 3.99 + { 3.100 + register T2 value; 3.101 + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); 3.102 +@@ -103,9 +103,9 @@ class DiARGBPixelTemplate 3.103 + /* 3.104 + register const T1 *a = pixel; // points to alpha plane 3.105 + const T1 *rgb[3]; 3.106 +- rgb[0] = a + this->InputCount; // points to red plane 3.107 +- rgb[1] = rgb[0] + this->InputCount; // points to green plane 3.108 +- rgb[2] = rgb[1] + this->InputCount; // points to blue plane 3.109 ++ rgb[0] = a + this->InputCount; // points to red plane 3.110 ++ rgb[1] = rgb[0] + this->InputCount; // points to green plane 3.111 ++ rgb[2] = rgb[1] + this->InputCount; // points to blue plane 3.112 + for (i = 0; i < count; ++i) 3.113 + { 3.114 + value = OFstatic_cast(T2, *(a++)); // get alpha value 3.115 +@@ -141,10 +141,10 @@ class DiARGBPixelTemplate 3.116 + /* convert a single frame */ 3.117 + for (l = planeSize; (l != 0) && (i < count); --l, ++i) 3.118 + { 3.119 +- value = OFstatic_cast(T2, *(a++)); // get alpha value 3.120 ++ value = OFstatic_cast(T2, *(a++)); // get alpha value 3.121 + if (value > 0) 3.122 + { 3.123 +- for (int j = 0; j < 3; ++j) // set palette color 3.124 ++ for (int j = 0; j < 3; ++j) // set palette color 3.125 + { 3.126 + if (value <= palette[j]->getFirstEntry(value)) 3.127 + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getFirstValue()); 3.128 +@@ -152,12 +152,12 @@ class DiARGBPixelTemplate 3.129 + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getLastValue()); 3.130 + else 3.131 + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getValue(value)); 3.132 +- ++rgb[j]; // skip RGB values 3.133 ++ ++rgb[j]; // skip RGB values 3.134 + } 3.135 + } 3.136 + else 3.137 + { 3.138 +- for (int j = 0; j < 3; ++j) // copy RGB values 3.139 ++ for (int j = 0; j < 3; ++j) // copy RGB values 3.140 + this->Data[j][i] = OFstatic_cast(T3, removeSign(*(rgb[j]++), offset)); 3.141 + } 3.142 + } 3.143 +@@ -204,6 +204,9 @@ class DiARGBPixelTemplate 3.144 + * 3.145 + * CVS/RCS Log: 3.146 + * $Log: diargpxt.h,v $ 3.147 ++ * Revision 1.22 2011-11-17 16:13:14 joergr 3.148 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.149 ++ * 3.150 + * Revision 1.21 2010-10-14 13:16:29 joergr 3.151 + * Updated copyright header. Added reference to COPYRIGHT file. 3.152 + * 3.153 +diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 3.154 +index 5357780e9..bf1161ec2 100644 3.155 +--- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 3.156 ++++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 3.157 +@@ -1,6 +1,6 @@ 3.158 + /* 3.159 + * 3.160 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.161 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.162 + * All rights reserved. See COPYRIGHT file for details. 3.163 + * 3.164 + * This software and supporting documentation were developed by 3.165 +@@ -18,8 +18,8 @@ 3.166 + * Purpose: DicomCMYKPixelTemplate (Header) 3.167 + * 3.168 + * Last Update: $Author: joergr $ 3.169 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.170 +- * CVS/RCS Revision: $Revision: 1.20 $ 3.171 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.172 ++ * CVS/RCS Revision: $Revision: 1.21 $ 3.173 + * Status: $State: Exp $ 3.174 + * 3.175 + * CVS/RCS Log at end of file 3.176 +@@ -87,7 +87,7 @@ class DiCMYKPixelTemplate 3.177 + const unsigned long planeSize, 3.178 + const int bits) 3.179 + { 3.180 +- if (Init(pixel)) 3.181 ++ if (this->Init(pixel)) 3.182 + { 3.183 + // use the number of input pixels derived from the length of the 'PixelData' 3.184 + // attribute), but not more than the size of the intermediate buffer 3.185 +@@ -157,6 +157,9 @@ class DiCMYKPixelTemplate 3.186 + * 3.187 + * CVS/RCS Log: 3.188 + * $Log: dicmypxt.h,v $ 3.189 ++ * Revision 1.21 2011-11-17 16:13:14 joergr 3.190 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.191 ++ * 3.192 + * Revision 1.20 2010-10-14 13:16:29 joergr 3.193 + * Updated copyright header. Added reference to COPYRIGHT file. 3.194 + * 3.195 +diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h 3.196 +index 0c06de70f..3f03b6bd9 100644 3.197 +--- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h 3.198 ++++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h 3.199 +@@ -1,6 +1,6 @@ 3.200 + /* 3.201 + * 3.202 +- * Copyright (C) 1998-2010, OFFIS e.V. 3.203 ++ * Copyright (C) 1998-2011, OFFIS e.V. 3.204 + * All rights reserved. See COPYRIGHT file for details. 3.205 + * 3.206 + * This software and supporting documentation were developed by 3.207 +@@ -18,8 +18,8 @@ 3.208 + * Purpose: DicomColorCopyTemplate (Header) 3.209 + * 3.210 + * Last Update: $Author: joergr $ 3.211 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.212 +- * CVS/RCS Revision: $Revision: 1.12 $ 3.213 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.214 ++ * CVS/RCS Revision: $Revision: 1.13 $ 3.215 + * Status: $State: Exp $ 3.216 + * 3.217 + * CVS/RCS Log at end of file 3.218 +@@ -86,7 +86,7 @@ class DiColorCopyTemplate 3.219 + inline void copy(const T *pixel[3], 3.220 + const unsigned long offset) 3.221 + { 3.222 +- if (Init(pixel)) 3.223 ++ if (this->Init(pixel)) 3.224 + { 3.225 + for (int j = 0; j < 3; j++) 3.226 + OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount()); 3.227 +@@ -102,6 +102,9 @@ class DiColorCopyTemplate 3.228 + * 3.229 + * CVS/RCS Log: 3.230 + * $Log: dicocpt.h,v $ 3.231 ++ * Revision 1.13 2011-11-17 16:13:14 joergr 3.232 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.233 ++ * 3.234 + * Revision 1.12 2010-10-14 13:16:29 joergr 3.235 + * Updated copyright header. Added reference to COPYRIGHT file. 3.236 + * 3.237 +diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h 3.238 +index a5bed8155..bc809ab6b 100644 3.239 +--- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h 3.240 ++++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h 3.241 +@@ -1,6 +1,6 @@ 3.242 + /* 3.243 + * 3.244 +- * Copyright (C) 1998-2010, OFFIS e.V. 3.245 ++ * Copyright (C) 1998-2011, OFFIS e.V. 3.246 + * All rights reserved. See COPYRIGHT file for details. 3.247 + * 3.248 + * This software and supporting documentation were developed by 3.249 +@@ -18,8 +18,8 @@ 3.250 + * Purpose: DicomColorFlipTemplate (Header) 3.251 + * 3.252 + * Last Update: $Author: joergr $ 3.253 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.254 +- * CVS/RCS Revision: $Revision: 1.15 $ 3.255 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.256 ++ * CVS/RCS Revision: $Revision: 1.16 $ 3.257 + * Status: $State: Exp $ 3.258 + * 3.259 + * CVS/RCS Log at end of file 3.260 +@@ -98,14 +98,14 @@ class DiColorFlipTemplate 3.261 + const int horz, 3.262 + const int vert) 3.263 + { 3.264 +- if (Init(pixel)) 3.265 ++ if (this->Init(pixel)) 3.266 + { 3.267 + if (horz && vert) 3.268 +- flipHorzVert(pixel, this->Data); 3.269 ++ this->flipHorzVert(pixel, this->Data); 3.270 + else if (horz) 3.271 +- flipHorz(pixel, this->Data); 3.272 ++ this->flipHorz(pixel, this->Data); 3.273 + else if (vert) 3.274 +- flipVert(pixel, this->Data); 3.275 ++ this->flipVert(pixel, this->Data); 3.276 + } 3.277 + } 3.278 + }; 3.279 +@@ -118,6 +118,9 @@ class DiColorFlipTemplate 3.280 + * 3.281 + * CVS/RCS Log: 3.282 + * $Log: dicoflt.h,v $ 3.283 ++ * Revision 1.16 2011-11-17 16:13:14 joergr 3.284 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.285 ++ * 3.286 + * Revision 1.15 2010-10-14 13:16:29 joergr 3.287 + * Updated copyright header. Added reference to COPYRIGHT file. 3.288 + * 3.289 +diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h 3.290 +index 2bcd71e41..c8afd7003 100644 3.291 +--- a/dcmimage/include/dcmtk/dcmimage/dicorot.h 3.292 ++++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h 3.293 +@@ -1,6 +1,6 @@ 3.294 + /* 3.295 + * 3.296 +- * Copyright (C) 1998-2010, OFFIS e.V. 3.297 ++ * Copyright (C) 1998-2011, OFFIS e.V. 3.298 + * All rights reserved. See COPYRIGHT file for details. 3.299 + * 3.300 + * This software and supporting documentation were developed by 3.301 +@@ -18,8 +18,8 @@ 3.302 + * Purpose: DicomColorRotateTemplate (Header) 3.303 + * 3.304 + * Last Update: $Author: joergr $ 3.305 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.306 +- * CVS/RCS Revision: $Revision: 1.15 $ 3.307 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.308 ++ * CVS/RCS Revision: $Revision: 1.16 $ 3.309 + * Status: $State: Exp $ 3.310 + * 3.311 + * CVS/RCS Log at end of file 3.312 +@@ -98,14 +98,14 @@ class DiColorRotateTemplate 3.313 + inline void rotate(const T *pixel[3], 3.314 + const int degree) 3.315 + { 3.316 +- if (Init(pixel)) 3.317 ++ if (this->Init(pixel)) 3.318 + { 3.319 + if (degree == 90) 3.320 +- rotateRight(pixel, this->Data); 3.321 ++ this->rotateRight(pixel, this->Data); 3.322 + else if (degree == 180) 3.323 +- rotateTopDown(pixel, this->Data); 3.324 ++ this->rotateTopDown(pixel, this->Data); 3.325 + else if (degree == 270) 3.326 +- rotateLeft(pixel, this->Data); 3.327 ++ this->rotateLeft(pixel, this->Data); 3.328 + } 3.329 + } 3.330 + }; 3.331 +@@ -118,6 +118,9 @@ class DiColorRotateTemplate 3.332 + * 3.333 + * CVS/RCS Log: 3.334 + * $Log: dicorot.h,v $ 3.335 ++ * Revision 1.16 2011-11-17 16:13:14 joergr 3.336 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.337 ++ * 3.338 + * Revision 1.15 2010-10-14 13:16:29 joergr 3.339 + * Updated copyright header. Added reference to COPYRIGHT file. 3.340 + * 3.341 +diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h 3.342 +index 006a82997..3bccc452e 100644 3.343 +--- a/dcmimage/include/dcmtk/dcmimage/dicosct.h 3.344 ++++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h 3.345 +@@ -1,6 +1,6 @@ 3.346 + /* 3.347 + * 3.348 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.349 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.350 + * All rights reserved. See COPYRIGHT file for details. 3.351 + * 3.352 + * This software and supporting documentation were developed by 3.353 +@@ -18,8 +18,8 @@ 3.354 + * Purpose: DicomColorScaleTemplate (Header) 3.355 + * 3.356 + * Last Update: $Author: joergr $ 3.357 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.358 +- * CVS/RCS Revision: $Revision: 1.21 $ 3.359 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.360 ++ * CVS/RCS Revision: $Revision: 1.22 $ 3.361 + * Status: $State: Exp $ 3.362 + * 3.363 + * CVS/RCS Log at end of file 3.364 +@@ -107,8 +107,8 @@ class DiColorScaleTemplate 3.365 + inline void scale(const T *pixel[3], 3.366 + const int interpolate) 3.367 + { 3.368 +- if (Init(pixel)) 3.369 +- scaleData(pixel, this->Data, interpolate); 3.370 ++ if (this->Init(pixel)) 3.371 ++ this->scaleData(pixel, this->Data, interpolate); 3.372 + } 3.373 + }; 3.374 + 3.375 +@@ -120,6 +120,9 @@ class DiColorScaleTemplate 3.376 + * 3.377 + * CVS/RCS Log: 3.378 + * $Log: dicosct.h,v $ 3.379 ++ * Revision 1.22 2011-11-17 16:13:14 joergr 3.380 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.381 ++ * 3.382 + * Revision 1.21 2010-10-14 13:16:29 joergr 3.383 + * Updated copyright header. Added reference to COPYRIGHT file. 3.384 + * 3.385 +diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 3.386 +index 10d8b70ab..52580ec51 100644 3.387 +--- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 3.388 ++++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 3.389 +@@ -1,6 +1,6 @@ 3.390 + /* 3.391 + * 3.392 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.393 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.394 + * All rights reserved. See COPYRIGHT file for details. 3.395 + * 3.396 + * This software and supporting documentation were developed by 3.397 +@@ -18,8 +18,8 @@ 3.398 + * Purpose: DicomHSVPixelTemplate (Header) 3.399 + * 3.400 + * Last Update: $Author: joergr $ 3.401 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.402 +- * CVS/RCS Revision: $Revision: 1.25 $ 3.403 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.404 ++ * CVS/RCS Revision: $Revision: 1.26 $ 3.405 + * Status: $State: Exp $ 3.406 + * 3.407 + * CVS/RCS Log at end of file 3.408 +@@ -87,7 +87,7 @@ class DiHSVPixelTemplate 3.409 + const unsigned long planeSize, 3.410 + const int bits) 3.411 + { 3.412 +- if (Init(pixel)) 3.413 ++ if (this->Init(pixel)) 3.414 + { 3.415 + register T2 *r = this->Data[0]; 3.416 + register T2 *g = this->Data[1]; 3.417 +@@ -221,6 +221,9 @@ class DiHSVPixelTemplate 3.418 + * 3.419 + * CVS/RCS Log: 3.420 + * $Log: dihsvpxt.h,v $ 3.421 ++ * Revision 1.26 2011-11-17 16:13:14 joergr 3.422 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.423 ++ * 3.424 + * Revision 1.25 2010-10-14 13:16:29 joergr 3.425 + * Updated copyright header. Added reference to COPYRIGHT file. 3.426 + * 3.427 +diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 3.428 +index 2e5eef7a0..1ae235279 100644 3.429 +--- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 3.430 ++++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 3.431 +@@ -1,6 +1,6 @@ 3.432 + /* 3.433 + * 3.434 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.435 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.436 + * All rights reserved. See COPYRIGHT file for details. 3.437 + * 3.438 + * This software and supporting documentation were developed by 3.439 +@@ -18,8 +18,8 @@ 3.440 + * Purpose: DicomPalettePixelTemplate (Header) 3.441 + * 3.442 + * Last Update: $Author: joergr $ 3.443 +- * Update Date: $Date: 2010-10-14 13:16:29 $ 3.444 +- * CVS/RCS Revision: $Revision: 1.24 $ 3.445 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.446 ++ * CVS/RCS Revision: $Revision: 1.25 $ 3.447 + * Status: $State: Exp $ 3.448 + * 3.449 + * CVS/RCS Log at end of file 3.450 +@@ -92,7 +92,7 @@ class DiPalettePixelTemplate 3.451 + void convert(const T1 *pixel, 3.452 + DiLookupTable *palette[3]) 3.453 + { // can be optimized if necessary ! 3.454 +- if (Init(pixel)) 3.455 ++ if (this->Init(pixel)) 3.456 + { 3.457 + register const T1 *p = pixel; 3.458 + register T2 value = 0; 3.459 +@@ -126,6 +126,9 @@ class DiPalettePixelTemplate 3.460 + * 3.461 + * CVS/RCS Log: 3.462 + * $Log: dipalpxt.h,v $ 3.463 ++ * Revision 1.25 2011-11-17 16:13:14 joergr 3.464 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.465 ++ * 3.466 + * Revision 1.24 2010-10-14 13:16:29 joergr 3.467 + * Updated copyright header. Added reference to COPYRIGHT file. 3.468 + * 3.469 +diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 3.470 +index 85f973d6b..d9cc7edb7 100644 3.471 +--- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 3.472 ++++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 3.473 +@@ -1,6 +1,6 @@ 3.474 + /* 3.475 + * 3.476 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.477 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.478 + * All rights reserved. See COPYRIGHT file for details. 3.479 + * 3.480 + * This software and supporting documentation were developed by 3.481 +@@ -18,8 +18,8 @@ 3.482 + * Purpose: DicomRGBPixelTemplate (Header) 3.483 + * 3.484 + * Last Update: $Author: joergr $ 3.485 +- * Update Date: $Date: 2010-10-14 13:16:30 $ 3.486 +- * CVS/RCS Revision: $Revision: 1.18 $ 3.487 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.488 ++ * CVS/RCS Revision: $Revision: 1.19 $ 3.489 + * Status: $State: Exp $ 3.490 + * 3.491 + * CVS/RCS Log at end of file 3.492 +@@ -87,7 +87,7 @@ class DiRGBPixelTemplate 3.493 + const unsigned long planeSize, 3.494 + const int bits) 3.495 + { 3.496 +- if (Init(pixel)) 3.497 ++ if (this->Init(pixel)) 3.498 + { 3.499 + // use the number of input pixels derived from the length of the 'PixelData' 3.500 + // attribute), but not more than the size of the intermediate buffer 3.501 +@@ -129,9 +129,9 @@ class DiRGBPixelTemplate 3.502 + { 3.503 + register int j; 3.504 + register unsigned long i; 3.505 +- for (i = 0; i < count; ++i) /* for all pixel ... */ 3.506 ++ for (i = 0; i < count; ++i) /* for all pixel ... */ 3.507 + for (j = 0; j < 3; ++j) 3.508 +- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ 3.509 ++ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ 3.510 + } 3.511 + } 3.512 + } 3.513 +@@ -145,6 +145,9 @@ class DiRGBPixelTemplate 3.514 + * 3.515 + * CVS/RCS Log: 3.516 + * $Log: dirgbpxt.h,v $ 3.517 ++ * Revision 1.19 2011-11-17 16:13:14 joergr 3.518 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.519 ++ * 3.520 + * Revision 1.18 2010-10-14 13:16:30 joergr 3.521 + * Updated copyright header. Added reference to COPYRIGHT file. 3.522 + * 3.523 +diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 3.524 +index 6b523fbca..ecd2038a1 100644 3.525 +--- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 3.526 ++++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 3.527 +@@ -1,6 +1,6 @@ 3.528 + /* 3.529 + * 3.530 +- * Copyright (C) 1998-2010, OFFIS e.V. 3.531 ++ * Copyright (C) 1998-2011, OFFIS e.V. 3.532 + * All rights reserved. See COPYRIGHT file for details. 3.533 + * 3.534 + * This software and supporting documentation were developed by 3.535 +@@ -18,8 +18,8 @@ 3.536 + * Purpose: DicomYBRPixelTemplate (Header) 3.537 + * 3.538 + * Last Update: $Author: joergr $ 3.539 +- * Update Date: $Date: 2010-10-14 13:16:30 $ 3.540 +- * CVS/RCS Revision: $Revision: 1.19 $ 3.541 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.542 ++ * CVS/RCS Revision: $Revision: 1.20 $ 3.543 + * Status: $State: Exp $ 3.544 + * 3.545 + * CVS/RCS Log at end of file 3.546 +@@ -91,7 +91,7 @@ class DiYBRPixelTemplate 3.547 + const int bits, 3.548 + const OFBool rgb) 3.549 + { 3.550 +- if (Init(pixel)) 3.551 ++ if (this->Init(pixel)) 3.552 + { 3.553 + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); 3.554 + // use the number of input pixels derived from the length of the 'PixelData' 3.555 +@@ -266,9 +266,9 @@ class DiYBRPixelTemplate 3.556 + { 3.557 + register int j; 3.558 + register unsigned long i; 3.559 +- for (i = 0; i < count; ++i) /* for all pixel ... */ 3.560 ++ for (i = 0; i < count; ++i) /* for all pixel ... */ 3.561 + for (j = 0; j < 3; ++j) 3.562 +- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ 3.563 ++ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ 3.564 + } 3.565 + } 3.566 + } 3.567 +@@ -295,6 +295,9 @@ class DiYBRPixelTemplate 3.568 + * 3.569 + * CVS/RCS Log: 3.570 + * $Log: diybrpxt.h,v $ 3.571 ++ * Revision 1.20 2011-11-17 16:13:14 joergr 3.572 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.573 ++ * 3.574 + * Revision 1.19 2010-10-14 13:16:30 joergr 3.575 + * Updated copyright header. Added reference to COPYRIGHT file. 3.576 + * 3.577 +diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 3.578 +index ed27796c1..93d28cca7 100644 3.579 +--- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 3.580 ++++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 3.581 +@@ -1,6 +1,6 @@ 3.582 + /* 3.583 + * 3.584 +- * Copyright (C) 1998-2010, OFFIS e.V. 3.585 ++ * Copyright (C) 1998-2011, OFFIS e.V. 3.586 + * All rights reserved. See COPYRIGHT file for details. 3.587 + * 3.588 + * This software and supporting documentation were developed by 3.589 +@@ -18,8 +18,8 @@ 3.590 + * Purpose: DicomYBR422PixelTemplate (Header) 3.591 + * 3.592 + * Last Update: $Author: joergr $ 3.593 +- * Update Date: $Date: 2010-10-14 13:16:30 $ 3.594 +- * CVS/RCS Revision: $Revision: 1.25 $ 3.595 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.596 ++ * CVS/RCS Revision: $Revision: 1.26 $ 3.597 + * Status: $State: Exp $ 3.598 + * 3.599 + * CVS/RCS Log at end of file 3.600 +@@ -95,7 +95,7 @@ class DiYBR422PixelTemplate 3.601 + const int bits, 3.602 + const OFBool rgb) 3.603 + { 3.604 +- if (Init(pixel)) 3.605 ++ if (this->Init(pixel)) 3.606 + { 3.607 + const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); 3.608 + register unsigned long i; 3.609 +@@ -167,6 +167,9 @@ class DiYBR422PixelTemplate 3.610 + * 3.611 + * CVS/RCS Log: 3.612 + * $Log: diyf2pxt.h,v $ 3.613 ++ * Revision 1.26 2011-11-17 16:13:14 joergr 3.614 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.615 ++ * 3.616 + * Revision 1.25 2010-10-14 13:16:30 joergr 3.617 + * Updated copyright header. Added reference to COPYRIGHT file. 3.618 + * 3.619 +diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 3.620 +index 518fed701..0dd9d5b21 100644 3.621 +--- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 3.622 ++++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 3.623 +@@ -1,6 +1,6 @@ 3.624 + /* 3.625 + * 3.626 +- * Copyright (C) 1998-2010, OFFIS e.V. 3.627 ++ * Copyright (C) 1998-2011, OFFIS e.V. 3.628 + * All rights reserved. See COPYRIGHT file for details. 3.629 + * 3.630 + * This software and supporting documentation were developed by 3.631 +@@ -18,8 +18,8 @@ 3.632 + * Purpose: DicomYBRPart422PixelTemplate (Header) 3.633 + * 3.634 + * Last Update: $Author: joergr $ 3.635 +- * Update Date: $Date: 2010-10-14 13:16:30 $ 3.636 +- * CVS/RCS Revision: $Revision: 1.23 $ 3.637 ++ * Update Date: $Date: 2011-11-17 16:13:14 $ 3.638 ++ * CVS/RCS Revision: $Revision: 1.24 $ 3.639 + * Status: $State: Exp $ 3.640 + * 3.641 + * CVS/RCS Log at end of file 3.642 +@@ -91,7 +91,7 @@ class DiYBRPart422PixelTemplate 3.643 + void convert(const T1 *pixel, 3.644 + const int bits) 3.645 + { 3.646 +- if (Init(pixel)) 3.647 ++ if (this->Init(pixel)) 3.648 + { 3.649 + register T2 *r = this->Data[0]; 3.650 + register T2 *g = this->Data[1]; 3.651 +@@ -147,6 +147,9 @@ class DiYBRPart422PixelTemplate 3.652 + * 3.653 + * CVS/RCS Log: 3.654 + * $Log: diyp2pxt.h,v $ 3.655 ++ * Revision 1.24 2011-11-17 16:13:14 joergr 3.656 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.657 ++ * 3.658 + * Revision 1.23 2010-10-14 13:16:30 joergr 3.659 + * Updated copyright header. Added reference to COPYRIGHT file. 3.660 + * 3.661 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 3.662 +index 4933fe1a8..05c198c1a 100644 3.663 +--- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 3.664 ++++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 3.665 +@@ -1,6 +1,6 @@ 3.666 + /* 3.667 + * 3.668 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.669 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.670 + * All rights reserved. See COPYRIGHT file for details. 3.671 + * 3.672 + * This software and supporting documentation were developed by 3.673 +@@ -18,8 +18,8 @@ 3.674 + * Purpose: DicomFlipTemplate (Header) 3.675 + * 3.676 + * Last Update: $Author: joergr $ 3.677 +- * Update Date: $Date: 2010-10-14 13:16:26 $ 3.678 +- * CVS/RCS Revision: $Revision: 1.23 $ 3.679 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.680 ++ * CVS/RCS Revision: $Revision: 1.24 $ 3.681 + * Status: $State: Exp $ 3.682 + * 3.683 + * CVS/RCS Log at end of file 3.684 +@@ -129,7 +129,7 @@ class DiFlipTemplate 3.685 + else if (vert) 3.686 + flipVert(src, dest); 3.687 + else 3.688 +- copyPixel(src, dest); 3.689 ++ this->copyPixel(src, dest); 3.690 + } 3.691 + } 3.692 + 3.693 +@@ -345,6 +345,9 @@ class DiFlipTemplate 3.694 + * 3.695 + * CVS/RCS Log: 3.696 + * $Log: diflipt.h,v $ 3.697 ++ * Revision 1.24 2011-11-17 16:13:16 joergr 3.698 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.699 ++ * 3.700 + * Revision 1.23 2010-10-14 13:16:26 joergr 3.701 + * Updated copyright header. Added reference to COPYRIGHT file. 3.702 + * 3.703 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 3.704 +index a88ab9d58..52d71a381 100644 3.705 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 3.706 ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 3.707 +@@ -1,6 +1,6 @@ 3.708 + /* 3.709 + * 3.710 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.711 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.712 + * All rights reserved. See COPYRIGHT file for details. 3.713 + * 3.714 + * This software and supporting documentation were developed by 3.715 +@@ -18,8 +18,8 @@ 3.716 + * Purpose: DicomMonochromeFlipTemplate (Header) 3.717 + * 3.718 + * Last Update: $Author: joergr $ 3.719 +- * Update Date: $Date: 2010-10-14 13:16:26 $ 3.720 +- * CVS/RCS Revision: $Revision: 1.15 $ 3.721 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.722 ++ * CVS/RCS Revision: $Revision: 1.16 $ 3.723 + * Status: $State: Exp $ 3.724 + * 3.725 + * CVS/RCS Log at end of file 3.726 +@@ -106,11 +106,11 @@ class DiMonoFlipTemplate 3.727 + if (this->Data != NULL) 3.728 + { 3.729 + if (horz && vert) 3.730 +- flipHorzVert(&pixel, &this->Data); 3.731 ++ this->flipHorzVert(&pixel, &this->Data); 3.732 + else if (horz) 3.733 +- flipHorz(&pixel, &this->Data); 3.734 ++ this->flipHorz(&pixel, &this->Data); 3.735 + else if (vert) 3.736 +- flipVert(&pixel, &this->Data); 3.737 ++ this->flipVert(&pixel, &this->Data); 3.738 + } 3.739 + } 3.740 + } 3.741 +@@ -124,6 +124,9 @@ class DiMonoFlipTemplate 3.742 + * 3.743 + * CVS/RCS Log: 3.744 + * $Log: dimoflt.h,v $ 3.745 ++ * Revision 1.16 2011-11-17 16:13:16 joergr 3.746 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.747 ++ * 3.748 + * Revision 1.15 2010-10-14 13:16:26 joergr 3.749 + * Updated copyright header. Added reference to COPYRIGHT file. 3.750 + * 3.751 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 3.752 +index e815e90a5..c190dd6da 100644 3.753 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 3.754 ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 3.755 +@@ -1,6 +1,6 @@ 3.756 + /* 3.757 + * 3.758 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.759 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.760 + * All rights reserved. See COPYRIGHT file for details. 3.761 + * 3.762 + * This software and supporting documentation were developed by 3.763 +@@ -18,8 +18,8 @@ 3.764 + * Purpose: DicomMonochromeInputPixelTemplate (Header) 3.765 + * 3.766 + * Last Update: $Author: joergr $ 3.767 +- * Update Date: $Date: 2010-10-14 13:16:26 $ 3.768 +- * CVS/RCS Revision: $Revision: 1.40 $ 3.769 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.770 ++ * CVS/RCS Revision: $Revision: 1.41 $ 3.771 + * Status: $State: Exp $ 3.772 + * 3.773 + * CVS/RCS Log at end of file 3.774 +@@ -76,10 +76,10 @@ class DiMonoInputPixelTemplate 3.775 + else if ((this->Modality != NULL) && this->Modality->hasRescaling()) 3.776 + { 3.777 + rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept()); 3.778 +- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); 3.779 ++ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); 3.780 + } else { 3.781 + rescale(pixel); // "copy" or reference pixel data 3.782 +- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); 3.783 ++ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); 3.784 + } 3.785 + } 3.786 + } 3.787 +@@ -280,6 +280,9 @@ class DiMonoInputPixelTemplate 3.788 + * 3.789 + * CVS/RCS Log: 3.790 + * $Log: dimoipxt.h,v $ 3.791 ++ * Revision 1.41 2011-11-17 16:13:16 joergr 3.792 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.793 ++ * 3.794 + * Revision 1.40 2010-10-14 13:16:26 joergr 3.795 + * Updated copyright header. Added reference to COPYRIGHT file. 3.796 + * 3.797 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 3.798 +index 4ef277d87..e729424af 100644 3.799 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 3.800 ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 3.801 +@@ -1,6 +1,6 @@ 3.802 + /* 3.803 + * 3.804 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.805 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.806 + * All rights reserved. See COPYRIGHT file for details. 3.807 + * 3.808 + * This software and supporting documentation were developed by 3.809 +@@ -18,8 +18,8 @@ 3.810 + * Purpose: DicomMonochromeRotateTemplate (Header) 3.811 + * 3.812 + * Last Update: $Author: joergr $ 3.813 +- * Update Date: $Date: 2010-10-14 13:16:26 $ 3.814 +- * CVS/RCS Revision: $Revision: 1.16 $ 3.815 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.816 ++ * CVS/RCS Revision: $Revision: 1.17 $ 3.817 + * Status: $State: Exp $ 3.818 + * 3.819 + * CVS/RCS Log at end of file 3.820 +@@ -105,11 +105,11 @@ class DiMonoRotateTemplate 3.821 + if (this->Data != NULL) 3.822 + { 3.823 + if (degree == 90) 3.824 +- rotateRight(&pixel, &(this->Data)); 3.825 ++ this->rotateRight(&pixel, &(this->Data)); 3.826 + else if (degree == 180) 3.827 +- rotateTopDown(&pixel, &(this->Data)); 3.828 ++ this->rotateTopDown(&pixel, &(this->Data)); 3.829 + else if (degree == 270) 3.830 +- rotateLeft(&pixel, &(this->Data)); 3.831 ++ this->rotateLeft(&pixel, &(this->Data)); 3.832 + } 3.833 + } 3.834 + } 3.835 +@@ -123,6 +123,9 @@ class DiMonoRotateTemplate 3.836 + * 3.837 + * CVS/RCS Log: 3.838 + * $Log: dimorot.h,v $ 3.839 ++ * Revision 1.17 2011-11-17 16:13:16 joergr 3.840 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.841 ++ * 3.842 + * Revision 1.16 2010-10-14 13:16:26 joergr 3.843 + * Updated copyright header. Added reference to COPYRIGHT file. 3.844 + * 3.845 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 3.846 +index 60c9abb83..8f898557d 100644 3.847 +--- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 3.848 ++++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 3.849 +@@ -1,6 +1,6 @@ 3.850 + /* 3.851 + * 3.852 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.853 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.854 + * All rights reserved. See COPYRIGHT file for details. 3.855 + * 3.856 + * This software and supporting documentation were developed by 3.857 +@@ -18,8 +18,8 @@ 3.858 + * Purpose: DicomMonochromeScaleTemplate (Header) 3.859 + * 3.860 + * Last Update: $Author: joergr $ 3.861 +- * Update Date: $Date: 2010-10-14 13:16:26 $ 3.862 +- * CVS/RCS Revision: $Revision: 1.20 $ 3.863 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.864 ++ * CVS/RCS Revision: $Revision: 1.21 $ 3.865 + * Status: $State: Exp $ 3.866 + * 3.867 + * CVS/RCS Log at end of file 3.868 +@@ -124,7 +124,7 @@ class DiMonoScaleTemplate 3.869 + { 3.870 + const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) * 3.871 + OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES))); 3.872 +- scaleData(&pixel, &this->Data, interpolate, value); 3.873 ++ this->scaleData(&pixel, &this->Data, interpolate, value); 3.874 + } 3.875 + } 3.876 + } 3.877 +@@ -138,6 +138,9 @@ class DiMonoScaleTemplate 3.878 + * 3.879 + * CVS/RCS Log: 3.880 + * $Log: dimosct.h,v $ 3.881 ++ * Revision 1.21 2011-11-17 16:13:16 joergr 3.882 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.883 ++ * 3.884 + * Revision 1.20 2010-10-14 13:16:26 joergr 3.885 + * Updated copyright header. Added reference to COPYRIGHT file. 3.886 + * 3.887 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 3.888 +index edb452e45..2e7e3a095 100644 3.889 +--- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 3.890 ++++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 3.891 +@@ -1,6 +1,6 @@ 3.892 + /* 3.893 + * 3.894 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.895 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.896 + * All rights reserved. See COPYRIGHT file for details. 3.897 + * 3.898 + * This software and supporting documentation were developed by 3.899 +@@ -18,8 +18,8 @@ 3.900 + * Purpose: DicomRotateTemplate (Header) 3.901 + * 3.902 + * Last Update: $Author: joergr $ 3.903 +- * Update Date: $Date: 2010-10-14 13:16:27 $ 3.904 +- * CVS/RCS Revision: $Revision: 1.21 $ 3.905 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.906 ++ * CVS/RCS Revision: $Revision: 1.22 $ 3.907 + * Status: $State: Exp $ 3.908 + * 3.909 + * CVS/RCS Log at end of file 3.910 +@@ -132,7 +132,7 @@ class DiRotateTemplate 3.911 + else if (degree == 270) 3.912 + rotateLeft(src, dest); 3.913 + else 3.914 +- copyPixel(src, dest); 3.915 ++ this->copyPixel(src, dest); 3.916 + } 3.917 + 3.918 + 3.919 +@@ -358,6 +358,9 @@ class DiRotateTemplate 3.920 + * 3.921 + * CVS/RCS Log: 3.922 + * $Log: dirotat.h,v $ 3.923 ++ * Revision 1.22 2011-11-17 16:13:16 joergr 3.924 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.925 ++ * 3.926 + * Revision 1.21 2010-10-14 13:16:27 joergr 3.927 + * Updated copyright header. Added reference to COPYRIGHT file. 3.928 + * 3.929 +diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h 3.930 +index 758dde2cd..0bcbc70f4 100644 3.931 +--- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h 3.932 ++++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h 3.933 +@@ -1,6 +1,6 @@ 3.934 + /* 3.935 + * 3.936 +- * Copyright (C) 1996-2010, OFFIS e.V. 3.937 ++ * Copyright (C) 1996-2011, OFFIS e.V. 3.938 + * All rights reserved. See COPYRIGHT file for details. 3.939 + * 3.940 + * This software and supporting documentation were developed by 3.941 +@@ -18,8 +18,8 @@ 3.942 + * Purpose: DicomScaleTemplates (Header) 3.943 + * 3.944 + * Last Update: $Author: joergr $ 3.945 +- * Update Date: $Date: 2010-10-14 13:16:27 $ 3.946 +- * CVS/RCS Revision: $Revision: 1.35 $ 3.947 ++ * Update Date: $Date: 2011-11-17 16:13:16 $ 3.948 ++ * CVS/RCS Revision: $Revision: 1.36 $ 3.949 + * Status: $State: Exp $ 3.950 + * 3.951 + * CVS/RCS Log at end of file 3.952 +@@ -206,12 +206,12 @@ class DiScaleTemplate 3.953 + (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows))) 3.954 + { // no image to be displayed 3.955 + DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries"); 3.956 +- fillPixel(dest, value); // ... fill bitmap 3.957 ++ this->fillPixel(dest, value); // ... fill bitmap 3.958 + } 3.959 + else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling 3.960 + { 3.961 + if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y)) 3.962 +- copyPixel(src, dest); // copying 3.963 ++ this->copyPixel(src, dest); // copying 3.964 + else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) && 3.965 + (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows)) 3.966 + clipPixel(src, dest); // clipping 3.967 +@@ -567,7 +567,7 @@ class DiScaleTemplate 3.968 + if ((xtemp == NULL) || (xvalue == NULL)) 3.969 + { 3.970 + DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling"); 3.971 +- clearPixel(dest); 3.972 ++ this->clearPixel(dest); 3.973 + } else { 3.974 + for (int j = 0; j < this->Planes; ++j) 3.975 + { 3.976 +@@ -905,7 +905,7 @@ class DiScaleTemplate 3.977 + if (pTemp == NULL) 3.978 + { 3.979 + DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling"); 3.980 +- clearPixel(dest); 3.981 ++ this->clearPixel(dest); 3.982 + } else { 3.983 + 3.984 + /* 3.985 +@@ -1029,7 +1029,7 @@ class DiScaleTemplate 3.986 + if (pTemp == NULL) 3.987 + { 3.988 + DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling"); 3.989 +- clearPixel(dest); 3.990 ++ this->clearPixel(dest); 3.991 + } else { 3.992 + 3.993 + /* 3.994 +@@ -1190,6 +1190,9 @@ class DiScaleTemplate 3.995 + * 3.996 + * CVS/RCS Log: 3.997 + * $Log: discalet.h,v $ 3.998 ++ * Revision 1.36 2011-11-17 16:13:16 joergr 3.999 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.1000 ++ * 3.1001 + * Revision 1.35 2010-10-14 13:16:27 joergr 3.1002 + * Updated copyright header. Added reference to COPYRIGHT file. 3.1003 + * 3.1004 +diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h 3.1005 +index 1a7f208c8..a534ebfab 100644 3.1006 +--- a/ofstd/include/dcmtk/ofstd/ofoset.h 3.1007 ++++ b/ofstd/include/dcmtk/ofstd/ofoset.h 3.1008 +@@ -1,6 +1,6 @@ 3.1009 + /* 3.1010 + * 3.1011 +- * Copyright (C) 2002-2010, OFFIS e.V. 3.1012 ++ * Copyright (C) 2002-2011, OFFIS e.V. 3.1013 + * All rights reserved. See COPYRIGHT file for details. 3.1014 + * 3.1015 + * This software and supporting documentation were developed by 3.1016 +@@ -19,8 +19,8 @@ 3.1017 + * of an arbitrary type. 3.1018 + * 3.1019 + * Last Update: $Author: joergr $ 3.1020 +- * Update Date: $Date: 2010-10-14 13:15:50 $ 3.1021 +- * CVS/RCS Revision: $Revision: 1.11 $ 3.1022 ++ * Update Date: $Date: 2011-11-17 16:13:18 $ 3.1023 ++ * CVS/RCS Revision: $Revision: 1.12 $ 3.1024 + * Status: $State: Exp $ 3.1025 + * 3.1026 + * CVS/RCS Log at end of file 3.1027 +@@ -146,7 +146,7 @@ template <class T> class OFOrderedSet : public OFSet<T> 3.1028 + { 3.1029 + // if size equals num, we need more space 3.1030 + if( this->size == this->num ) 3.1031 +- Resize( this->size * 2 ); 3.1032 ++ this->Resize( this->size * 2 ); 3.1033 + 3.1034 + // copy item 3.1035 + T *newItem = new T( item ); 3.1036 +@@ -189,7 +189,7 @@ template <class T> class OFOrderedSet : public OFSet<T> 3.1037 + { 3.1038 + // if size equals num, we need more space 3.1039 + if( this->size == this->num ) 3.1040 +- Resize( this->size * 2 ); 3.1041 ++ this->Resize( this->size * 2 ); 3.1042 + 3.1043 + // copy item 3.1044 + T *newItem = new T( item ); 3.1045 +@@ -508,6 +508,9 @@ template <class T> class OFOrderedSet : public OFSet<T> 3.1046 + /* 3.1047 + ** CVS/RCS Log: 3.1048 + ** $Log: ofoset.h,v $ 3.1049 ++** Revision 1.12 2011-11-17 16:13:18 joergr 3.1050 ++** Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.1051 ++** 3.1052 + ** Revision 1.11 2010-10-14 13:15:50 joergr 3.1053 + ** Updated copyright header. Added reference to COPYRIGHT file. 3.1054 + ** 3.1055 +diff --git a/ofstd/libsrc/ofchrenc.cc b/ofstd/libsrc/ofchrenc.cc 3.1056 +index d3bc48bad..4c2a6e444 100644 3.1057 +--- a/ofstd/libsrc/ofchrenc.cc 3.1058 ++++ b/ofstd/libsrc/ofchrenc.cc 3.1059 +@@ -18,8 +18,8 @@ 3.1060 + * Purpose: Class for character encoding conversion (Source) 3.1061 + * 3.1062 + * Last Update: $Author: joergr $ 3.1063 +- * Update Date: $Date: 2011-11-09 14:05:39 $ 3.1064 +- * CVS/RCS Revision: $Revision: 1.9 $ 3.1065 ++ * Update Date: $Date: 2011-11-17 16:13:19 $ 3.1066 ++ * CVS/RCS Revision: $Revision: 1.10 $ 3.1067 + * Status: $State: Exp $ 3.1068 + * 3.1069 + * CVS/RCS Log at end of file 3.1070 +@@ -37,6 +37,12 @@ 3.1071 + #include <localcharset.h> 3.1072 + #endif 3.1073 + 3.1074 ++BEGIN_EXTERN_C 3.1075 ++#ifdef HAVE_SYS_ERRNO_H 3.1076 ++#include <sys/errno.h> 3.1077 ++#endif 3.1078 ++END_EXTERN_C 3.1079 ++ 3.1080 + 3.1081 + #define ILLEGAL_DESCRIPTOR OFreinterpret_cast(OFCharacterEncoding::T_Descriptor, -1) 3.1082 + #define CONVERSION_ERROR OFstatic_cast(size_t, -1) 3.1083 +@@ -359,6 +365,9 @@ size_t OFCharacterEncoding::countCharactersInUTF8String(const OFString &utf8Stri 3.1084 + * 3.1085 + * CVS/RCS Log: 3.1086 + * $Log: ofchrenc.cc,v $ 3.1087 ++ * Revision 1.10 2011-11-17 16:13:19 joergr 3.1088 ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. 3.1089 ++ * 3.1090 + * Revision 1.9 2011-11-09 14:05:39 joergr 3.1091 + * Avoid wrong error message / status code that a conversion descriptor cannot 3.1092 + * be closed when libiconv is not available. 3.1093 +-- 3.1094 +2.11.0 3.1095 +