This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001From: Joerg Riesmeier <dicom@offis.de>Date: Thu, 17 Nov 2011 16:13:14 +0000Subject: [PATCH 1/1] 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 diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.hindex 1111111..2222222 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)     {                                             // not very much optimized, but no one really uses ARGB !!-        if (Init(pixel))+        if (this->Init(pixel))         {             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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {             // 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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {             for (int j = 0; j < 3; j++)                 OFBitmanipTemplate<T>::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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {             if (horz && vert)-                flipHorzVert(pixel, this->Data);+                this->flipHorzVert(pixel, this->Data);             else if (horz)-                flipHorz(pixel, this->Data);+                this->flipHorz(pixel, this->Data);             else if (vert)-                flipVert(pixel, this->Data);+                this->flipVert(pixel, this->Data);         }     } };@@ -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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {             if (degree == 90)-                rotateRight(pixel, this->Data);+                this->rotateRight(pixel, this->Data);             else if (degree == 180)-                rotateTopDown(pixel, this->Data);+                this->rotateTopDown(pixel, this->Data);             else  if (degree == 270)-                rotateLeft(pixel, this->Data);+                this->rotateLeft(pixel, this->Data);         }     } };@@ -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.hindex 1111111..2222222 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)     {-        if (Init(pixel))-            scaleData(pixel, this->Data, interpolate);+        if (this->Init(pixel))+            this->scaleData(pixel, this->Data, interpolate);     } }; @@ -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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {             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.hindex 1111111..2222222 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])     {                                                                // can be optimized if necessary !-        if (Init(pixel))+        if (this->Init(pixel))         {             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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {             // 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.hindex 1111111..2222222 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)     {-        if (Init(pixel))+        if (this->Init(pixel))         {

Lines 1–500 of 1002. Load more