# HG changeset patch # User Mark Brand # Date 1332746924 -7200 # Node ID 31f5cbd108a29c05e5d5f575d3e528319015353b # Parent 4cea167451b89dc4f6fd9997f711e85f28b9463b package dcmtk: replace patch with cherry-picked commit --- src/dcmtk-1-fixes.patch | 737 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 702 insertions(+), 35 deletions(-) diff -r 4cea167451b8 -r 31f5cbd108a2 src/dcmtk-1-fixes.patch --- a/src/dcmtk-1-fixes.patch Sun Mar 25 21:59:18 2012 +0200 +++ b/src/dcmtk-1-fixes.patch Mon Mar 26 09:28:44 2012 +0200 @@ -3,16 +3,64 @@ Contains ad hoc patches for cross building. -From b374977b85b63b3fbe820a109a2f676c9b8c7662 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Sat, 24 Mar 2012 02:07:22 +0100 -Subject: [PATCH] gcc 4.7.0 compatibility fix +From ac29986df03482c61dbd7271554e6bc453228bd6 Mon Sep 17 00:00:00 2001 +From: Joerg Riesmeier +Date: Thu, 17 Nov 2011 16:13:14 +0000 +Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang + compiler) quiet. + +(cherry picked from commit dbadc0d8f3760f65504406c8b2cb8633f868a258) + +Conflicts: + CHANGES.361 + ofstd/libsrc/ofchrenc.cc +--- + dcmimage/include/dcmtk/dcmimage/diargpxt.h | 25 ++++++++++++++----------- + dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dicocpt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dicoflt.h | 17 ++++++++++------- + dcmimage/include/dcmtk/dcmimage/dicorot.h | 17 ++++++++++------- + dcmimage/include/dcmtk/dcmimage/dicosct.h | 13 ++++++++----- + dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 15 +++++++++------ + dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 15 +++++++++------ + dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 11 +++++++---- + dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/dimoflt.h | 15 +++++++++------ + dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 13 ++++++++----- + dcmimgle/include/dcmtk/dcmimgle/dimorot.h | 15 +++++++++------ + dcmimgle/include/dcmtk/dcmimgle/dimosct.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 11 +++++++---- + dcmimgle/include/dcmtk/dcmimgle/discalet.h | 19 +++++++++++-------- + ofstd/include/dcmtk/ofstd/ofoset.h | 13 ++++++++----- + 20 files changed, 168 insertions(+), 108 deletions(-) diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h -index 7e3894d..a25c1f7 100644 +index 7e3894d..1ed9291 100644 --- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomARGBPixelTemplate (Header) - UNTESTED !!! + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.21 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.22 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -91,7 +91,7 @@ class DiARGBPixelTemplate const unsigned long planeSize, const int bits) @@ -22,10 +70,80 @@ { register T2 value; const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); +@@ -103,9 +103,9 @@ class DiARGBPixelTemplate + /* + register const T1 *a = pixel; // points to alpha plane + const T1 *rgb[3]; +- rgb[0] = a + this->InputCount; // points to red plane +- rgb[1] = rgb[0] + this->InputCount; // points to green plane +- rgb[2] = rgb[1] + this->InputCount; // points to blue plane ++ rgb[0] = a + this->InputCount; // points to red plane ++ rgb[1] = rgb[0] + this->InputCount; // points to green plane ++ rgb[2] = rgb[1] + this->InputCount; // points to blue plane + for (i = 0; i < count; ++i) + { + value = OFstatic_cast(T2, *(a++)); // get alpha value +@@ -141,10 +141,10 @@ class DiARGBPixelTemplate + /* convert a single frame */ + for (l = planeSize; (l != 0) && (i < count); --l, ++i) + { +- value = OFstatic_cast(T2, *(a++)); // get alpha value ++ value = OFstatic_cast(T2, *(a++)); // get alpha value + if (value > 0) + { +- for (int j = 0; j < 3; ++j) // set palette color ++ for (int j = 0; j < 3; ++j) // set palette color + { + if (value <= palette[j]->getFirstEntry(value)) + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getFirstValue()); +@@ -152,12 +152,12 @@ class DiARGBPixelTemplate + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getLastValue()); + else + this->Data[j][i] = OFstatic_cast(T3, palette[j]->getValue(value)); +- ++rgb[j]; // skip RGB values ++ ++rgb[j]; // skip RGB values + } + } + else + { +- for (int j = 0; j < 3; ++j) // copy RGB values ++ for (int j = 0; j < 3; ++j) // copy RGB values + this->Data[j][i] = OFstatic_cast(T3, removeSign(*(rgb[j]++), offset)); + } + } +@@ -204,6 +204,9 @@ class DiARGBPixelTemplate + * + * CVS/RCS Log: + * $Log: diargpxt.h,v $ ++ * Revision 1.22 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.21 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h -index 5357780..4050ec6 100644 +index 5357780..bf1161e 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomCMYKPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.20 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.21 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -87,7 +87,7 @@ class DiCMYKPixelTemplate const unsigned long planeSize, const int bits) @@ -35,10 +153,39 @@ { // use the number of input pixels derived from the length of the 'PixelData' // attribute), but not more than the size of the intermediate buffer +@@ -157,6 +157,9 @@ class DiCMYKPixelTemplate + * + * CVS/RCS Log: + * $Log: dicmypxt.h,v $ ++ * Revision 1.21 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.20 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h -index 0c06de7..9770770 100644 +index 0c06de7..3f03b6b 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h +++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorCopyTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.12 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.13 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -86,7 +86,7 @@ class DiColorCopyTemplate inline void copy(const T *pixel[3], const unsigned long offset) @@ -48,10 +195,39 @@ { for (int j = 0; j < 3; j++) OFBitmanipTemplate::copyMem(pixel[j] + offset, this->Data[j], this->getCount()); +@@ -102,6 +102,9 @@ class DiColorCopyTemplate + * + * CVS/RCS Log: + * $Log: dicocpt.h,v $ ++ * Revision 1.13 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.12 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h -index a5bed81..9c339f6 100644 +index a5bed81..bc809ab 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h +++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorFlipTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.15 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.16 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -98,14 +98,14 @@ class DiColorFlipTemplate const int horz, const int vert) @@ -71,10 +247,39 @@ } } }; +@@ -118,6 +118,9 @@ class DiColorFlipTemplate + * + * CVS/RCS Log: + * $Log: dicoflt.h,v $ ++ * Revision 1.16 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.15 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h -index 2bcd71e..9169f41 100644 +index 2bcd71e..c8afd70 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicorot.h +++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorRotateTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.15 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.16 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -98,14 +98,14 @@ class DiColorRotateTemplate inline void rotate(const T *pixel[3], const int degree) @@ -94,10 +299,39 @@ } } }; +@@ -118,6 +118,9 @@ class DiColorRotateTemplate + * + * CVS/RCS Log: + * $Log: dicorot.h,v $ ++ * Revision 1.16 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.15 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h -index 006a829..045b04f 100644 +index 006a829..3bccc45 100644 --- a/dcmimage/include/dcmtk/dcmimage/dicosct.h +++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomColorScaleTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.21 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.22 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -107,8 +107,8 @@ class DiColorScaleTemplate inline void scale(const T *pixel[3], const int interpolate) @@ -109,10 +343,39 @@ } }; +@@ -120,6 +120,9 @@ class DiColorScaleTemplate + * + * CVS/RCS Log: + * $Log: dicosct.h,v $ ++ * Revision 1.22 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.21 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h -index 10d8b70..d2c160b 100644 +index 10d8b70..52580ec 100644 --- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomHSVPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.25 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.26 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -87,7 +87,7 @@ class DiHSVPixelTemplate const unsigned long planeSize, const int bits) @@ -122,10 +385,39 @@ { register T2 *r = this->Data[0]; register T2 *g = this->Data[1]; +@@ -221,6 +221,9 @@ class DiHSVPixelTemplate + * + * CVS/RCS Log: + * $Log: dihsvpxt.h,v $ ++ * Revision 1.26 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.25 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h -index 2e5eef7..875dac8 100644 +index 2e5eef7..1ae2352 100644 --- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomPalettePixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:29 $ +- * CVS/RCS Revision: $Revision: 1.24 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.25 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -92,7 +92,7 @@ class DiPalettePixelTemplate void convert(const T1 *pixel, DiLookupTable *palette[3]) @@ -135,10 +427,39 @@ { register const T1 *p = pixel; register T2 value = 0; +@@ -126,6 +126,9 @@ class DiPalettePixelTemplate + * + * CVS/RCS Log: + * $Log: dipalpxt.h,v $ ++ * Revision 1.25 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.24 2010-10-14 13:16:29 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h -index 85f973d..ff18aaf 100644 +index 85f973d..d9cc7ed 100644 --- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomRGBPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.18 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.19 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -87,7 +87,7 @@ class DiRGBPixelTemplate const unsigned long planeSize, const int bits) @@ -148,10 +469,51 @@ { // use the number of input pixels derived from the length of the 'PixelData' // attribute), but not more than the size of the intermediate buffer +@@ -129,9 +129,9 @@ class DiRGBPixelTemplate + { + register int j; + register unsigned long i; +- for (i = 0; i < count; ++i) /* for all pixel ... */ ++ for (i = 0; i < count; ++i) /* for all pixel ... */ + for (j = 0; j < 3; ++j) +- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ ++ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ + } + } + } +@@ -145,6 +145,9 @@ class DiRGBPixelTemplate + * + * CVS/RCS Log: + * $Log: dirgbpxt.h,v $ ++ * Revision 1.19 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.18 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h -index 6b523fb..1aff8d0 100644 +index 6b523fb..ecd2038 100644 --- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomYBRPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.19 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.20 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -91,7 +91,7 @@ class DiYBRPixelTemplate const int bits, const OFBool rgb) @@ -161,10 +523,51 @@ { const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); // use the number of input pixels derived from the length of the 'PixelData' +@@ -266,9 +266,9 @@ class DiYBRPixelTemplate + { + register int j; + register unsigned long i; +- for (i = 0; i < count; ++i) /* for all pixel ... */ ++ for (i = 0; i < count; ++i) /* for all pixel ... */ + for (j = 0; j < 3; ++j) +- this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ ++ this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */ + } + } + } +@@ -295,6 +295,9 @@ class DiYBRPixelTemplate + * + * CVS/RCS Log: + * $Log: diybrpxt.h,v $ ++ * Revision 1.20 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.19 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h -index ed27796..34343e5 100644 +index ed27796..93d28cc 100644 --- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomYBR422PixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.25 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.26 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -95,7 +95,7 @@ class DiYBR422PixelTemplate const int bits, const OFBool rgb) @@ -174,10 +577,39 @@ { const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); register unsigned long i; +@@ -167,6 +167,9 @@ class DiYBR422PixelTemplate + * + * CVS/RCS Log: + * $Log: diyf2pxt.h,v $ ++ * Revision 1.26 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.25 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h -index 518fed7..0c86165 100644 +index 518fed7..0dd9d5b 100644 --- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h +++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1998-2010, OFFIS e.V. ++ * Copyright (C) 1998-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomYBRPart422PixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:30 $ +- * CVS/RCS Revision: $Revision: 1.23 $ ++ * Update Date: $Date: 2011-11-17 16:13:14 $ ++ * CVS/RCS Revision: $Revision: 1.24 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -91,7 +91,7 @@ class DiYBRPart422PixelTemplate void convert(const T1 *pixel, const int bits) @@ -187,10 +619,39 @@ { register T2 *r = this->Data[0]; register T2 *g = this->Data[1]; +@@ -147,6 +147,9 @@ class DiYBRPart422PixelTemplate + * + * CVS/RCS Log: + * $Log: diyp2pxt.h,v $ ++ * Revision 1.24 2011-11-17 16:13:14 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.23 2010-10-14 13:16:30 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h -index 4933fe1..cb8d5e1 100644 +index 4933fe1..05c198c 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h +++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomFlipTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.23 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.24 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -129,7 +129,7 @@ class DiFlipTemplate else if (vert) flipVert(src, dest); @@ -200,10 +661,39 @@ } } +@@ -345,6 +345,9 @@ class DiFlipTemplate + * + * CVS/RCS Log: + * $Log: diflipt.h,v $ ++ * Revision 1.24 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.23 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h -index a88ab9d..da860fe 100644 +index a88ab9d..52d71a3 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeFlipTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.15 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.16 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -106,11 +106,11 @@ class DiMonoFlipTemplate if (this->Data != NULL) { @@ -219,10 +709,39 @@ } } } +@@ -124,6 +124,9 @@ class DiMonoFlipTemplate + * + * CVS/RCS Log: + * $Log: dimoflt.h,v $ ++ * Revision 1.16 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.15 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h -index e815e90..51603ea 100644 +index e815e90..c190dd6 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeInputPixelTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.40 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.41 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -76,10 +76,10 @@ class DiMonoInputPixelTemplate else if ((this->Modality != NULL) && this->Modality->hasRescaling()) { @@ -236,10 +755,39 @@ } } } +@@ -280,6 +280,9 @@ class DiMonoInputPixelTemplate + * + * CVS/RCS Log: + * $Log: dimoipxt.h,v $ ++ * Revision 1.41 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.40 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h -index 4ef277d..19f9a98 100644 +index 4ef277d..e729424 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeRotateTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.16 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.17 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -105,11 +105,11 @@ class DiMonoRotateTemplate if (this->Data != NULL) { @@ -255,10 +803,39 @@ } } } +@@ -123,6 +123,9 @@ class DiMonoRotateTemplate + * + * CVS/RCS Log: + * $Log: dimorot.h,v $ ++ * Revision 1.17 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.16 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h -index 60c9abb..9a46187 100644 +index 60c9abb..8f89855 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomMonochromeScaleTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:26 $ +- * CVS/RCS Revision: $Revision: 1.20 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.21 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -124,7 +124,7 @@ class DiMonoScaleTemplate { const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) * @@ -268,10 +845,39 @@ } } } +@@ -138,6 +138,9 @@ class DiMonoScaleTemplate + * + * CVS/RCS Log: + * $Log: dimosct.h,v $ ++ * Revision 1.21 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.20 2010-10-14 13:16:26 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h -index edb452e..6ae6bbe 100644 +index edb452e..2e7e3a0 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h +++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomRotateTemplate (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:27 $ +- * CVS/RCS Revision: $Revision: 1.21 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.22 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -132,7 +132,7 @@ class DiRotateTemplate else if (degree == 270) rotateLeft(src, dest); @@ -281,32 +887,54 @@ } +@@ -358,6 +358,9 @@ class DiRotateTemplate + * + * CVS/RCS Log: + * $Log: dirotat.h,v $ ++ * Revision 1.22 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.21 2010-10-14 13:16:27 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h -index 758dde2..5ccf0f6 100644 +index 758dde2..0bcbc70 100644 --- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h +++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h -@@ -206,17 +206,17 @@ class DiScaleTemplate +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1996-2010, OFFIS e.V. ++ * Copyright (C) 1996-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -18,8 +18,8 @@ + * Purpose: DicomScaleTemplates (Header) + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:16:27 $ +- * CVS/RCS Revision: $Revision: 1.35 $ ++ * Update Date: $Date: 2011-11-17 16:13:16 $ ++ * CVS/RCS Revision: $Revision: 1.36 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file +@@ -206,12 +206,12 @@ class DiScaleTemplate (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows))) { // no image to be displayed DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries"); - fillPixel(dest, value); // ... fill bitmap -+ this->fillPixel(dest, value); // ... fill bitmap ++ this->fillPixel(dest, value); // ... fill bitmap } else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling { if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y)) - copyPixel(src, dest); // copying -+ this->copyPixel(src, dest); // copying ++ this->copyPixel(src, dest); // copying else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) && (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows)) -- clipPixel(src, dest); // clipping -+ this->clipPixel(src, dest); // clipping - else -- clipBorderPixel(src, dest, value); // clipping (with border) -+ this->clipBorderPixel(src, dest, value); // clipping (with border) - } - else if ((interpolate == 1) && (this->Bits <= MAX_INTERPOLATION_BITS)) - interpolatePixel(src, dest); // interpolation (pbmplus) + clipPixel(src, dest); // clipping @@ -567,7 +567,7 @@ class DiScaleTemplate if ((xtemp == NULL) || (xvalue == NULL)) { @@ -334,10 +962,39 @@ } else { /* +@@ -1190,6 +1190,9 @@ class DiScaleTemplate + * + * CVS/RCS Log: + * $Log: discalet.h,v $ ++ * Revision 1.36 2011-11-17 16:13:16 joergr ++ * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++ * + * Revision 1.35 2010-10-14 13:16:27 joergr + * Updated copyright header. Added reference to COPYRIGHT file. + * diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h -index 1a7f208..ee48743 100644 +index 1a7f208..a534ebf 100644 --- a/ofstd/include/dcmtk/ofstd/ofoset.h +++ b/ofstd/include/dcmtk/ofstd/ofoset.h +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 2002-2010, OFFIS e.V. ++ * Copyright (C) 2002-2011, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -19,8 +19,8 @@ + * of an arbitrary type. + * + * Last Update: $Author: joergr $ +- * Update Date: $Date: 2010-10-14 13:15:50 $ +- * CVS/RCS Revision: $Revision: 1.11 $ ++ * Update Date: $Date: 2011-11-17 16:13:18 $ ++ * CVS/RCS Revision: $Revision: 1.12 $ + * Status: $State: Exp $ + * + * CVS/RCS Log at end of file @@ -146,7 +146,7 @@ template class OFOrderedSet : public OFSet { // if size equals num, we need more space @@ -356,6 +1013,16 @@ // copy item T *newItem = new T( item ); +@@ -508,6 +508,9 @@ template class OFOrderedSet : public OFSet + /* + ** CVS/RCS Log: + ** $Log: ofoset.h,v $ ++** Revision 1.12 2011-11-17 16:13:18 joergr ++** Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet. ++** + ** Revision 1.11 2010-10-14 13:15:50 joergr + ** Updated copyright header. Added reference to COPYRIGHT file. + ** -- 1.7.9.2