commit: 8b42415404eb3335b89ffb3d42d85fae6273294c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 5 19:07:46 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 5 21:17:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b424154
sci-libs/dcmtk: Drop vulnerable 3.6.0 Closes: https://bugs.gentoo.org/602918 Closes: https://bugs.gentoo.org/602920 Closes: https://bugs.gentoo.org/618762 Package-Manager: Portage-2.3.49, Repoman-2.3.10 sci-libs/dcmtk/Manifest | 1 - sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 98 ------- sci-libs/dcmtk/files/01_fix_perl_script_path.patch | 222 -------------- sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch | 89 ------ sci-libs/dcmtk/files/04_nostrip.patch | 171 ----------- sci-libs/dcmtk/files/dcmtk-asneeded.patch | 63 ---- sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch | 16 -- sci-libs/dcmtk/files/dcmtk-gcc472-error.patch | 318 --------------------- sci-libs/dcmtk/files/dcmtk_version_number.patch | 131 --------- sci-libs/dcmtk/files/png_tiff.patch | 11 - .../files/regression_stacksequenceisodd.patch | 98 ------- 11 files changed, 1218 deletions(-) diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index dd9494962b5..fd3e552a864 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -1,2 +1 @@ -DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8 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 1a94d20b506..00000000000 --- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit cmake-utils eutils - -DESCRIPTION="The DICOM Toolkit" -HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"; -SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/${P}.tar.gz"; - -LICENSE="OFFIS" -KEYWORDS="~amd64 ~arm ~x86" -SLOT="0" -IUSE="doc png ssl tcpd tiff +threads xml zlib" - -RDEPEND=" - virtual/jpeg:0 - png? ( media-libs/libpng:* ) - ssl? ( dev-libs/openssl:0 ) - tcpd? ( sys-apps/tcp-wrappers ) - tiff? ( media-libs/tiff:0 ) - xml? ( dev-libs/libxml2:2 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - media-gfx/graphviz" - -PATCHES=( - "${FILESDIR}"/01_fix_perl_script_path.patch - "${FILESDIR}"/02_dcmtk_3.6.0-1.patch - "${FILESDIR}"/04_nostrip.patch - "${FILESDIR}"/dcmtk_version_number.patch - "${FILESDIR}"/png_tiff.patch - "${FILESDIR}"/regression_stacksequenceisodd.patch - "${FILESDIR}"/${PN}-asneeded.patch - "${FILESDIR}"/${PN}-gcc472-error.patch - "${FILESDIR}"/${PN}-fix_doc_install.patch -) - -src_prepare() { - cmake-utils_src_prepare - - sed -e "s:share/doc/dcmtk:&-${PV}:" \ - -e "s:DIR \"/:DIR \"/usr/:" \ - -e "s:usr/etc:etc:" \ - -e "s:/lib\":/$(get_libdir)\":" \ - -e "s:COPYRIGHT::" \ - -i CMakeLists.txt || die - sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \ - -i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die - # Temporary workaround: docs are not built with CMake - sed -i -e '/include/d' doxygen/Makefile.in || die - - # fix -D deprecation warnings - sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \ - "${S}"/config/configure.in \ - "${S}"/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCMAKE_INSTALL_PREFIX=/ - $(cmake-utils_use tiff DCMTK_WITH_TIFF) - $(cmake-utils_use png DCMTK_WITH_PNG) - $(cmake-utils_use xml DCMTK_WITH_XML) - $(cmake-utils_use zlib DCMTK_WITH_ZLIB) - $(cmake-utils_use ssl DCMTK_WITH_OPENSSL) - $(cmake-utils_use doc DCMTK_WITH_DOXYGEN) - $(cmake-utils_use threads DCMTK_WITH_THREADS) - ) - - cmake-utils_src_configure - - if use doc; then - cd "${S}"/doxygen || die - econf - fi -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - emake -C "${S}"/doxygen - fi -} - -src_install() { - cmake-utils_src_install - - doman doxygen/manpages/man1/* - - if use doc; then - dohtml -r "${S}"/doxygen/htmldocs/* - fi -} diff --git a/sci-libs/dcmtk/files/01_fix_perl_script_path.patch b/sci-libs/dcmtk/files/01_fix_perl_script_path.patch deleted file mode 100644 index 9f002d85640..00000000000 --- a/sci-libs/dcmtk/files/01_fix_perl_script_path.patch +++ /dev/null @@ -1,222 +0,0 @@ -Author: Jürgen Salk <[email protected]> -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. - ---- dcmtk-3.5.5_20101130/dcmwlm/perl/changepw.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/changepw.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/checkvr.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/checkvr.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/isocode.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/isocode.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/layout.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/layout.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/lock.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/lock.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/log.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/log.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/main.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/main.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/password.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/password.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/patidel.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patidel.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/patiedit.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patiedit.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/patient.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patient.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/prefs.ph 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prefs.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/procdel.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procdel.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/procedit.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedit.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/procedur.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedur.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/procstep.pl 2010-10-14 15:02:01.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procstep.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/prstdel.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstdel.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/prstedit.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstedit.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/statdel.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statdel.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/statedit.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statedit.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/station.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/station.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/urldecod.ph 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/urldecod.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright & Disclaimer. - # This set of routines may be freely distributed, modified and ---- dcmtk-3.5.5_20101130/dcmwlm/perl/workdel.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workdel.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/workedit.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workedit.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/worklist.pl 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/worklist.pl 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. ---- dcmtk-3.5.5_20101130/dcmwlm/perl/write.ph 2010-10-14 15:02:02.000000000 +0200 -+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/write.ph 2010-12-09 11:50:35.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # Copyright (C) 1996-2010, OFFIS e.V. - # All rights reserved. See COPYRIGHT file for details. -@@ -59,7 +59,7 @@ - if (open(outfile, ">@_[0]")) - { - print outfile <<EOF; --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # automatically generated by write.pl - do not modify! - # 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 11aaaec3764..00000000000 --- a/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch +++ /dev/null @@ -1,89 +0,0 @@ -Author: Jürgen Salk <[email protected]> -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/04_nostrip.patch b/sci-libs/dcmtk/files/04_nostrip.patch deleted file mode 100644 index c4a109ca5df..00000000000 --- a/sci-libs/dcmtk/files/04_nostrip.patch +++ /dev/null @@ -1,171 +0,0 @@ -Remove all hardcoded calls to `strip` command - -Index: dcmtk-3.6.0/config/templates/Makefile.src -=================================================================== ---- dcmtk-3.6.0.orig/config/templates/Makefile.src 2009-01-30 10:27:58.000000000 +0100 -+++ dcmtk-3.6.0/config/templates/Makefile.src 2011-01-28 09:53:28.000000000 +0100 -@@ -31,7 +31,7 @@ - install-bin: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmdata/apps/Makefile.in 2009-11-04 10:58:05.000000000 +0100 -+++ dcmtk-3.6.0/dcmdata/apps/Makefile.in 2011-01-28 09:53:45.000000000 +0100 -@@ -76,7 +76,7 @@ - install-bin: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmimage/apps/Makefile.in 2009-10-13 16:08:33.000000000 +0200 -+++ dcmtk-3.6.0/dcmimage/apps/Makefile.in 2011-01-28 09:53:59.000000000 +0100 -@@ -42,7 +42,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmimgle/apps/Makefile.in 2009-10-28 10:53:39.000000000 +0100 -+++ dcmtk-3.6.0/dcmimgle/apps/Makefile.in 2011-01-28 09:54:11.000000000 +0100 -@@ -39,7 +39,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmjpeg/apps/Makefile.in 2009-10-07 14:44:33.000000000 +0200 -+++ dcmtk-3.6.0/dcmjpeg/apps/Makefile.in 2011-01-28 09:54:28.000000000 +0100 -@@ -72,7 +72,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - clean: -Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmnet/apps/Makefile.in 2009-11-04 11:24:29.000000000 +0100 -+++ dcmtk-3.6.0/dcmnet/apps/Makefile.in 2011-01-28 09:54:50.000000000 +0100 -@@ -52,7 +52,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmpstat/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200 -+++ dcmtk-3.6.0/dcmpstat/apps/Makefile.in 2011-01-28 09:55:10.000000000 +0100 -@@ -113,7 +113,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmqrdb/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100 -+++ dcmtk-3.6.0/dcmqrdb/apps/Makefile.in 2011-01-28 09:55:24.000000000 +0100 -@@ -57,7 +57,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmsign/apps/Makefile.in 2009-09-04 17:42:31.000000000 +0200 -+++ dcmtk-3.6.0/dcmsign/apps/Makefile.in 2011-01-28 09:55:35.000000000 +0100 -@@ -33,7 +33,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmsr/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200 -+++ dcmtk-3.6.0/dcmsr/apps/Makefile.in 2011-01-28 09:55:48.000000000 +0100 -@@ -44,7 +44,7 @@ - install-bin: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmwlm/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100 -+++ dcmtk-3.6.0/dcmwlm/apps/Makefile.in 2011-01-28 09:55:58.000000000 +0100 -@@ -49,7 +49,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmwlm/wwwapps/Makefile.in 2009-11-04 11:24:30.000000000 +0100 -+++ dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in 2011-01-28 09:56:33.000000000 +0100 -@@ -55,7 +55,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - -Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in -=================================================================== ---- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in 2011-01-28 09:56:54.000000000 +0100 -+++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in 2011-01-28 09:57:00.000000000 +0100 -@@ -71,7 +71,7 @@ - install: all - $(configdir)/mkinstalldirs $(DESTDIR)$(bindir) - for prog in $(progs); do \ -- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\ -+ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\ - done - - diff --git a/sci-libs/dcmtk/files/dcmtk-asneeded.patch b/sci-libs/dcmtk/files/dcmtk-asneeded.patch deleted file mode 100644 index a27e46eda2a..00000000000 --- a/sci-libs/dcmtk/files/dcmtk-asneeded.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- dcmimgle/libsrc/CMakeLists.txt.orig 2010-10-14 12:19:24.416833916 +0200 -+++ dcmimgle/libsrc/CMakeLists.txt 2010-10-14 12:18:51.682258692 +0200 -@@ -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.orig 2010-10-14 12:26:05.324680803 +0200 -+++ dcmpstat/libsrc/CMakeLists.txt 2010-10-14 12:26:35.309298272 +0200 -@@ -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 dcmsr) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat) ---- dcmsign/libsrc/CMakeLists.txt.orig 2010-10-14 12:37:02.149984538 +0200 -+++ dcmsign/libsrc/CMakeLists.txt 2010-10-14 12:38:53.602332737 +0200 -@@ -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.orig 2010-10-14 12:45:06.926394516 +0200 -+++ dcmimage/libsrc/CMakeLists.txt 2010-10-14 12:46:05.197437359 +0200 -@@ -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.orig 2010-10-14 12:44:00.991741511 +0200 -+++ dcmdata/libsrc/CMakeLists.txt 2010-10-14 12:44:55.918954304 +0200 -@@ -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.orig 2010-10-14 14:45:48.736866802 +0200 -+++ dcmsr/libsrc/CMakeLists.txt 2010-10-14 14:46:40.910215801 +0200 -@@ -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) ---- dcmtls/libsrc/CMakeLists.txt.orig 2012-11-11 19:19:00.832767189 -0800 -+++ dcmtls/libsrc/CMakeLists.txt 2012-11-11 19:29:43.887972426 -0800 -@@ -1,5 +1,6 @@ - # create library from source files - ADD_LIBRARY(dcmtls tlslayer tlstrans tlsscu) - -+TARGET_LINK_LIBRARIES(dcmtls ${OPENSSL_LIBS}) - # declare installation files - INSTALL_TARGETS(${INSTALL_LIBDIR} dcmtls) diff --git a/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch b/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch deleted file mode 100644 index 50f4a362dcc..00000000000 --- a/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt -index 6a0323f..4f18087 100644 ---- a/doxygen/CMakeLists.txt -+++ b/doxygen/CMakeLists.txt -@@ -32,9 +32,9 @@ IF(DCMTK_WITH_DOXYGEN) - ENDIF(NOT WIN32) - - # install html docs and manpages -- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htmldocs/ DESTINATION ${CMAKE_INSTALL_PREFIX}${INSTALL_HTMDIR} PATTERN "CVS" EXCLUDE) -+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htmldocs/ DESTINATION ${INSTALL_HTMDIR} PATTERN "CVS" EXCLUDE) - IF(NOT WIN32) -- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/manpages/ DESTINATION ${CMAKE_INSTALL_PREFIX}${INSTALL_MANDIR} PATTERN "CVS" EXCLUDE) -+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/manpages/ DESTINATION ${INSTALL_MANDIR} PATTERN "CVS" EXCLUDE) - ENDIF(NOT WIN32) - - # cleanup created files on "make clean" - directories are not removed with CMake 2.4 :-/ diff --git a/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch b/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch deleted file mode 100644 index 9d344d7206e..00000000000 --- a/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch +++ /dev/null @@ -1,318 +0,0 @@ ---- ofstd/include/dcmtk/ofstd/ofoset.h.orig 2013-06-22 09:11:13.000000000 -0700 -+++ ofstd/include/dcmtk/ofstd/ofoset.h 2013-06-22 09:12:07.000000000 -0700 -@@ -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 ); ---- dcmimage/include/dcmtk/dcmimage/diargpxt.h.orig 2013-06-22 09:32:37.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/diargpxt.h 2013-06-22 09:34:20.000000000 -0700 -@@ -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)); ---- dcmimage/include/dcmtk/dcmimage/dicmypxt.h.orig 2013-06-22 09:44:02.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dicmypxt.h 2013-06-22 09:51:29.000000000 -0700 -@@ -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 ---- dcmimgle/include/dcmtk/dcmimgle/discalet.h.orig 2013-06-22 09:52:08.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/discalet.h 2013-06-22 09:54:35.000000000 -0700 -@@ -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 { - - /* ---- dcmimage/include/dcmtk/dcmimage/dicocpt.h.orig 2013-06-22 10:01:51.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dicocpt.h 2013-06-22 10:03:10.000000000 -0700 -@@ -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()); ---- dcmimage/include/dcmtk/dcmimage/dicosct.h.orig 2013-06-22 10:03:27.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dicosct.h 2013-06-22 10:04:56.000000000 -0700 -@@ -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); - } - }; - ---- dcmimage/include/dcmtk/dcmimage/dicoflt.h.orig 2013-06-22 10:05:04.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dicoflt.h 2013-06-22 10:08:17.000000000 -0700 -@@ -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); - } - } - }; ---- dcmimage/include/dcmtk/dcmimage/dicorot.h.orig 2013-06-22 10:08:25.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dicorot.h 2013-06-22 10:09:57.000000000 -0700 -@@ -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); - } - } - }; ---- dcmimage/include/dcmtk/dcmimage/dihsvpxt.h.orig 2013-06-22 10:10:11.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h 2013-06-22 10:10:54.000000000 -0700 -@@ -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]; ---- dcmimage/include/dcmtk/dcmimage/dipalpxt.h.orig 2013-06-22 10:18:26.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dipalpxt.h 2013-06-22 10:19:13.000000000 -0700 -@@ -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; ---- dcmimage/include/dcmtk/dcmimage/diybrpxt.h.orig 2013-06-22 10:34:13.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/diybrpxt.h 2013-06-22 10:34:48.000000000 -0700 -@@ -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' ---- dcmimage/include/dcmtk/dcmimage/dirgbpxt.h.orig 2013-06-22 10:35:08.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h 2013-06-22 10:35:39.000000000 -0700 -@@ -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 ---- dcmimage/include/dcmtk/dcmimage/diyp2pxt.h.orig 2013-06-22 10:35:45.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h 2013-06-22 10:36:34.000000000 -0700 -@@ -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]; ---- dcmimage/include/dcmtk/dcmimage/diyf2pxt.h.orig 2013-06-22 10:36:47.000000000 -0700 -+++ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h 2013-06-22 10:37:19.000000000 -0700 -@@ -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; ---- dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h.orig 2013-06-22 10:44:20.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h 2013-06-22 10:47:08.000000000 -0700 -@@ -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())); - } - } - } ---- dcmimgle/include/dcmtk/dcmimgle/dimosct.h.orig 2013-06-22 10:47:22.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/dimosct.h 2013-06-22 10:48:02.000000000 -0700 -@@ -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); - } - } - } ---- dcmimgle/include/dcmtk/dcmimgle/dimoflt.h.orig 2013-06-22 10:48:07.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/dimoflt.h 2013-06-22 10:48:37.000000000 -0700 -@@ -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); - } - } - } ---- dcmimgle/include/dcmtk/dcmimgle/dimorot.h,orig 2013-06-22 10:50:38.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/dimorot.h 2013-06-22 10:53:57.000000000 -0700 -@@ -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)); - } - } - } ---- dcmimgle/include/dcmtk/dcmimgle/diflipt.h.orig 2013-06-22 11:03:34.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/diflipt.h 2013-06-22 11:04:43.000000000 -0700 -@@ -123,13 +123,13 @@ - if ((src != NULL) && (dest != NULL)) - { - if (horz && vert) -- flipHorzVert(src, dest); -+ this->flipHorzVert(src, dest); - else if (horz) -- flipHorz(src, dest); -+ this->flipHorz(src, dest); - else if (vert) -- flipVert(src, dest); -+ this->flipVert(src, dest); - else -- copyPixel(src, dest); -+ this->copyPixel(src, dest); - } - } - ---- dcmimgle/include/dcmtk/dcmimgle/dirotat.h.orig 2013-06-22 11:06:17.000000000 -0700 -+++ dcmimgle/include/dcmtk/dcmimgle/dirotat.h 2013-06-22 11:07:00.000000000 -0700 -@@ -126,13 +126,13 @@ - const int degree) - { - if (degree == 90) -- rotateRight(src, dest); -+ this->rotateRight(src, dest); - else if (degree == 180) -- rotateTopDown(src, dest); -+ this->rotateTopDown(src, dest); - else if (degree == 270) -- rotateLeft(src, dest); -+ this->rotateLeft(src, dest); - else -- copyPixel(src, dest); -+ this->copyPixel(src, dest); - } - - 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 130a3bfb8ef..00000000000 --- a/sci-libs/dcmtk/files/dcmtk_version_number.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Joerg Riesmeier <[email protected]> -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 "[email protected]") -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/png_tiff.patch b/sci-libs/dcmtk/files/png_tiff.patch deleted file mode 100644 index 0c498838816..00000000000 --- a/sci-libs/dcmtk/files/png_tiff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dcmtk-3.5.5_20100504/dcmjpls/apps/Makefile.in 2010-12-09 11:27:05.000000000 +0100 -+++ dcmtk-3.5.5_20100504.old/dcmjpls/apps/Makefile.in 2010-12-09 11:27:44.000000000 +0100 -@@ -50,7 +50,7 @@ - LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \ - $(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) - LOCALLIBS = $(dcmjplslib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \ -- $(libcharlslib) $(ZLIBLIBS) -+ $(libcharlslib) $(ZLIBLIBS) $(TIFFLIBS) $(PNGLIBS) - PNMLIBS = $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) - - objs = dcmdjpls.o dcmcjpls.o dcml2pnm.o diff --git a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch b/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch deleted file mode 100644 index f95cb2ef3b3..00000000000 --- a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch +++ /dev/null @@ -1,98 +0,0 @@ -From: Joerg Riesmeier <[email protected]> -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,
