commit: a9396759d34d950d697c840ad296c9c98753a336 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Tue Sep 22 12:10:06 2020 +0000 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> CommitDate: Tue Sep 22 12:10:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a9396759
sci-libs/dcmtk: drop package present in ::gentoo Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 74 -- sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch | 89 -- sci-libs/dcmtk/files/bug674361.patch | 1015 -------------------- sci-libs/dcmtk/files/dcmtk-asneeded.patch | 70 -- sci-libs/dcmtk/files/dcmtk_version_number.patch | 131 --- sci-libs/dcmtk/files/doubledes.patch | 31 - sci-libs/dcmtk/files/fixnull.patch | 36 - sci-libs/dcmtk/files/noleak.patch | 36 - sci-libs/dcmtk/files/nothrow.patch | 76 -- sci-libs/dcmtk/files/prefs.patch | 26 - .../files/regression_stacksequenceisodd.patch | 98 -- .../dcmtk/files/use_correct_number_of_TS.patch | 19 - sci-libs/dcmtk/metadata.xml | 22 - 13 files changed, 1723 deletions(-) diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild deleted file mode 100644 index dbcd65680..000000000 --- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="OFFIS DICOM image files library and tools" -HOMEPAGE="http://dicom.offis.de/dcmtk.php.en"; -SRC_URI=" - http://dicom.offis.de/download/dcmtk/release/${P}.tar.gz - https://raw.githubusercontent.com/gentoo-science/sci/master/patches/07_doxygen.patch - " - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="doc png ssl tcpd +threads tiff xml zlib" - -RDEPEND=" - virtual/jpeg:0= - png? ( media-libs/libpng:0= ) - ssl? ( dev-libs/openssl:= ) - tcpd? ( sys-apps/tcp-wrappers ) - tiff? ( media-libs/tiff:0= ) - xml? ( dev-libs/libxml2:2= ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[dot] )" - -PATCHES=( - "${FILESDIR}"/${PN}-asneeded.patch - "${FILESDIR}"/02_dcmtk_3.6.0-1.patch - "${DISTDIR}"/07_doxygen.patch - "${FILESDIR}"/prefs.patch - "${FILESDIR}"/dcmtk_version_number.patch - "${FILESDIR}"/regression_stacksequenceisodd.patch - "${FILESDIR}"/bug674361.patch - "${FILESDIR}"/use_correct_number_of_TS.patch - "${FILESDIR}"/fixnull.patch - "${FILESDIR}"/nothrow.patch - "${FILESDIR}"/noleak.patch - "${FILESDIR}"/doubledes.patch -) - -src_prepare() { - sed -i \ - -e "s:/usr/local/bin:$(type -P perl):g" \ - dcmwlm/perl/*.pl || die - sed -i \ - -e "s:share/doc/dcmtk:share/doc/${PF}:" \ - -e "s:/lib\":/$(get_libdir)\":" \ - -e "s:COPYRIGHT::" \ - CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - $(cmake-utils_use doc DCMTK_WITH_DOXYGEN) - $(cmake-utils_use png DCMTK_WITH_PNG) - $(cmake-utils_use ssl DCMTK_WITH_OPENSSL) - $(cmake-utils_use threads DCMTK_WITH_THREADS) - $(cmake-utils_use tiff DCMTK_WITH_TIFF) - $(cmake-utils_use xml DCMTK_WITH_XML) - $(cmake-utils_use zlib DCMTK_WITH_ZLIB) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usex doc "html" "") -} diff --git a/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch b/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch deleted file mode 100644 index 11aaaec37..000000000 --- a/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch +++ /dev/null @@ -1,89 +0,0 @@ -Author: Jürgen Salk <j...@debian.org> -Description: The original maintainer Jürgen Salk applied - a set of patches to the original code. This file contains - changes to C++ code - -Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg -=================================================================== ---- dcmtk-3.6.0.orig/dcmqrdb/etc/dcmqrscp.cfg 2010-09-09 19:20:25.000000000 +0200 -+++ dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg 2011-01-28 09:49:02.000000000 +0100 -@@ -10,6 +10,9 @@ - NetworkTCPPort = 104 - MaxPDUSize = 16384 - MaxAssociations = 16 -+UserName = "dcmtk" -+GroupName = "dcmtk" -+ - # - # UserName = <not used> - # GroupName = <not used> -@@ -28,12 +31,13 @@ - # NOTE: in the current implementation you cannot substitute an IP address - # for a hostname. - # --acme1 = (ACME1, acmehost1, 5678) --acme2 = (ACME2, acmehost2, 5678) --acmeCTcompany = acme1, acme2 --united1 = (UNITED1, unitedhost1, 104) --united2 = (UNITED2, unitedhost2, 104) --unitedMRcompany = united1, united2 -+# Example: -+#acme1 = (ACME1, acmehost1, 5678) -+#acme2 = (ACME2, acmehost2, 5678) -+#acmeCTcompany = acme1, acme2 -+#united1 = (UNITED1, unitedhost1, 104) -+#united2 = (UNITED2, unitedhost2, 104) -+#unitedMRcompany = united1, united2 - # - HostTable END - -@@ -51,8 +55,9 @@ - # VendorName = SymbolicName - # The symbolic name should be defined in the HostTable. - # --"Acme CT Company" = acmeCTcompany --"United MR Company" = unitedMRcompany -+# Example: -+#"Acme CT Company" = acmeCTcompany -+#"United MR Company" = unitedMRcompany - # - VendorTable END - -@@ -70,8 +75,13 @@ - # Entry in HostTable | - # ANY - # --COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY --ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany --UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany -+# Example: -+# -+#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany -+#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany -+# -+# Uncomment and adjust the following lines for a common r/rw storage area: -+#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY -+#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY - # - AETable END -Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt -=================================================================== ---- dcmtk-3.6.0.orig/dcmqrdb/docs/dcmqrcnf.txt 2010-09-09 19:20:12.000000000 +0200 -+++ dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt 2011-01-28 09:46:02.000000000 +0100 -@@ -44,8 +44,8 @@ - NetworkTCPPort = 104 - MaxPDUSize = 8192 - MaxAssociations = 20 --UserName = (do not change user) --GroupName = (do not change group) -+UserName = "dcmtk" -+GroupName = "dcmtk" - - NOTE: You must have root privileges to bind port 104 for DICOM association - requests on Unix/Linux/Posix platforms as this is a privileged port number -Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile 2011-01-28 09:46:02.000000000 +0100 -@@ -0,0 +1 @@ -+ diff --git a/sci-libs/dcmtk/files/bug674361.patch b/sci-libs/dcmtk/files/bug674361.patch deleted file mode 100644 index f335deed6..000000000 --- a/sci-libs/dcmtk/files/bug674361.patch +++ /dev/null @@ -1,1015 +0,0 @@ -From dbadc0d8f3760f65504406c8b2cb8633f868a258 Mon Sep 17 00:00:00 2001 -From: Joerg Riesmeier <di...@offis.de> -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. - ---- - CHANGES.361 | 24 ++++++++++++++++++++++++ - 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 ++++++++----- - ofstd/libsrc/ofchrenc.cc | 13 +++++++++++-- - 22 files changed, 203 insertions(+), 110 deletions(-) - -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diargpxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diargpxt.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diargpxt.h 2012-05-25 09:16:23.791876809 +0000 -@@ -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 @@ - 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 @@ - /* - 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 @@ - /* 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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicmypxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicmypxt.h 2012-05-25 09:16:23.791876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicocpt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicocpt.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicocpt.h 2012-05-25 09:16:23.791876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicoflt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicoflt.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicoflt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicorot.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicorot.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicorot.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicosct.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dicosct.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dicosct.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dipalpxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 2010-10-14 13:16:29.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dipalpxt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 2010-10-14 13:16:30.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - 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 @@ - { - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diybrpxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 2010-10-14 13:16:30.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diybrpxt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - const int bits, - const OFBool rgb) - { -- if (Init(pixel)) -+ if (this->Init(pixel)) - { - 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 @@ - { - 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 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 2010-10-14 13:16:30.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - const int bits, - const OFBool rgb) - { -- if (Init(pixel)) -+ if (this->Init(pixel)) - { - const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1)); - register unsigned long i; -@@ -167,6 +167,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 2010-10-14 13:16:30.000000000 +0000 -+++ dcmtk-3.6.0/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - void convert(const T1 *pixel, - const int bits) - { -- if (Init(pixel)) -+ if (this->Init(pixel)) - { - register T2 *r = this->Data[0]; - register T2 *g = this->Data[1]; -@@ -147,6 +147,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/diflipt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 2010-10-14 13:16:26.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/diflipt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - else if (vert) - flipVert(src, dest); - else -- copyPixel(src, dest); -+ this->copyPixel(src, dest); - } - } - -@@ -345,6 +345,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 2010-10-14 13:16:26.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 2012-05-25 09:16:23.795876809 +0000 -@@ -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 @@ - if (this->Data != NULL) - { - 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); - } - } - } -@@ -124,6 +124,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 2010-10-14 13:16:26.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 2012-05-25 09:16:23.799876809 +0000 -@@ -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 @@ - else if ((this->Modality != NULL) && this->Modality->hasRescaling()) - { - rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept()); -- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); -+ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); - } else { - rescale(pixel); // "copy" or reference pixel data -- determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); -+ this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue())); - } - } - } -@@ -280,6 +280,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimorot.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 2010-10-14 13:16:26.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimorot.h 2012-05-25 09:16:23.799876809 +0000 -@@ -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 @@ - if (this->Data != NULL) - { - 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)); - } - } - } -@@ -123,6 +123,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimosct.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 2010-10-14 13:16:26.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dimosct.h 2012-05-25 09:16:23.799876809 +0000 -@@ -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 @@ - { - const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) * - OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES))); -- scaleData(&pixel, &this->Data, interpolate, value); -+ this->scaleData(&pixel, &this->Data, interpolate, value); - } - } - } -@@ -138,6 +138,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dirotat.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 2010-10-14 13:16:27.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/dirotat.h 2012-05-25 09:16:23.799876809 +0000 -@@ -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 @@ - else if (degree == 270) - rotateLeft(src, dest); - else -- copyPixel(src, dest); -+ this->copyPixel(src, dest); - } - - -@@ -358,6 +358,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/discalet.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/discalet.h 2010-10-14 13:16:27.000000000 +0000 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/discalet.h 2012-05-25 09:16:23.799876809 +0000 -@@ -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 @@ - (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 - } - 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 - 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 -@@ -567,7 +567,7 @@ - if ((xtemp == NULL) || (xvalue == NULL)) - { - DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling"); -- clearPixel(dest); -+ this->clearPixel(dest); - } else { - for (int j = 0; j < this->Planes; ++j) - { -@@ -905,7 +905,7 @@ - if (pTemp == NULL) - { - DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling"); -- clearPixel(dest); -+ this->clearPixel(dest); - } else { - - /* -@@ -1029,7 +1029,7 @@ - if (pTemp == NULL) - { - DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling"); -- clearPixel(dest); -+ this->clearPixel(dest); - } else { - - /* -@@ -1190,6 +1190,9 @@ - * - * 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. - * -Index: dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/ofoset.h -=================================================================== ---- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/ofoset.h 2010-10-14 13:15:50.000000000 +0000 -+++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/ofoset.h 2012-05-25 09:16:23.799876809 +0000 -@@ -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 @@ - { - // if size equals num, we need more space - if( this->size == this->num ) -- Resize( this->size * 2 ); -+ this->Resize( this->size * 2 ); - - // copy item - T *newItem = new T( item ); -@@ -189,7 +189,7 @@ - { - // if size equals num, we need more space - if( this->size == this->num ) -- Resize( this->size * 2 ); -+ this->Resize( this->size * 2 ); - - // copy item - T *newItem = new T( item ); -@@ -508,6 +508,9 @@ - /* - ** 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. - ** diff --git a/sci-libs/dcmtk/files/dcmtk-asneeded.patch b/sci-libs/dcmtk/files/dcmtk-asneeded.patch deleted file mode 100644 index e3434e644..000000000 --- a/sci-libs/dcmtk/files/dcmtk-asneeded.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- dcmimgle/libsrc/CMakeLists.txt -+++ dcmimgle/libsrc/CMakeLists.txt -@@ -1,5 +1,5 @@ - # create library from source files - ADD_LIBRARY(dcmimgle dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils) -- -+TARGET_LINK_LIBRARIES(dcmimgle dcmdata) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimgle) ---- dcmpstat/libsrc/CMakeLists.txt -+++ dcmpstat/libsrc/CMakeLists.txt -@@ -1,5 +1,5 @@ - # create library from source files - ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl) -- -+TARGET_LINK_LIBRARIES(dcmpstat dcmdsig dcmtls) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat) ---- dcmsign/libsrc/CMakeLists.txt -+++ dcmsign/libsrc/CMakeLists.txt -@@ -1,5 +1,5 @@ - # create library from source files - ADD_LIBRARY(dcmdsig dcsignat siautopr sibrsapr sicert sicertvf sicreapr sidsa simaccon simd5 sinullpr siprivat siripemd sirsa sisha1 sisprof sitypes) -- -+TARGET_LINK_LIBRARIES(dcmdsig ${OPENSSL_LIBS}) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdsig) ---- dcmimage/libsrc/CMakeLists.txt -+++ dcmimage/libsrc/CMakeLists.txt -@@ -1,5 +1,5 @@ - # create library from source files - ADD_LIBRARY(dcmimage diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img) -- -+TARGET_LINK_LIBRARIES(dcmimage ${LIBTIFF_LIBS} ${LIBPNG_LIBS}) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimage) ---- dcmdata/libsrc/CMakeLists.txt -+++ dcmdata/libsrc/CMakeLists.txt -@@ -1,5 +1,5 @@ - # create library from source files - ADD_LIBRARY(dcmdata cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcddirif dcdicdir dcdicent dcdict dcdictzz dcdirrec dcelem dcerror dcfilefo dchashdi dcistrma dcistrmb dcistrmf dcistrmz dcitem dclist dcmetinf dcobject dcostrma dcostrmb dcostrmf dcostrmz dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcstack dcswap dctag dctagkey dctypes dcuid dcwcache dcvm dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrof dcvrpn dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvrui dcvrul dcvrulup dcvrus dcvrut dcxfer dcpath vrscan vrscanl) -- -+TARGET_LINK_LIBRARIES(dcmdata ${ZLIB_LIBS}) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdata) ---- dcmsr/libsrc/CMakeLists.txt -+++ dcmsr/libsrc/CMakeLists.txt -@@ -1,5 +1,5 @@ - # create library from source files - ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtncsr dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc) -- -+TARGET_LINK_LIBRARIES(dcmsr ${LIBXML_LIBS}) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmsr) ---- oflog/libsrc/CMakeLists.txt 2014-04-09 15:20:21.160489941 -0700 -+++ oflog/libsrc/CMakeLists.txt 2014-04-09 15:19:31.161173872 -0700 -@@ -9,4 +9,5 @@ - ADD_LIBRARY(oflog oflog apndimpl appender config consap factory fileap filter globinit hierarchy hierlock layout logger logimpl logevent loglevel loglog lloguser ndc ntelogap nullap objreg patlay pointer property rootlog sleep socketap sockbuff socket strhelp syncprims syslogap threads timehelp ${OFLOG_PLATFORM_LIBRARIES}) - - # declare installation files -+TARGET_LINK_LIBRARIES(oflog ${THREAD_LIBS}) - INSTALL_TARGETS(${INSTALL_LIBDIR} oflog) ---- ofstd/libsrc/CMakeLists.txt 2014-04-09 15:21:06.841778722 -0700 -+++ ofstd/libsrc/CMakeLists.txt 2014-04-09 15:21:14.478827209 -0700 -@@ -2,4 +2,5 @@ - ADD_LIBRARY(ofstd ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime offname oflist ofstd ofstring ofthread oftime) - - # declare installation files -+TARGET_LINK_LIBRARIES(ofstd ${THREAD_LIBS}) - INSTALL_TARGETS(${INSTALL_LIBDIR} ofstd) diff --git a/sci-libs/dcmtk/files/dcmtk_version_number.patch b/sci-libs/dcmtk/files/dcmtk_version_number.patch deleted file mode 100644 index 130a3bfb8..000000000 --- a/sci-libs/dcmtk/files/dcmtk_version_number.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Joerg Riesmeier <di...@offis.de> -Date: Tue, 1 Feb 2011 17:01:14 +0000 (+0000) -Subject: Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a -X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=12c35ca - -Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a -string. ---- - -Index: dcmtk-3.6.0/CMake/osconfig.h.in -=================================================================== ---- dcmtk-3.6.0.orig/CMake/osconfig.h.in 2010-11-24 14:53:32.000000000 +0100 -+++ dcmtk-3.6.0/CMake/osconfig.h.in 2011-06-17 14:34:56.000000000 +0200 -@@ -677,7 +677,7 @@ - #define PACKAGE_VERSION_SUFFIX "@DCMTK_PACKAGE_VERSION_SUFFIX@" - - /* Define to the version number of this package. */ --#define PACKAGE_VERSION_NUMBER "@DCMTK_PACKAGE_VERSION_NUMBER@" -+#define PACKAGE_VERSION_NUMBER @DCMTK_PACKAGE_VERSION_NUMBER@ - - /* Define path separator */ - #define PATH_SEPARATOR '@PATH_SEPARATOR@' -Index: dcmtk-3.6.0/CMakeLists.txt -=================================================================== ---- dcmtk-3.6.0.orig/CMakeLists.txt 2011-01-06 11:48:43.000000000 +0100 -+++ dcmtk-3.6.0/CMakeLists.txt 2011-06-17 14:34:56.000000000 +0200 -@@ -21,7 +21,7 @@ - SET(DCMTK_PACKAGE_DATE "2011-01-06") - #SET(DCMTK_PACKAGE_TARNAME "dcmtk-3.6.0") - SET(DCMTK_PACKAGE_VERSION "3.6.0") --SET(DCMTK_PACKAGE_VERSION_NUMBER "360") -+SET(DCMTK_PACKAGE_VERSION_NUMBER 360) - SET(DCMTK_PACKAGE_VERSION_SUFFIX "") - #SET(DCMTK_PACKAGE_STRING "dcmtk 3.6.0") - #SET(DCMTK_PACKAGE_BUGREPORT "dicom-b...@offis.de") -Index: dcmtk-3.6.0/config/configure -=================================================================== ---- dcmtk-3.6.0.orig/config/configure 2011-01-06 11:48:47.000000000 +0100 -+++ dcmtk-3.6.0/config/configure 2011-06-17 14:34:56.000000000 +0200 -@@ -1774,13 +1774,13 @@ - - - --PACKAGE_VERSION_NUMBER="360" -+PACKAGE_VERSION_NUMBER=360 - PACKAGE_VERSION_SUFFIX="" - PACKAGE_DATE="2011-01-06" - - - cat >>confdefs.h <<_ACEOF --#define PACKAGE_VERSION_NUMBER "${PACKAGE_VERSION_NUMBER}" -+#define PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION_NUMBER} - _ACEOF - - -Index: dcmtk-3.6.0/config/configure.in -=================================================================== ---- dcmtk-3.6.0.orig/config/configure.in 2011-01-06 11:48:47.000000000 +0100 -+++ dcmtk-3.6.0/config/configure.in 2011-06-17 14:34:56.000000000 +0200 -@@ -8,11 +8,11 @@ - dnl Additional Package Information - dnl ------------------------------------------------------- - --PACKAGE_VERSION_NUMBER="360" -+PACKAGE_VERSION_NUMBER=360 - PACKAGE_VERSION_SUFFIX="" - PACKAGE_DATE="2011-01-06" - --AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,"${PACKAGE_VERSION_NUMBER}",[Define to the version number of this package.]) -+AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,${PACKAGE_VERSION_NUMBER},[Define to the version number of this package.]) - AC_DEFINE_UNQUOTED(PACKAGE_VERSION_SUFFIX,"${PACKAGE_VERSION_SUFFIX}",[Define to the version suffix of this package.]) - AC_DEFINE_UNQUOTED(PACKAGE_DATE,"${PACKAGE_DATE}",[Define to the release date of this package.]) - -Index: dcmtk-3.6.0/dcmdata/include/dcmtk/dcmdata/dcuid.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmdata/include/dcmtk/dcmdata/dcuid.h 2010-11-05 11:26:10.000000000 +0100 -+++ dcmtk-3.6.0/dcmdata/include/dcmtk/dcmdata/dcuid.h 2011-06-17 14:34:56.000000000 +0200 -@@ -1,6 +1,6 @@ - /* - * -- * Copyright (C) 1994-2010, OFFIS e.V. -+ * Copyright (C) 1994-2011, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -20,8 +20,8 @@ - * routines for finding and creating UIDs. - * - * Last Update: $Author: joergr $ -- * Update Date: $Date: 2010-11-05 10:26:10 $ -- * CVS/RCS Revision: $Revision: 1.89 $ -+ * Update Date: $Date: 2011-02-01 17:01:33 $ -+ * CVS/RCS Revision: $Revision: 1.90 $ - * Status: $State: Exp $ - * - * CVS/RCS Log at end of file -@@ -165,16 +165,21 @@ - #error Required compiler definition PACKAGE_VERSION_NUMBER undefined - #endif - -+// helper macros for version number conversion -+ -+#define PACKAGE_VERSION_NUMBER_TO_STRING_( x ) #x -+#define PACKAGE_VERSION_NUMBER_TO_STRING( x ) PACKAGE_VERSION_NUMBER_TO_STRING_( x ) -+ - /* NOTE: Implementation version name VR=SH may not be longer than 16 chars - * The second name is used to identify files written without dcmdata - * (i.e. using the --bit-preserving switch in various tools) - */ - - /// implementation version name for this version of the toolkit --#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME "OFFIS_DCMTK_" PACKAGE_VERSION_NUMBER -+#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME "OFFIS_DCMTK_" PACKAGE_VERSION_NUMBER_TO_STRING(PACKAGE_VERSION_NUMBER) - - /// implementation version name for this version of the toolkit, used for files received in "bit preserving" mode --#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME2 "OFFIS_DCMBP_" PACKAGE_VERSION_NUMBER -+#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME2 "OFFIS_DCMBP_" PACKAGE_VERSION_NUMBER_TO_STRING(PACKAGE_VERSION_NUMBER) - - /// release date of current toolkit release - #ifdef DCMTK_BUILD_DATE -@@ -704,6 +709,10 @@ - /* - ** CVS/RCS Log: - ** $Log: dcuid.h,v $ -+** Revision 1.90 2011-02-01 17:01:33 joergr -+** Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a -+** string. -+** - ** Revision 1.89 2010-11-05 10:26:10 joergr - ** Added new SOP Class UIDs from Supplement 131 and 134 (Implant Templates). - ** diff --git a/sci-libs/dcmtk/files/doubledes.patch b/sci-libs/dcmtk/files/doubledes.patch deleted file mode 100644 index 76ff257a1..000000000 --- a/sci-libs/dcmtk/files/doubledes.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d229d6fe6650427ca7319e5c86032291a5bfe39d Mon Sep 17 00:00:00 2001 -From: Michael Onken <di...@offis.de> -Date: Fri, 26 Jul 2013 22:51:07 +0200 -Subject: [PATCH] Fixed possible doubled destruction of association. - ---- - CHANGES.361 | 5 +++++ - dcmnet/libsrc/scp.cc | 3 +-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -Index: dcmtk-3.6.0/dcmnet/libsrc/scp.cc -=================================================================== ---- dcmtk-3.6.0.orig/dcmnet/libsrc/scp.cc 2010-10-20 10:09:34.000000000 +0200 -+++ dcmtk-3.6.0/dcmnet/libsrc/scp.cc 2013-09-02 11:00:10.455689161 +0200 -@@ -650,7 +650,6 @@ - { - notifyReleaseRequest(); - ASC_acknowledgeRelease(m_assoc); -- ASC_dropSCPAssociation(m_assoc); - } - else if( cond == DUL_PEERABORTEDASSOCIATION ) - { -@@ -1416,7 +1415,7 @@ - if (m_assoc) - { - notifyAssociationTermination(); -- ASC_dropAssociation( m_assoc ); -+ ASC_dropSCPAssociation( m_assoc ); - ASC_destroyAssociation( &m_assoc ); - } - } diff --git a/sci-libs/dcmtk/files/fixnull.patch b/sci-libs/dcmtk/files/fixnull.patch deleted file mode 100644 index 6b6391c5d..000000000 --- a/sci-libs/dcmtk/files/fixnull.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9fc7bd358d1791a14afdd14c81ce9266b7e12b8a Mon Sep 17 00:00:00 2001 -From: Michael Onken <di...@offis.de> -Date: Mon, 27 May 2013 14:52:57 +0200 -Subject: [PATCH] Make sure memcpy does not copy to NULL destination. Thanks to Francesco Gigante - for the report. - ---- - CHANGES.361 | 6 ++++++ - dcmdata/libsrc/dcelem.cc | 7 ++++--- - 2 files changed, 10 insertions(+), 3 deletions(-) - -Index: dcmtk-3.6.0/dcmdata/libsrc/dcelem.cc -=================================================================== ---- dcmtk-3.6.0.orig/dcmdata/libsrc/dcelem.cc 2010-11-05 10:34:14.000000000 +0100 -+++ dcmtk-3.6.0/dcmdata/libsrc/dcelem.cc 2013-05-28 14:11:47.534895101 +0200 -@@ -112,7 +112,8 @@ - if (pad && fValue) - fValue[getLengthField()] = 0; - -- memcpy(fValue, elem.fValue, size_t(getLengthField() + pad)); -+ if (fValue) -+ memcpy(fValue, elem.fValue, size_t(getLengthField() + pad)); - } - - if (elem.fLoadValue) -@@ -179,8 +180,8 @@ - - if (pad && fValue) - fValue[getLengthField()] = 0; -- -- memcpy(fValue, obj.fValue, size_t(getLengthField()+pad)); -+ if (fValue) -+ memcpy(fValue, obj.fValue, size_t(getLengthField()+pad)); - } - - if (obj.fLoadValue) diff --git a/sci-libs/dcmtk/files/noleak.patch b/sci-libs/dcmtk/files/noleak.patch deleted file mode 100644 index ce4a0f759..000000000 --- a/sci-libs/dcmtk/files/noleak.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 904d810a9d62ab0e1e0aac857371b936f0b70289 Mon Sep 17 00:00:00 2001 -From: Joerg Riesmeier <di...@jriesmeier.com> -Date: Fri, 5 Apr 2013 12:32:52 +0200 -Subject: [PATCH] Fixed two possible memory leaks. - -These leaks were found by static code analysis, e.g. using cppcheck. ---- - CHANGES.361 | 4 ++++ - dcmnet/libsrc/assoc.cc | 14 +++++++++++--- - 2 files changed, 15 insertions(+), 3 deletions(-) - -Index: dcmtk-3.6.0/dcmnet/libsrc/assoc.cc -=================================================================== ---- dcmtk-3.6.0.orig/dcmnet/libsrc/assoc.cc 2010-12-01 09:26:35.000000000 +0100 -+++ dcmtk-3.6.0/dcmnet/libsrc/assoc.cc 2013-05-28 14:47:09.770871207 +0200 -@@ -1740,10 +1740,18 @@ - if (cond.bad()) return cond; - - cond = ASC_setTransportLayerType(params, useSecureLayer); -- if (cond.bad()) return cond; -+ if (cond.bad()) -+ { -+ ASC_destroyAssociationParameters(¶ms); -+ return cond; -+ } - - *assoc = (T_ASC_Association *) malloc(sizeof(**assoc)); -- if (*assoc == NULL) return EC_MemoryExhausted; -+ if (*assoc == NULL) -+ { -+ ASC_destroyAssociationParameters(¶ms); -+ return EC_MemoryExhausted; -+ } - bzero((char*)*assoc, sizeof(**assoc)); - - (*assoc)->params = params; diff --git a/sci-libs/dcmtk/files/nothrow.patch b/sci-libs/dcmtk/files/nothrow.patch deleted file mode 100644 index 09e8ad2b0..000000000 --- a/sci-libs/dcmtk/files/nothrow.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 873af0c229b92e5ceba62e5a3f78180a18b395d4 Mon Sep 17 00:00:00 2001 -From: Joerg Riesmeier <di...@jriesmeier.com> -Date: Fri, 5 Apr 2013 11:40:36 +0200 -Subject: [PATCH] Use non-throwing new and delete operator. - -Use a non-throwing new and delete operator for large memory buffers -(e.g. pixel data) in order to avoid exceptions. ---- - CHANGES.361 | 7 +++++++ - dcmimgle/include/dcmtk/dcmimgle/diinpxt.h | 26 +++++++++++++++++++++++--- - 2 files changed, 30 insertions(+), 3 deletions(-) - -Index: dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h 2010-10-14 15:16:26.000000000 +0200 -+++ dcmtk-3.6.0/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h 2013-05-28 14:47:03.782871278 +0200 -@@ -172,7 +172,12 @@ - */ - virtual ~DiInputPixelTemplate() - { -+#if defined(HAVE_STD__NOTHROW) && defined(HAVE_NOTHROW_DELETE) -+ /* use a non-throwing delete (if available) */ -+ operator delete[] (Data, std::nothrow); -+#else - delete[] Data; -+#endif - } - - /** determine minimum and maximum pixel value -@@ -382,7 +387,12 @@ - #endif - /* allocate temporary buffer, even number of bytes required for getUncompressedFrame() */ - const Uint32 extraByte = ((sizeof(T1) == 1) && (count_T1 & 1)) ? 1 : 0; -+#ifdef HAVE_STD__NOTHROW -+ /* use a non-throwing new here (if available) because the allocated buffer can be huge */ -+ pixel = new (std::nothrow) T1[count_T1 + extraByte]; -+#else - pixel = new T1[count_T1 + extraByte]; -+#endif - if (pixel != NULL) - { - if (uncompressed) -@@ -444,7 +454,12 @@ - // # old code: Count = ((lengthBytes * 8) + bitsAllocated - 1) / bitsAllocated; - Count = 8 * length_B1 + (8 * length_B2 + bitsAllocated - 1) / bitsAllocated; - register unsigned long i; -+#ifdef HAVE_STD__NOTHROW -+ /* use a non-throwing new here (if available) because the allocated buffer can be huge */ -+ Data = new (std::nothrow) T2[Count]; -+#else - Data = new T2[Count]; -+#endif - if (Data != NULL) - { - DCMIMGLE_TRACE("Input length: " << lengthBytes << " bytes, Pixel count: " << Count -@@ -609,13 +624,18 @@ - } - } - } else { -- // in case of error, reset pixel count variable -+ /* in case of error, reset pixel count variable */ - Count = 0; - } - if (deletePixel) - { -- // delete temporary buffer -+ /* delete temporary buffer */ -+#if defined(HAVE_STD__NOTHROW) && defined(HAVE_NOTHROW_DELETE) -+ /* use a non-throwing delete (if available) */ -+ operator delete[] (pixel, std::nothrow); -+#else - delete[] pixel; -+#endif - } - } - diff --git a/sci-libs/dcmtk/files/prefs.patch b/sci-libs/dcmtk/files/prefs.patch deleted file mode 100644 index de9fc9df7..000000000 --- a/sci-libs/dcmtk/files/prefs.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Jürgen Salk <j...@debian.org> -Description: The original maintainer Jürgen Salk applied - a set of patches to the original code. The part which fixes - the path to the perl executable is collected in this patch set. - -Index: dcmtk-3.6.0/dcmwlm/perl/prefs.ph -=================================================================== ---- dcmtk-3.6.0.orig/dcmwlm/perl/prefs.ph 2011-01-28 10:10:01.000000000 +0100 -+++ dcmtk-3.6.0/dcmwlm/perl/prefs.ph 2011-01-28 10:10:03.000000000 +0100 -@@ -45,13 +45,13 @@ - # --------------------- WWW Server Configuration --------------------- - - # RELATIVE path to the WWW script directory, as seen by httpd --$prefs{'cgi_path'} = '/cgi-bin/worklist'; -+$prefs{'cgi_path'} = '/cgi-bin/dcmtk_wlm'; - - # RELATIVE path to the WWW html directory, as seen by httpd --$prefs{'html_path'} = '/worklist'; -+$prefs{'html_path'} = '/dcmtk_wlm'; - - # ABSOLUTE path to the data directory --$prefs{'data_path'} = '/home/www/wl-data'; -+$prefs{'data_path'} = '/var/lib/dcmtk/wl-data'; - - # ------------------ Constants - Please do not change! ------------------ - diff --git a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch b/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch deleted file mode 100644 index f95cb2ef3..000000000 --- a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch +++ /dev/null @@ -1,98 +0,0 @@ -From: Joerg Riesmeier <di...@offis.de> -Date: Tue, 1 Mar 2011 10:04:16 +0000 (+0000) -Subject: Fixed some private tags copied from Philips MR Achieva conformance statement. -X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=0d3d794e71a3b9035c154a266834f93383083819;hp=0025bc0f762e96afec42dfff505386b3d591f6f7 - -Fixed some private tags copied from Philips MR Achieva conformance statement. -Also added a couple of new private tags from the same conformance statement. ---- - -Index: dcmtk-3.6.0/dcmdata/data/private.dic -=================================================================== ---- dcmtk-3.6.0.orig/dcmdata/data/private.dic 2010-11-22 11:39:26.000000000 +0100 -+++ dcmtk-3.6.0/dcmdata/data/private.dic 2011-06-17 14:40:20.000000000 +0200 -@@ -35,6 +35,7 @@ - # - Philips Digital Diagnost 1.3 conformance statement - # - Philips Integris H, catheterization laboratory, RIS-interface - # - Philips Intera Achieva Conformance Statement -+# - Philips MR Achieva Conformance Statement - # - Siemens Somatom syngo VA40B conformance statement - # - Siemens AXIOM Artis VB30 conformance statement - # - SonoWand Invite 2.1.1 conformance statement -@@ -1159,7 +1160,7 @@ - (2001,"Philips Imaging DD 001",35) SS StackSliceNumber 1 - (2001,"Philips Imaging DD 001",36) CS StackType 1 - (2001,"Philips Imaging DD 001",3f) CS ZoomMode 1 --(2001,"Philips Imaging DD 001",5f) SQ StackSequence 1-n -+(2001,"Philips Imaging DD 001",5f) SQ StackSequence 1 - (2001,"Philips Imaging DD 001",60) SL NumberOfStacks 1 - (2001,"Philips Imaging DD 001",61) CS SeriesTransmitted 1 - (2001,"Philips Imaging DD 001",62) CS SeriesCommitted 1 -@@ -1204,7 +1205,7 @@ - (2001,"PHILIPS IMAGING DD 001",35) SS StackSliceNumber 1 - (2001,"PHILIPS IMAGING DD 001",36) CS StackType 1 - (2001,"PHILIPS IMAGING DD 001",3f) CS ZoomMode 1 --(2001,"PHILIPS IMAGING DD 001",5f) SQ StackSequence 1-n -+(2001,"PHILIPS IMAGING DD 001",5f) SQ StackSequence 1 - (2001,"PHILIPS IMAGING DD 001",60) SL NumberOfStacks 1 - (2001,"PHILIPS IMAGING DD 001",61) CS SeriesTransmitted 1 - (2001,"PHILIPS IMAGING DD 001",62) CS SeriesCommitted 1 -@@ -1221,12 +1222,6 @@ - (2005,"Philips MR Imaging DD 001",1f) SH MPRProtocol 1 - (2005,"Philips MR Imaging DD 001",20) SL NumberOfChemicalShifts 1 - (2005,"Philips MR Imaging DD 001",2d) SS NumberOfStackSlices 1 --(2005,"Philips MR Imaging DD 001",32) FL StackRadialAngle 1 --(2005,"Philips MR Imaging DD 001",33) CS StackRadialAxis 1 --(2005,"Philips MR Imaging DD 001",35) SS StackSliceNumber 1 --(2005,"Philips MR Imaging DD 001",36) CS StackType 1 --(2005,"Philips MR Imaging DD 001",a1) CS SyncraScanType 1 --(2005,"Philips MR Imaging DD 001",5f) SQ StackSequence 1 - (2005,"Philips MR Imaging DD 001",83) SQ Unknown 1 - - (2005,"Philips MR Imaging DD 005",02) SQ Unknown 1 -@@ -1240,12 +1235,6 @@ - (2005,"PHILIPS MR IMAGING DD 001",1f) SH MPRProtocol 1 - (2005,"PHILIPS MR IMAGING DD 001",20) SL NumberOfChemicalShifts 1 - (2005,"PHILIPS MR IMAGING DD 001",2d) SS NumberOfStackSlices 1 --(2005,"PHILIPS MR IMAGING DD 001",32) FL StackRadialAngle 1 --(2005,"PHILIPS MR IMAGING DD 001",33) CS StackRadialAxis 1 --(2005,"PHILIPS MR IMAGING DD 001",35) SS StackSliceNumber 1 --(2005,"PHILIPS MR IMAGING DD 001",36) CS StackType 1 --(2005,"PHILIPS MR IMAGING DD 001",a1) CS SyncraScanType 1 --(2005,"PHILIPS MR IMAGING DD 001",5f) SQ StackSequence 1 - (2005,"PHILIPS MR IMAGING DD 001",83) SQ Unknown 1 - - (0019,"PHILIPS MR R5.5/PART",1000) DS FieldOfView 1 -Index: dcmtk-3.6.0/dcmdata/libsrc/dcdictzz.cc -=================================================================== ---- dcmtk-3.6.0.orig/dcmdata/libsrc/dcdictzz.cc 2010-11-22 11:48:17.000000000 +0100 -+++ dcmtk-3.6.0/dcmdata/libsrc/dcdictzz.cc 2011-06-17 14:41:07.000000000 +0200 -@@ -20753,11 +20817,11 @@ - DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "PHILIPS IMAGING DD 001" } - , { 0x2001, 0x005f, 0x2001, 0x005f, -- EVR_SQ, "StackSequence", 1, -1, "DICOM", -+ EVR_SQ, "StackSequence", 1, 1, "DICOM", - DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "Philips Imaging DD 001" } - , { 0x2001, 0x005f, 0x2001, 0x005f, -- EVR_SQ, "StackSequence", 1, -1, "DICOM", -+ EVR_SQ, "StackSequence", 1, 1, "DICOM", - DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "PHILIPS IMAGING DD 001" } - , { 0x2001, 0x0060, 0x2001, 0x0060, -@@ -20884,14 +20996,6 @@ - EVR_CS, "StackType", 1, 1, "DICOM", - DcmDictRange_Unspecified, DcmDictRange_Unspecified, - "PHILIPS MR IMAGING DD 001" } -- , { 0x2005, 0x005f, 0x2005, 0x005f, -- EVR_SQ, "StackSequence", 1, 1, "DICOM", -- DcmDictRange_Unspecified, DcmDictRange_Unspecified, -- "Philips MR Imaging DD 001" } -- , { 0x2005, 0x005f, 0x2005, 0x005f, -- EVR_SQ, "StackSequence", 1, 1, "DICOM", -- DcmDictRange_Unspecified, DcmDictRange_Unspecified, -- "PHILIPS MR IMAGING DD 001" } - , { 0x2005, 0x0083, 0x2005, 0x0083, - EVR_SQ, "Unknown", 1, 1, "DICOM", - DcmDictRange_Unspecified, DcmDictRange_Unspecified, diff --git a/sci-libs/dcmtk/files/use_correct_number_of_TS.patch b/sci-libs/dcmtk/files/use_correct_number_of_TS.patch deleted file mode 100644 index efb686ea2..000000000 --- a/sci-libs/dcmtk/files/use_correct_number_of_TS.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fixed crash if less than four transfer syntaxes are enabled. - This fixes debian bug #703716. - Affects: dcmqrdb/libsrc/dcmqrsrv.cc -Author: Uli Schlachter <uli.schlach...@informatik.uni-oldenburg.de> -Bug-Debian: http://bugs.debian.org/703716 - -Index: dcmtk-3.6.0/dcmqrdb/libsrc/dcmqrsrv.cc -=================================================================== ---- dcmtk-3.6.0.orig/dcmqrdb/libsrc/dcmqrsrv.cc 2010-10-14 15:14:36.000000000 +0200 -+++ dcmtk-3.6.0/dcmqrdb/libsrc/dcmqrsrv.cc 2013-05-15 09:39:13.327725435 +0200 -@@ -786,7 +786,7 @@ - cond = ASC_acceptContextsWithPreferredTransferSyntaxes( - assoc->params, - dcmAllStorageSOPClassUIDs, numberOfAllDcmStorageSOPClassUIDs, -- (const char**)transferSyntaxes, DIM_OF(transferSyntaxes)); -+ (const char**)transferSyntaxes, numTransferSyntaxes); - if (cond.bad()) { - DCMQRDB_ERROR("Cannot accept presentation contexts: " << DimseCondition::dump(temp_str, cond)); - } diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml deleted file mode 100644 index 0d60702ee..000000000 --- a/sci-libs/dcmtk/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>s...@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> -DCMTK is a collection of libraries and applications implementing large -parts the DICOM standard. It includes software for examining, -constructing and converting DICOM image files, handling offline media, -sending and receiving images over a network connection, as well as -demonstrative image storage and worklist servers. -</longdescription> - <longdescription lang="fr"> -DCMTK est un ensemble de bibliothèques et d'application implémentant -une grande partie du standard DICOM. Cela comprend des logiciels de -visualisation et de conversion des fichier image, de manipulation de -médias locaux, de réception et d'envoi d'images à travers un réseau -ainsi qu'un serveur d'images et de worklist de demonstration. -</longdescription> -</pkgmetadata>
