debian/0000755000000000000000000000000012211052570007161 5ustar debian/dcmtk.examples0000644000000000000000000000005111514634262012030 0ustar dcmwlm/data/wlistdb dcmwlm/data/wlistqry debian/control0000644000000000000000000001056012211052474010571 0ustar Source: dcmtk Section: science Priority: optional Maintainer: Debian Med Packaging Team Uploaders: Juergen Salk , Andreas Tille , Mathieu Malaterre Build-Depends: autoconf, autotools-dev, debhelper (>= 9), doxygen (>= 1.7.4), dpkg-dev (>= 1.16.1~), graphviz, libcharls-dev, libpng-dev, libssl-dev, libtiff-dev, libwrap0-dev, libxml2-dev, zlib1g-dev Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dcmtk/trunk/ Homepage: http://dicom.offis.de/dcmtk Package: dcmtk Architecture: any Depends: adduser (>= 3.34), ${misc:Depends}, ${shlibs:Depends} Description: OFFIS DICOM toolkit command line utilities DCMTK includes a collection of libraries and applications 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. . This package contains the DCMTK utility applications. . Note: This version was compiled with libssl support. Package: libdcmtk2 Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: dcmtk (<< 3.6.0) Description: OFFIS DICOM toolkit runtime libraries DCMTK includes a collection of libraries and applications 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. . This package contains the runtime libraries for the DCMTK utility applications. . Note: This version was compiled with libssl support. Package: libdcmtk2-dev Section: libdevel Architecture: any Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Conflicts: libdcmtk1-dev Replaces: libdcmtk1-dev Provides: libdcmtk-dev Suggests: dcmtk-doc Description: OFFIS DICOM toolkit development libraries and headers DCMTK includes a collection of libraries and applications 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. . This package contains development libraries and headers for DCMTK. You only need to install this if you are developing programs that use the DCMTK libraries. . Note: This version was compiled with libssl support. Package: dcmtk-www Section: web Architecture: any Depends: dcmtk, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Recommends: apache2 | httpd Description: OFFIS DICOM toolkit worklist www server application DCMTK includes a collection of libraries and applications 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. . This package contains the DICOM basic worklist management web server application. You only need to install this if you want to manage worklist entries using a web browser. Package: dcmtk-doc Section: doc Architecture: all Depends: ${misc:Depends} Suggests: dcmtk, libdcmtk2-dev Description: OFFIS DICOM toolkit documentation DCMTK includes a collection of libraries and applications 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. . This package contains the on-line documentation for the DCMTK libraries and utilities in HTML format. Package: libdcmtk2-dbg Section: debug Architecture: any Priority: extra Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends} Description: OFFIS DICOM toolkit library debugging symbols DCMTK includes a collection of libraries and applications 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. . This package contains the debugging symbols for libdcmtk2. debian/dcmtk-doc.doc-base0000644000000000000000000000070411012650345012430 0ustar Document: dcmtk-doc Title: Documentation of DCMTK Author: OFFIS DICOM Team Abstract: This manual comprises the complete on-line documentation for the DICOM ToolKit (DCMTK) packages. It covers the end user applications as well as the development library interfaces including a wide variety of coding examples. Section: Science/Medicine Format: HTML Index: /usr/share/doc/dcmtk/html/index.html Files: /usr/share/doc/dcmtk/html/* debian/.directory0000644000000000000000000000004611012566355011177 0ustar [URL properties] ViewMode=fsview_part debian/dcmtk-www.dirs0000644000000000000000000000002411305516316011772 0ustar /etc/apache2/conf.d debian/storescp.default0000644000000000000000000000006011611317044012370 0ustar # Run storescp at startup ? STORESCP_ENABLE=No debian/dcmtk.postrm0000644000000000000000000000067711725504717011561 0ustar #!/bin/sh set -e # Remove possible leftovers of imagectn -> dcmqrscp transition if [ "$1" = "purge" ] ; then if [ -d /var/lib/dcmtk/db ]; then rmdir -p --ignore-fail-on-non-empty /var/lib/dcmtk/db/STORESCP || : fi if [ -e /etc/default/imagectn.dpkg-old ]; then rm -f /etc/default/imagectn.dpkg-old fi if [ -e /etc/init.d/imagectn.dpkg-old ]; then rm -f /etc/init.d/imagectn.dpkg-old fi fi #DEBHELPER# debian/dcmtk.prerm0000644000000000000000000000041611725504717011351 0ustar #!/bin/sh set -e # This is in case we upgrade from dcmtk version < 3.5.4 if [ -x "/etc/init.d/imagectn" ]; then if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d --quiet imagectn stop else /etc/init.d/imagectn stop fi fi #DEBHELPER# exit 0 debian/patches/0000755000000000000000000000000012211052570010610 5ustar debian/patches/regression_stacksequenceisodd.patch0000644000000000000000000001157511577117444020003 0ustar From: Joerg Riesmeier 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, debian/patches/fixnull.patch0000644000000000000000000000234212151127050013312 0ustar From 9fc7bd358d1791a14afdd14c81ce9266b7e12b8a Mon Sep 17 00:00:00 2001 From: Michael Onken 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) debian/patches/07_doxygen.patch0000644000000000000000000025411611663204706013637 0ustar Index: dcmtk-3.6.0/doxygen/htmldocs.cfg =================================================================== --- dcmtk-3.6.0.orig/doxygen/htmldocs.cfg 2011-11-23 15:49:41.000000000 +0100 +++ dcmtk-3.6.0/doxygen/htmldocs.cfg 2011-11-23 15:50:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Doxyfile 1.5.1 +# Doxyfile 1.7.1 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,438 +14,560 @@ # Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = "OFFIS DCMTK" -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = "Version @DCMTK_VERSION@" -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. STRIP_FROM_PATH = .. -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = YES -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = NO -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 4 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = YES -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = NO -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = NO -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = NO -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = NO -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = # MODULE_DCMJP2K MODULE_DCMPPS MODULE_DCMSTCOM MODULE_DCMRT +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = NO -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. WARN_LOGFILE = htmldocs.log @@ -454,98 +576,117 @@ # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = @DOXYGEN_INPUT_DIR@ -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.h \ *.man \ *.dox -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. EXCLUDE = @DOXYGEN_INPUT_DIR@/config/include \ @DOXYGEN_INPUT_DIR@/docs -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). EXAMPLE_PATH = @DOXYGEN_INPUT_DIR@ -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = YES -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -554,32 +695,32 @@ # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = YES -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -587,20 +728,21 @@ # If the REFERENCES_LINK_SOURCE tag is set to YES (the default) # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. +# link to the source code. +# Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -609,279 +751,488 @@ # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 3 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = htmldocs -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. HTML_FOOTER = @DOXYGEN_DATA_DIR@/footer.html -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. CHM_FILE = dcmtk354.chm -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = YES -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = YES -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = YES -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -890,33 +1241,33 @@ # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -925,10 +1276,10 @@ # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -937,82 +1288,84 @@ # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. PREDEFINED = WITH_OPENSSL \ @@ -1104,7 +1457,7 @@ # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = NO +HAVE_DOT = YES # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and @@ -1182,7 +1535,7 @@ # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. debian/patches/removedocsfromall.patch0000644000000000000000000000122411547025671015370 0ustar Index: dcmtk-3.6.0/doxygen/Makefile.in =================================================================== --- dcmtk-3.6.0.orig/doxygen/Makefile.in 2011-04-06 10:58:18.000000000 +0200 +++ dcmtk-3.6.0/doxygen/Makefile.in 2011-04-06 10:59:52.000000000 +0200 @@ -15,7 +15,7 @@ DCMTK_VERSION = $(PACKAGE_VERSION)$(PACKAGE_VERSION_SUFFIX) -all: html man +all: man html: sed -e "s/@DCMTK_VERSION@/$(DCMTK_VERSION)/" -e "s/@DOXYGEN_DATA_DIR@/./" -e "s/@DOXYGEN_INPUT_DIR@/../" htmldocs.cfg > htmldocs.tmp @@ -35,7 +35,7 @@ done -install: install-man install-html +install: install-man install-man: $(configdir)/mkinstalldirs $(DESTDIR)$(man1dir) debian/patches/02_dcmtk_3.6.0-1.patch0000644000000000000000000000625511524305132014127 0ustar Author: Jรผrgen Salk 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 = # GroupName = @@ -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 @@ + debian/patches/removecharls.patch0000644000000000000000000001037111624714602014335 0ustar Index: dcmtk-3.6.0/dcmjpls/Makefile.in =================================================================== --- dcmtk-3.6.0.orig/dcmjpls/Makefile.in 2009-07-29 16:46:45.000000000 +0200 +++ dcmtk-3.6.0/dcmjpls/Makefile.in 2011-08-23 14:10:45.000000000 +0200 @@ -36,7 +36,6 @@ (cd include && $(MAKE) ARCH="$(ARCH)" all) libsrc-all: include-all - (cd libcharls && $(MAKE) ARCH="$(ARCH)" all) (cd libsrc && $(MAKE) ARCH="$(ARCH)" all) apps-all: libsrc-all @@ -50,7 +49,6 @@ (cd include && $(MAKE) ARCH="$(ARCH)" install) libsrc-install: libsrc-all - (cd libcharls && $(MAKE) ARCH="$(ARCH)" install) (cd libsrc && $(MAKE) ARCH="$(ARCH)" install) apps-install: apps-all @@ -68,7 +66,6 @@ clean: (cd include && $(MAKE) clean) - (cd libcharls && $(MAKE) clean) (cd libsrc && $(MAKE) clean) (cd apps && $(MAKE) clean) (cd tests && $(MAKE) clean) @@ -79,7 +76,6 @@ distclean: (cd include && $(MAKE) distclean) - (cd libcharls && $(MAKE) distclean) (cd libsrc && $(MAKE) distclean) (cd apps && $(MAKE) distclean) (cd tests && $(MAKE) distclean) @@ -89,7 +85,6 @@ rm -f $(DISTTRASH) dependencies: - (cd libcharls && touch $(DEP) && $(MAKE) dependencies) (cd libsrc && touch $(DEP) && $(MAKE) dependencies) (cd apps && touch $(DEP) && $(MAKE) dependencies) # (cd tests && touch $(DEP) && $(MAKE) dependencies) Index: dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in =================================================================== --- dcmtk-3.6.0.orig/dcmjpls/libsrc/Makefile.in 2009-10-07 15:16:47.000000000 +0200 +++ dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in 2011-08-23 14:10:45.000000000 +0200 @@ -16,10 +16,9 @@ oflogdir = $(top_srcdir)/../oflog dcmdatadir = $(top_srcdir)/../dcmdata dcmimgledir = $(top_srcdir)/../dcmimgle -libcharlsdir = $(top_srcdir)/../dcmjpls/libcharls LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \ - -I$(dcmimgledir)/include -I$(libcharlsdir) + -I$(dcmimgledir)/include LOCALDEFS = objs = djcodecd.o djcodece.o djcparam.o djdecode.o djencode.o djrparam.o djutils.o Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in =================================================================== --- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in 2011-08-23 14:10:41.000000000 +0200 +++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in 2011-08-23 14:11:27.000000000 +0200 @@ -42,9 +42,7 @@ dcmjplslibdir = -L$(dcmjplsdir)/libsrc dcmjplslib = -ldcmjpls -libcharlsdir = $(dcmjplsdir) -libcharlslibdir = -L$(dcmjplsdir)/libcharls -libcharlslib = -lcharls +libcharlslib = -lCharLS LOCALINCLUDES = $(dcmjplsinc) $(ofstdinc) $(ofloginc) $(dcmdatainc) $(dcmimageinc) $(dcmimgleinc) LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \ Index: dcmtk-3.6.0/dcmjpls/libsrc/djcodecd.cc =================================================================== --- dcmtk-3.6.0.orig/dcmjpls/libsrc/djcodecd.cc 2010-10-14 15:14:24.000000000 +0200 +++ dcmtk-3.6.0/dcmjpls/libsrc/djcodecd.cc 2011-08-23 14:10:45.000000000 +0200 @@ -44,7 +44,7 @@ #include "djerror.h" /* for private class DJLSError */ // JPEG-LS library (CharLS) includes -#include "intrface.h" +#include "CharLS/interface.h" E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const { Index: dcmtk-3.6.0/dcmjpls/libsrc/djcodece.cc =================================================================== --- dcmtk-3.6.0.orig/dcmjpls/libsrc/djcodece.cc 2010-10-14 15:14:24.000000000 +0200 +++ dcmtk-3.6.0/dcmjpls/libsrc/djcodece.cc 2011-08-23 14:10:45.000000000 +0200 @@ -62,7 +62,7 @@ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */ // JPEG-LS library (CharLS) includes -#include "intrface.h" +#include "CharLS/interface.h" BEGIN_EXTERN_C #ifdef HAVE_FCNTL_H Index: dcmtk-3.6.0/dcmjpls/libsrc/djerror.h =================================================================== --- dcmtk-3.6.0.orig/dcmjpls/libsrc/djerror.h 2010-10-14 15:20:24.000000000 +0200 +++ dcmtk-3.6.0/dcmjpls/libsrc/djerror.h 2011-08-23 14:10:45.000000000 +0200 @@ -31,7 +31,7 @@ #include "dcmtk/config/osconfig.h" #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */ -#include "intrface.h" /* CharLS include */ +#include "CharLS/interface.h" /* CharLS include */ /** Helper class for converting between dcmjpls and CharLS error codes */ debian/patches/underlink.patch0000644000000000000000000003557212064601402013640 0ustar Description: fix underlinked libraries Each of these libraries is built twice, first as .so with gcc, then as .a with ar. We need to provide libraries only when dynamic library is built. Author: Ilya Barygin Bug-Debian: http://bugs.debian.org/674586 Bug-Debian: http://bugs.debian.org/677721 --- a/dcmsign/libsrc/Makefile.in +++ b/dcmsign/libsrc/Makefile.in @@ -17,6 +17,8 @@ dcmdatadir = $(top_srcdir)/../dcmdata LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata LOCALDEFS = objs = dcsignat.o sicert.o sidsa.o simd5.o siprivat.o sirsa.o sisprof.o \ @@ -34,7 +36,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS) +endif $(RANLIB) $@ --- a/ofstd/libsrc/Makefile.in +++ b/ofstd/libsrc/Makefile.in @@ -29,7 +29,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBS) +endif $(RANLIB) $@ --- a/Makefile +++ b/Makefile @@ -7,27 +7,27 @@ include $(configdir)/Makefile.def -all: config-all ofstd-all oflog-all dcmdata-all dcmtls-all dcmnet-all dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all dcmimage-all dcmjpeg-all dcmjpls-all +all: config-all ofstd-all oflog-all dcmdata-all dcmnet-all dcmtls-all dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all dcmimage-all dcmjpeg-all dcmjpls-all -libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all +libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmnet-libsrc-all dcmtls-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all -install: config-install ofstd-install oflog-install dcmdata-install dcmtls-install dcmnet-install dcmqrdb-install dcmwlm-install dcmimgle-install dcmsr-install dcmsign-install dcmpstat-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtk-install-doc install-man +install: config-install ofstd-install oflog-install dcmdata-install dcmnet-install dcmtls-install dcmqrdb-install dcmwlm-install dcmimgle-install dcmsr-install dcmsign-install dcmpstat-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtk-install-doc install-man install-all: install install-lib install-html -install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmtls-install-bin dcmnet-install-bin dcmqrdb-install-bin dcmwlm-install-bin dcmimgle-install-bin dcmsr-install-bin dcmsign-install-bin dcmpstat-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin +install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmnet-install-bin dcmtls-install-bin dcmqrdb-install-bin dcmwlm-install-bin dcmimgle-install-bin dcmsr-install-bin dcmsign-install-bin dcmpstat-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin -install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmtls-install-doc dcmnet-install-doc dcmqrdb-install-doc dcmwlm-install-doc dcmimgle-install-doc dcmsr-install-doc dcmsign-install-doc dcmpstat-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc +install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmnet-install-doc dcmtls-install-doc dcmqrdb-install-doc dcmwlm-install-doc dcmimgle-install-doc dcmsr-install-doc dcmsign-install-doc dcmpstat-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc -install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmtls-install-data dcmnet-install-data dcmqrdb-install-data dcmwlm-install-data dcmimgle-install-data dcmsr-install-data dcmsign-install-data dcmpstat-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data +install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmnet-install-data dcmtls-install-data dcmqrdb-install-data dcmwlm-install-data dcmimgle-install-data dcmsr-install-data dcmsign-install-data dcmpstat-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data install-etc: config-install-etc ofstd-install-etc oflog-install-etc dcmdata-install-etc dcmtls-install-etc dcmnet-install-etc dcmqrdb-install-etc dcmwlm-install-etc dcmimgle-install-etc dcmsr-install-etc dcmsign-install-etc dcmpstat-install-etc dcmimage-install-etc dcmjpeg-install-etc dcmjpls-install-etc -install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmtls-install-lib dcmnet-install-lib dcmqrdb-install-lib dcmwlm-install-lib dcmimgle-install-lib dcmsr-install-lib dcmsign-install-lib dcmpstat-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib +install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmnet-install-lib dcmtls-install-lib dcmqrdb-install-lib dcmwlm-install-lib dcmimgle-install-lib dcmsr-install-lib dcmsign-install-lib dcmpstat-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib -install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmtls-install-include dcmnet-install-include dcmqrdb-install-include dcmwlm-install-include dcmimgle-install-include dcmsr-install-include dcmsign-install-include dcmpstat-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include +install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmnet-install-include dcmtls-install-include dcmqrdb-install-include dcmwlm-install-include dcmimgle-install-include dcmsr-install-include dcmsign-install-include dcmpstat-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include -install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmtls-install-support dcmnet-install-support dcmqrdb-install-support dcmwlm-install-support dcmimgle-install-support dcmsr-install-support dcmsign-install-support dcmpstat-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support +install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmnet-install-support dcmtls-install-support dcmqrdb-install-support dcmwlm-install-support dcmimgle-install-support dcmsr-install-support dcmsign-install-support dcmpstat-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support dcmtk-install-doc: $(configdir)/mkinstalldirs $(DESTDIR)$(docdir) --- a/dcmdata/libi2d/Makefile.in +++ b/dcmdata/libi2d/Makefile.in @@ -17,6 +17,8 @@ dcmdatadir = $(top_srcdir)/../dcmdata LOCALINCLUDES = -I$(ofstddir)/include -I$(dcmdatadir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include/libi2d +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata LOCALDEFS = objs = i2d.o i2dplvlp.o i2djpgs.o i2dbmps.o i2dplsc.o i2dplnsc.o @@ -39,7 +41,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) +endif $(RANLIB) $@ --- a/dcmdata/libsrc/Makefile.in +++ b/dcmdata/libsrc/Makefile.in @@ -66,7 +66,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(ZLIBLIBS) +endif $(RANLIB) $@ mkdeftag: mkdeftag.o $(dictobjs) $(support_progs_objs) --- a/dcmimage/libsrc/Makefile.in +++ b/dcmimage/libsrc/Makefile.in @@ -23,6 +23,8 @@ # LOCALDEFS = -DREVERSE_OVERLAY_ORIGIN_ORDER LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -I$(dcmimgledir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle objs = dicoimg.o dicopx.o dicoopx.o diregist.o dilogger.o \ diargimg.o dicmyimg.o dihsvimg.o dipalimg.o dirgbimg.o \ @@ -40,7 +42,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(PNGLIBS) $(TIFFLIBS) +endif $(RANLIB) $@ --- a/dcmimgle/libsrc/Makefile.in +++ b/dcmimgle/libsrc/Makefile.in @@ -17,6 +17,8 @@ dcmdatadir = $(top_srcdir)/../dcmdata LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata LOCALDEFS = # Special defines for the Library, define them in LOCALDEFS @@ -40,7 +42,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(MATHLIBS) +endif $(RANLIB) $@ --- a/dcmjpeg/libsrc/Makefile.in +++ b/dcmjpeg/libsrc/Makefile.in @@ -20,6 +20,9 @@ LOCALINCLUDES = -I$(ofstddir)/include -I$(dcmdatadir)/include -I$(dcmimgledir)/include \ -I$(dcmjpegdir)/libijg8 -I$(dcmjpegdir)/libijg12 -I$(dcmjpegdir)/libijg16 -I$(oflogdir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc \ + -L$(dcmimgledir)/libsrc -L$(dcmjpegdir)/libijg8 -L$(dcmjpegdir)/libijg12 -L$(dcmjpegdir)/libijg16 +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle -lijg8 -lijg12 -lijg16 LOCALDEFS = objs = djutils.o djencode.o djrplol.o djrploss.o djcparam.o djeijg8.o djdijg8.o \ @@ -38,7 +41,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) +endif $(RANLIB) $@ --- a/dcmjpls/libsrc/Makefile.in +++ b/dcmjpls/libsrc/Makefile.in @@ -19,6 +19,8 @@ LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \ -I$(dcmimgledir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmimgledir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle LOCALDEFS = objs = djcodecd.o djcodece.o djcparam.o djdecode.o djencode.o djrparam.o djutils.o @@ -35,7 +37,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) -lCharLS +endif $(RANLIB) $@ --- a/dcmnet/libsrc/Makefile.in +++ b/dcmnet/libsrc/Makefile.in @@ -18,6 +18,8 @@ dcmtlsdir = $(top_srcdir)/../dcmtls LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -I$(dcmtlsdir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata LOCALDEFS = objs = assoc.o cond.o dcompat.o dimcancl.o dimcmd.o dimdump.o dimecho.o \ @@ -38,7 +40,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(TCPWRAPPERLIBS) $(OPENSSLLIBS) +endif $(RANLIB) $@ --- a/dcmpstat/libsrc/Makefile.in +++ b/dcmpstat/libsrc/Makefile.in @@ -25,6 +25,10 @@ LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \ -I$(dcmimgledir)/include -I$(dcmsrdir)/include -I$(dcmqrdbdir)/include \ -I$(dcmnetdir)/include -I$(dcmsigndir)/include -I$(dcmtlsdir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc \ + -L$(dcmimgledir)/libsrc -L$(dcmsrdir)/libsrc -L$(dcmqrdbdir)/libsrc \ + -L$(dcmnetdir)/libsrc -L$(dcmsigndir)/libsrc -L$(dcmtlsdir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmimgle -ldcmsr -ldcmqrdb -ldcmnet -ldcmdsig -ldcmtls LOCALDEFS = objs = dvpsal.o dvpsgal.o dvpsgr.o dvpsovl.o dvpsrs.o dvpstx.o \ @@ -47,7 +51,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS) $(MATHLIBS) +endif $(RANLIB) $@ --- a/dcmqrdb/libsrc/Makefile.in +++ b/dcmqrdb/libsrc/Makefile.in @@ -19,6 +19,8 @@ LOCALINCLUDES = -I$(dcmnetdir)/include -I$(dcmdatadir)/include \ -I$(ofstddir)/include -I$(oflogdir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmnetdir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmnet LOCALDEFS = objs = dcmqrcbf.o dcmqrcbg.o dcmqrcbm.o dcmqrcbs.o dcmqrcnf.o dcmqrdbi.o \ @@ -35,7 +37,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) +endif $(RANLIB) $@ --- a/dcmsr/libsrc/Makefile.in +++ b/dcmsr/libsrc/Makefile.in @@ -17,6 +17,8 @@ dcmdatadir = $(top_srcdir)/../dcmdata LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata LOCALDEFS = objs = dsrdoc.o dsrtree.o dsrtncsr.o dsrdoctn.o dsrdoctr.o \ @@ -41,7 +43,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(XMLLIBS) +endif $(RANLIB) $@ --- a/dcmtls/libsrc/Makefile.in +++ b/dcmtls/libsrc/Makefile.in @@ -18,6 +18,8 @@ dcmnetdir = $(top_srcdir)/../dcmnet LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include -I$(dcmnetdir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmnetdir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmnet LOCALDEFS = objs = tlstrans.o tlslayer.o tlsscu.o @@ -33,7 +35,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(OPENSSLLIBS) +endif $(RANLIB) $@ --- a/dcmwlm/libsrc/Makefile.in +++ b/dcmwlm/libsrc/Makefile.in @@ -19,6 +19,8 @@ LOCALINCLUDES = -I$(dcmdatadir)/include -I$(dcmnetdir)/include \ -I$(oflogdir)/include -I$(ofstddir)/include +LIBDIRS = -L$(ofstddir)/libsrc -L$(oflogdir)/libsrc -L$(dcmdatadir)/libsrc -L$(dcmnetdir)/libsrc +LOCALLIBS = -lofstd -loflog -ldcmdata -ldcmnet LOCALDEFS = objs = wlds.o wlmactmg.o wldsfs.o wlfsim.o @@ -34,7 +36,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) +endif $(RANLIB) $@ --- a/oflog/libsrc/Makefile.in +++ b/oflog/libsrc/Makefile.in @@ -15,6 +15,8 @@ ofstddir = $(top_srcdir)/../ofstd LOCALINCLUDES = -I$(ofstddir)/include +LIBDIRS = -L$(ofstddir)/libsrc +LOCALLIBS = -lofstd LOCALDEFS = objs = oflog.o apndimpl.o appender.o config.o consap.o \ @@ -36,7 +38,11 @@ $(library): $(objs) +ifeq ($(AR),ar) $(AR) $(ARFLAGS) $@ $(objs) +else + $(AR) $(ARFLAGS) $@ $(objs) $(LIBDIRS) $(LOCALLIBS) $(LIBS) +endif $(RANLIB) $@ debian/patches/05_no_www_docs.patch0000644000000000000000000000207611520503677014505 0ustar Index: dcmtk-3.6.0/dcmwlm/docs/Makefile.in =================================================================== --- dcmtk-3.6.0.orig/dcmwlm/docs/Makefile.in 2007-11-23 17:30:50.000000000 +0100 +++ dcmtk-3.6.0/dcmwlm/docs/Makefile.in 2011-01-28 09:58:14.000000000 +0100 @@ -11,7 +11,8 @@ include $(configdir)/@common_makefile@ -files = wwwapp.txt +## we use debhelper for this doc which goes to the dcmtk-www package +# files = wwwapp.txt all: Index: dcmtk-3.6.0/config/rootconf =================================================================== --- dcmtk-3.6.0.orig/config/rootconf 2010-11-25 12:09:26.000000000 +0100 +++ dcmtk-3.6.0/config/rootconf 2011-01-28 09:58:53.000000000 +0100 @@ -67,7 +67,7 @@ dcmtk-install-doc: \$(configdir)/mkinstalldirs \$(DESTDIR)\$(docdir) - for file in ANNOUNCE.\$(PACKAGE_VERSION_NUMBER) CHANGES.\$(PACKAGE_VERSION_NUMBER) COPYRIGHT FAQ HISTORY VERSION; do \\ + for file in ANNOUNCE.\$(PACKAGE_VERSION_NUMBER) CHANGES.\$(PACKAGE_VERSION_NUMBER) FAQ HISTORY VERSION; do \\ \$(INSTALL_DATA) \$\$file \$(DESTDIR)\$(docdir) ;\\ done debian/patches/png_tiff.patch0000644000000000000000000000115411514634262013437 0ustar --- 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 debian/patches/series0000644000000000000000000000055112211052474012031 0ustar 01_fix_perl_script_path.patch 02_dcmtk_3.6.0-1.patch 04_nostrip.patch 05_no_www_docs.patch 07_doxygen.patch png_tiff.patch prefs.patch removedocsfromall.patch dcmtk_version_number.patch regression_stacksequenceisodd.patch removecharls.patch bug674361.patch underlink.patch use_correct_number_of_TS.patch fixnull.patch nothrow.patch noleak.patch doubledes.patch debian/patches/nothrow.patch0000644000000000000000000000561312151127050013335 0ustar From 873af0c229b92e5ceba62e5a3f78180a18b395d4 Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier 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 } } debian/patches/04_nostrip.patch0000644000000000000000000001625311520503677013654 0ustar 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 debian/patches/doubledes.patch0000644000000000000000000000174012211052474013604 0ustar From d229d6fe6650427ca7319e5c86032291a5bfe39d Mon Sep 17 00:00:00 2001 From: Michael Onken 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 ); } } debian/patches/01_fix_perl_script_path.patch0000644000000000000000000002136211514634262016356 0ustar Author: Jรผrgen Salk 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 < 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::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. ** debian/patches/noleak.patch0000644000000000000000000000235612151127050013107 0ustar From 904d810a9d62ab0e1e0aac857371b936f0b70289 Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier 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; debian/patches/dcmtk_version_number.patch0000644000000000000000000001247711577117444016103 0ustar From: Joerg Riesmeier 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-bugs@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). ** debian/patches/prefs.patch0000644000000000000000000000207011520504001012740 0ustar Author: Jรผrgen Salk 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! ------------------ debian/patches/use_correct_number_of_TS.patch0000644000000000000000000000172312144641447016627 0ustar Description: Fixed crash if less than four transfer syntaxes are enabled. This fixes debian bug #703716. Affects: dcmqrdb/libsrc/dcmqrsrv.cc Author: Uli Schlachter 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)); } debian/dcmtk.docs0000644000000000000000000000001311133460516011134 0ustar FAQ README debian/dcmtk-www.links0000644000000000000000000000006011305516316012151 0ustar usr/lib/dcmtk/cgi-bin usr/lib/cgi-bin/dcmtk_wlm debian/apache.conf0000644000000000000000000000034111305516316011255 0ustar # dcmtk default Apache configuration Alias /dcmtk_wlm /usr/share/dcmtk/www/ ScriptAlias /dcmtk /usr/lib/dcmtk/cgi-bin/ AllowOverride None Options +ExecCGI debian/watch0000644000000000000000000000016211133341143010210 0ustar version=3 opts="passive" \ ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk([\d\.]+)/dcmtk-(.*)\.tar\.gz debian/dcmtk-www.postrm0000644000000000000000000000151112211052474012354 0ustar #!/bin/sh # postrm script for dcmtk-www set -e case "$1" in purge|remove) if [ -h /etc/apache2/conf-available/dcmtk ]; then unlink /etc/apache2/conf-available/dcmtk fi ;; upgrade) # Restart Apache to register configuration for dcmtk if apache2ctl configtest 2>/dev/null; then if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d apache2 reload 3>/dev/null || true else /etc/init.d/apache2 reload 3>/dev/null || true fi else echo "Your apache2 configuration is broken, so we're not restarting it for you." fi ;; failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/libdcmtk2.lintian-overrides0000644000000000000000000000113111624744757014436 0ustar # There is more than one library in one package bundles which makes perfectly # sense in this application but does not enable naming the library package apropriately libdcmtk2: package-name-doesnt-match-sonames libdcmdata2 libdcmdsig2 libdcmimage2 libdcmimgle2 libdcmjpeg2 libdcmjpls2 libdcmnet2 libdcmpstat2 libdcmqrdb2 libdcmsr2 libdcmtls2 libdcmwlm2 libi2d2 libijg12-2 libijg16-2 libijg8-2 liboflog2 libofstd2 libdcmtk2: embedded-library usr/lib/libijg12.so.2.0.0: libjpeg libdcmtk2: embedded-library usr/lib/libijg16.so.2.0.0: libjpeg libdcmtk2: embedded-library usr/lib/libijg8.so.2.0.0: libjpeg debian/dcmtk-www.docs0000644000000000000000000000002711133460516011763 0ustar dcmwlm/docs/wwwapp.txt debian/dcmtk.NEWS0000644000000000000000000001501011524444620010765 0ustar dcmtk (3.6.0-1) unstable; urgency=low Version 3.6.0 of the OFFIS DCMTK (DICOM ToolKit) software is now available for public release. This release includes the following main changes over the previous version 3.5.4: - DCMTK 3.6.0 now also builds correctly with GNU gcc 4.1 (and higher), Visual Studio 2008 and 2010. - Tested with latest versions of the following operating systems/environments: - Linux on x86 and x86_64 - FreeBSD on x86 and x86_64 - MacOS X on x86_64 - Windows on x86 and x86_64 - Cygwin and MinGW/MSys on x86 For a complete list of tested systems and compilers, see the INSTALL file. - The CMake build system can now also be used with other operating systems than Windows. However, GNU autoconf is still supported and should be preferred on systems where the CMake project files fail. - New module oflog introduces a unified DCMTK-wide approach for logging based on the log4cplus library. Direct output to console, file, syslog and event log. All DCMTK command line tools now have the same set of logging options. - New module dcmjpls adds support for JPEG-LS compressed DICOM images based on the CharLS library. The tools dcmcjpls and dcmdjpls allow for compressing and decompressing DICOM images with JPEG-LS from the command line. - New tool img2dcm allows for converting JPEG and BMP images to various DICOM image IODs, e.g. old and new Secondary Capture, Visible Light Photographic. The underlying C++ class library can also be used separately. - New tool dcm2pdf allows for extracting PDF files from DICOM Encapsulated PDF Storage SOP instances. - New tool dcml2pnm allows for converting JPEG-LS compressed DICOM images to standard image formats like TIFF or BMP. - The tools dcmdump and storescu have new options for searching directories recursively for DICOM files. - The tool dcmdump now also has a colored output of the textual dump. So far, this option is available on non-Windows systems only (uses ANSI escape code). - The tool dcmodify now also supports reading the value of insert and modify statements from a file. This is especially useful for large element values. - The tool dsr2html now also supports the output in HTML 4.01 and XHTML 1.1 format. There are also new options that affect the rendering result. - The tool dump2dcm now also supports compressed pixel data. In addition, the memory requirements for very large data elements have been reduced. - The tool xml2dcm can now also read binary data (e.g. pixel data) from a separate file. The corresponding feature is not yet available in dcm2xml. - The tool storescp now has a new option that allows for accepting all supported transfer syntaxes on a single association. - The tool wlmscpfs now supports multi-process mode both on Posix and Windows platforms where a new child process is created for each incoming association. - Refactored code of the tool findscu into a C++ class. This facilitates re-use of the findscu code in other applications. - Added further "switches" to the dcmdata module which allow to better cope with incorrectly encoded DICOM files or datasets. These switches are also available as new options to the tools dcmdump and dcmconv. - The dcmdata module now also gives access to partial attribute values without loading the complete attribute value into memory, if kept in file. - The write methods in dcmdata now handle large raw data elements without loading everything into memory. This allows very large images to be sent over a network connection or to be copied without ever being fully in memory. - The dcmdata module now has a common interface for the frame-wise access to compressed and uncompressed pixel data without ever loading the complete object into main memory. - The dcmimgle/dcmimage module makes use of the new partial access to pixel data for processing large multi-frame images in a stepwise manner. - The dcmimgle/dcmimage module and related tools now also support a new bilinear and a bicubic scaling algorithm for image magnification. Furthermore, the sigmoid VOI LUT function has been implemented. - Added support for Colon CAD SR, Spectacle Prescription Report, Macular Grid Thickness and Volume Report as well as Implantation Plan SR documents to the dcmsr module. - Incorporated fixes to dcmsr module which were introduced by various correction proposals. Added support for the new optional Preliminary Flag. - DICOMDIR tools and classes now support all new SOP classes and directory record types. Also added a new operating mode that allows for updating existing entries in a DICOMDIR. - Introduced general path syntax for accessing nested elements from command line tools like findscu or dcmodify. - Added methods for checking the value representation (VR) and value multiplicity (VM) of data elements for conformance with the DICOM standard. - Network tools now support transmission and receipt of JPEG-LS and MPEG2 transfer syntaxes. - Added support for the extended negotiation of user identity to the dcmnet module. The first tool that makes use of this new feature is storescu. - Introduced new experimental SCU and SCP classes that act as a C++ wrapper to the still C-based dcmnet module. - Added new class OFFile that provides a simple encapsulation layer for file based stream I/O and, in particular, provides large file support (LFS) if available on the underlying operating system/platform through a single API. - Out of the box compilation with OpenSSL 1.0.0 is now supported. - Revised installation directory scheme in order to be more compliant with the Filesystem Hierarchy Standard (FHS) and derived file system standards. - Added data dictionary including private ASTM tags from DICONDE (Digital Imaging and Communication in Nondestructive Evaluation) standard. - The DICOM data dictionary as well as the list of SOP classes and transfer syntaxes have been re-worked based on the latest edition of the DICOM standard plus all additionally approved supplements and correction proposals (as of 2010-11-30). Please note that there have been minor name changes! - Many bug fixes and minor improvements as usual - see the more than 12,000 lines long CHANGES.360 file for more details. -- Mathieu Malaterre Tue, 08 Feb 2011 19:14:53 +0100 debian/dcmqrscp.init0000644000000000000000000000332111514634262011672 0ustar #! /bin/sh # # Start script for dcmqrscp from dcmtk-package # Adapted from skeleton # @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl # by Roland Marcus Rutschmann # and Juergen Salk # Version 0.2 Sun, 22 Jul 2007 21:32:42 +0200 ### BEGIN INIT INFO # Provides: dcmqrscp # Required-Start: $network $local_fs $remote_fs # Required-Stop: $network $local_fs $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Init-Script for DCMTK Central Test Node dcmqrscp ### END INIT INFO set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DESC="DCMTK Central Test Node" NAME=dcmqrscp DAEMON=/usr/bin/$NAME PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME DCMQRSCP_CFG="/etc/dcmtk/dcmqrscp.cfg" # Gracefully exit if the package has been removed. test -x $DAEMON || exit 0 # Read config file if it is present. if [ -r /etc/default/$NAME ] then . /etc/default/$NAME fi case "$DCMQRSCP_ENABLE" in [Nn]*) exit 0 ;; esac # # Function that starts the daemon/service. # d_start() { start-stop-daemon --start --quiet --background \ --make-pidfile --pidfile $PIDFILE \ --exec $DAEMON -- +ac -c $DCMQRSCP_CFG } # # Function that stops the daemon/service. # d_stop() { start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --name $NAME } case "$1" in start) echo -n "Starting $DESC: $NAME" d_start echo "." ;; stop) echo -n "Stopping $DESC: $NAME" d_stop echo "." ;; reload) exit 0 ;; restart|force-reload) echo -n "Restarting $DESC: $NAME" d_stop sleep 1 d_start echo "." ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 exit 1 ;; esac exit 0 debian/dcmtk.README.Debian0000644000000000000000000002164211761633617012350 0ustar DCMTK - The OFFIS DICOM ToolKit for Debian ========================================== General notes: 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. DCMTK is is written in a mixture of ANSI C and C++. It comes in complete source code and is made available as "open source" software under BSD like license terms. For additional information about DCMTK have a look at the OFFIS web page: http://dicom.offis.de/dcmtk.php.en DCMTK has been used at numerous DICOM demonstrations to provide central, vendor-independent image storage and worklist servers (CTNs - Central Test Nodes). It is used by hospitals and companies all over the world for a wide variety of purposes ranging from being a tool for product testing to being a building block for research projects, prototypes and commercial products. DCMTK optionally supports some of the DICOM security extensions and relies on the free OpenSSL toolkit for the underlying cryptographic routines and the TLS protocol implementation. The Debian DCMTK package has been built with OpenSSL support enabled. More information about using the DCMTK network applications for secure DICOM communication can be found in /usr/share/docs/dcmtk/ciphers.txt(.gz) /usr/share/docs/dcmtk/randseed.txt(.gz) DCMTK optionally supports Wietse Venema's TCP wrappers library (libwrap) which is freely available for most Unix platforms and part of the default installation of most recent Linux distributions. This library allows one to enforce host-based access control via the "/etc/hosts_deny" and "/etc/hosts_allow" configuration files. The Debian DCMTK package has been compiled with TCP wrapper support enabled. See hosts_access(5) man page for details. You can use the dcmnet applications for testing DICOM connectivity. A brief description can be found in /usr/share/doc/dcmtk/testing.txt(.gz) The DCMTK storescp application implements a DICOM image storage (only). The storescp application can be invoked as a daemon process at boot time by setting STORESCP_ENABLE=Yes in /etc/defaults/storescp. You will have to adjust the system wide configuration file /etc/dcmtk/storescp.cfg to suit your needs. Running storescp with root privileges is strongly discouraged. Any incoming images is automatically stored in : /var/lib/dcmtk/db/STORESCP Please see the following section for dcmqrscp to prevent any conflicts with your storescp daemon and dcmqrscp daemon. Also you will need to use two different ports for each of them if you plan to be running both on the same machine. storescp does not support quota, so use with care. The DCMTK dcmqrscp application implements a DICOM image storage/query/retrieve SCP which has been designed primarily as an independent framework for cooperative tests and demonstrations of DICOM connectivity by medical imaging vendors. If you want to set up dcmqrdb as a DICOM image storage server please read both the dcmqrscp manual pages and the supplemental documentation in /usr/share/doc/dcmtk/dcmqrcnf.txt(.gz) /usr/share/doc/dcmtk/dcmqrset.txt(.gz) The dcmqrscp application can be invoked as a daemon process at boot time by setting DCMQRSCP_ENABLE=Yes in /etc/defaults/dcmqrscp. You will have to adjust the system wide configuration file /etc/dcmtk/dcmqrscp.cfg to suit your needs. This configuration file provides optional UserName/GroupName keywords in the "Global Parameter" section (see note in dcmqrcnf.txt). Running dcmqrscp with root privileges is strongly discouraged. A dedicated system user/group dcmtk/dcmtk is automatically added during the installation of the Debian DCMTK package. It is important to note that dcmqrscp is primarily intended to be used as a demonstration server rather than a real "PACS replacement". Scalability is quite limited, both in terms of number of images/studies and in number of parallel clients. If you want to set up a real large database, you might be better off in using an SQL based archive (such as the Mallinckrodt CTN). DCMTK supports the Modality Worklist Management SOP Class as a SCP, which allows modalities to query and retrieve worklist information from hospital information systems. An example worklist database along with a set of example queries can be found in /usr/share/doc/dcmtk/examples/wlistdb and /usr/share/doc/dcmtk/examples/wlistqry. Here is a brief instruction about how to make this work (based on a post of Thomas Wilkens in comp.protocols.dicom): 1. Use dump2dcm to convert all "*.dump" files in examples/wlistdb/OFFIS to "*.wl" files (DICOM format): $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".wl; done Note that these files have to have the extension "*.wl", otherwise wlmscpfs will not find these files. These files represent your worklist database. 2. Use dump2dcm to convert all "*.dump" files in examples/wlistqry to "*.dcm" files (DICOM format): $ for f in *.dump; do dump2dcm "$f" "${f%.dump}".dcm; done These files represent possible queries that can be used to query the worklist database. 3. In one shell run the following command to start the worklist management SCP: $ wlmscpfs -v -dfp examples/wlistdb 1234 4. In another shell run the following command to send a certain query to the WLM SCP: $ findscu -v --call OFFIS localhost 1234 examples/wlistqry/wlistqry0.dcm Step 3 will start the worklist management SCP which will listen on port 1234 for incoming C-FIND RQ messages. The "-dfp examples/wlistdb" option specifies that the worklist database can be found in folder "examples/wlistdb". Note that the worklist database can be organized in different storage areas. Subfolder "OFFIS" below "examples/wlistdb" is one (the only one in this case) storage area. In an incoming C-FIND RQ, an SCU has to tell wlmscpfs which storage area shall be queried; this is done by sending a certain "called AE title" to wlmscpfs. Step 4 will send the query in file "examples/wlistqry/wlistqry0.dcm" using a C-FIND-RQ message to the wlmscpfs application (which is running on "localhost" and listening on port "1234"). Option "--call OFFIS" specifies that the called AE title is "OFFIS" which in turn tells the wlmscpfs application to query the storage area "OFFIS" in its worklist database. The two programs should then dump information that shows their internal processings (C-FIND RQ - C-FIND RSP). You can also use a different query file in folder "examples/wlistqry" for querying the worklist database. As the wlmscpfs is not a hospital information system, worklist entries must be created, updated and deleted manually. The Debian dcmtk-www package contains a cgi-based WWW server application which provides an easy to use web interface for managing worklist entries from any workstation in the network. More information about the DCMTK worklist web interface can be found in /usr/share/doc/dcmtk-www/wwwapp.txt For more information please visit the DCMTK homepage and the user forum at http://dicom.offis.de/dcmtk.php.en and http://forum.dcmtk.org/ The Debian packages have been configured with the following options: ./configure --prefix=/usr \ --exec-prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --includedir=/usr/include \ --libdir=/usr/lib \ --datadir=/usr/share/dcmtk \ --sysconfdir=/etc/dcmtk \ --with-private-tags \ --with-libtiff \ --with-zlib \ --with-libpng \ --with-libxml \ --with-libwrap \ --with-openssl There is currently no official support for shared libraries in DCMTK. We had to perform some magic to have the DCMTK end user utilies linked dynamically against shared DCMTK library versions without forcing the utilities themselves to be compiled with -fPIC (which would impose some performance penalty upon them). In a first step we adjust config/Makefile.def to build the shared libraries with -fPIC. In a second step we build the shared libs only (i.e. without utilities). In a third step we restore the original state of config/Makefile.def. In a forth step we run `make clean' on the source tree. (This leaves the *.so libs untouched but forces recompilation in the next step.) In the last step we run `make all'. This will build both the utilities and the static libraries without -fPIC but links the utilities dynamically against the shared library versions. We also had to remove explicitly any reference for CharLS from the DCMTK source distribution to allow compilation with external CharLS library. -- Mathieu Malaterre Tue, 08 Feb 2011 19:20:13 +0100 debian/compat0000644000000000000000000000000211725476241010375 0ustar 9 debian/dcmtk.postinst0000644000000000000000000000452211611317044012076 0ustar #!/bin/sh set -e # Create dcmtk user and group if ! getent passwd dcmtk >/dev/null 2>&1; then if ! getent group dcmtk > /dev/null 2>&1; then echo "Adding \`dcmtk' group to system ..." addgroup --quiet --system dcmtk || true fi echo "Adding \`dcmtk' user to system ..." adduser --quiet --system --ingroup dcmtk --home /var/lib/dcmtk/db \ --shell /bin/sh --disabled-password dcmtk || true fi # work around possible adduser bug, see #119366 [ -d /var/lib/dcmtk/db ] || mkdir -p /var/lib/dcmtk/db chmod 755 /var/lib/dcmtk/db chown -h -R dcmtk:dcmtk /var/lib/dcmtk/db || true [ -d /var/lib/dcmtk/db/STORESCP ] || mkdir -p /var/lib/dcmtk/db/STORESCP # Handle imagectn -> dcmqrdb transition in (3.5.3 -> 3.5.4) LASTVERSION=3.5.3-5 case "$1" in configure) if dpkg --compare-versions "$2" le "$LASTVERSION"; then if [ -e "/etc/dcmtk/imagectn.cfg" ]; then echo echo "Configuration file /etc/dcmtk/imagectn.cfg has been modified by user." echo "This file will be renamed to /etc/dcmtk/dcmqrscp.cfg." echo "The package default version can be found in /etc/dcmtk/dcmqrscp.cfg.dpkg-new." echo mv -f /etc/dcmtk/dcmqrscp.cfg /etc/dcmtk/dcmqrscp.cfg.dpkg-new mv -f /etc/dcmtk/imagectn.cfg /etc/dcmtk/dcmqrscp.cfg fi if [ -e "/etc/default/imagectn" ]; then echo "Configuration file /etc/default/imagectn has been modified by user." echo "This file will be converted to and replaced by /etc/default/dcmqrscp." echo "The user's old version can be found in /etc/default/imagectn.dpkg-old." echo "The package default version can be found in /etc/default/dcmqrscp.dpkg-new." echo mv -f /etc/default/imagectn /etc/default/imagectn.dpkg-old mv -f /etc/default/dcmqrscp /etc/default/dcmqrscp.dpkg-new sed -e 's/IMAGECTN_ENABLE/DCMQRSCP_ENABLE/g' -e 's/imagectn/dcmqrscp/g' \ /etc/default/dcmqrscp fi if [ -e "/etc/init.d/imagectn" ]; then echo "Configuration file /etc/init.d/imagectn has been modified by user." echo "This file will be replaced by /etc/init.d/dcmqrscp." echo "The user's old version can be found in /etc/init.d/imagectn.dpkg-old" echo mv -f /etc/init.d/imagectn /etc/init.d/imagectn.dpkg-old fi # Remove (dangling) symlinks in /etc/rcN.d update-rc.d imagectn remove >/dev/null fi esac #DEBHELPER# debian/dcmtk.preinst0000644000000000000000000000207511305662113011700 0ustar #!/bin/sh -e # Prepare to handle imagectn -> dcmqrdb (3.5.3 -> 3.5.4) transition # without triggering a dpkg question # # Adapted from http://wiki.debian.org/DpkgConffileHandling PKGNAME=dcmtk # Remove a no-longer used conffile rm_conffile() { CONFFILE="$1" if [ -e "$CONFFILE" ]; then md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" if [ "$md5sum" != "$old_md5sum" ]; then echo "Obsolete conffile $CONFFILE has been modified by you." echo "Saving as $CONFFILE.dpkg-bak ..." mv -f "$CONFFILE" "$CONFFILE".dpkg-bak else echo "Removing obsolete conffile $CONFFILE ..." rm -f "$CONFFILE" fi fi } LASTVERSION=3.5.3-5 case "$1" in install|upgrade) if dpkg --compare-versions "$2" le "$LASTVERSION"; then rm_conffile "/etc/dcmtk/imagectn.cfg" rm_conffile "/etc/default/imagectn" rm_conffile "/etc/init.d/imagectn" fi esac #DEBHELPER# debian/changelog0000644000000000000000000003375212211052474011050 0ustar dcmtk (3.6.0-15) unstable; urgency=low * Transition to Apache 2.4. Closes: #669740 * Use wrap and sort * Fix possible double free() - debian/patches/doubledes.patch -- Mathieu Malaterre Mon, 02 Sep 2013 10:54:17 +0200 dcmtk (3.6.0-14) unstable; urgency=low * Install *.dic within libdcmtk2/ as per policy, section ยง8.2. Closes: #709123 * Import patches from upstream: + d/p/fixnull.patch + d/p/noleak.patch + d/p/nothrow.patch -- Mathieu Malaterre Wed, 29 May 2013 14:38:44 +0200 dcmtk (3.6.0-13) unstable; urgency=low * Remove d/README.source, since source-format 3.0 * Update dcmtk-www README for install instructions * Remove obsolete DMUA flag * Bump Std-Vers to 3.9.4, no changes needed * Provide a debug package. Closes: #690733 * Fix SIGSEGV. Closes: #703716 * Update d/control, and simplify Breaks/Conflicts with older dcmtk -- Mathieu Malaterre Wed, 15 May 2013 10:10:29 +0200 dcmtk (3.6.0-12) unstable; urgency=low [ Andrey Rahmatullin ] * Fix underlinked libraries. Closes: #677721 - debian/patches/underlink.patch -- Mathieu Malaterre Thu, 20 Dec 2012 13:20:45 +0100 dcmtk (3.6.0-11) unstable; urgency=low * Fix compilation with gcc 4.7. Closes: #674361 - debian/patches/bug674361.patch * Make sure to link against libxml2. Closes: #510120 * Fix some underlinking. Closes: #674586 - debian/patches/underlink.patch -- Mathieu Malaterre Thu, 31 May 2012 11:31:16 +0200 dcmtk (3.6.0-10) unstable; urgency=low [ Andreas Tille ] * debian/dcmtk.prerm: when purging dirs in /var/lib need to be removed in advance. Closes: #660346 [ Mathieu Malaterre ] * Use libpng-dev. Closes: #662296 * Use libtiff-dev for transition to tiff5 * Bump Std-Vers to 3.9.3. No changes needed -- Mathieu Malaterre Tue, 06 Mar 2012 23:01:59 +0100 dcmtk (3.6.0-9) unstable; urgency=low * Remove dot wrapper, not required anymore. * Generate doc using svg instead of png to save disk space * Fix compilation. Thanks to Bhavani Shankar. Closes: #646316 * Fix VCS URLs -- Mathieu Malaterre Wed, 23 Nov 2011 16:31:18 +0100 dcmtk (3.6.0-8) unstable; urgency=low * Adding a storescp daemon * Remove convenient copy of CharLS. Closes: #631100 -- Mathieu Malaterre Tue, 19 Jul 2011 17:08:19 +0200 dcmtk (3.6.0-7) unstable; urgency=low * Add a patch (from current git/master) to fix a regression. Closes: #630781 * Another fix to remove symlink only if exists * Remove deprecated lintian override -- Mathieu Malaterre Fri, 17 Jun 2011 14:43:37 +0200 dcmtk (3.6.0-6) unstable; urgency=low * Make sure OFFIS_DCMTK_VERSION_NUMBER is really a number. Closes: #628168 * Update Standard Version to 3.9.2. No changes needed * Fix some lintian errors in control file * Fix piuparts reports on remaining dcmtk apache configuration file -- Mathieu Malaterre Tue, 31 May 2011 23:28:12 +0200 dcmtk (3.6.0-5) unstable; urgency=low * Fix invalid dep. to apache with apache2 * Remove explicit `invoke-rc.d dcmqrscp stop` since it makes package un-removable. Let dh_installinit handles it -- Mathieu Malaterre Mon, 28 Mar 2011 15:33:06 +0200 dcmtk (3.6.0-4) unstable; urgency=low * new release fixes segfault. Closes: #615977 * Update README. Closes: #618686 * 3.6.0 is already packaged. Closes: #610855 * Update postrm script. Closes: #618688 -- Mathieu Malaterre Thu, 17 Mar 2011 17:32:48 +0100 dcmtk (3.6.0-3) unstable; urgency=low * Properly conflict with dcmtk 3.5.4 and libdcmtk2 * Remove reference to issue with UNIX FHS -- Mathieu Malaterre Tue, 08 Mar 2011 17:14:24 +0100 dcmtk (3.6.0-2) experimental; urgency=low * Update copyright to reflects 3.6.0 changes * Update dcmtk.NEWS to reflects 3.6.0 news * Minor update to dcmtk.README.Debian for build instructions * Minor cosmetic changes to the patch series -- Mathieu Malaterre Tue, 08 Feb 2011 19:20:13 +0100 dcmtk (3.6.0-1) experimental; urgency=low [ Mathieu Malaterre ] * New upstream: 3.6.0 * Update SONAME to 2.0.0 because of change in log4cplus::Logger::addAppender * Fix lintian errors on misc:Depends * Fix lintian errors on init.d script * Add a patch to link wth png/tiff libraries * Update perl path patch * debian/control: Update standards-version to 3.9.1 * Fix new naming convention for this release * Add get-orig-source target in rules file * Fix CHANGES numbering into something more flexible for later revs. * Move *.dic file to the libdcmtk2 package * Switch to dpkg-source 3.0 (quilt) format [ Andreas Tille ] * make sure *.dic file shwo up only in libdcmtk2 package * Add -f to rm statement in clean target -- Andreas Tille Fri, 04 Feb 2011 22:24:40 +0100 dcmtk (3.5.4-4) unstable; urgency=low [Andreas Tille] * Group maintenance according to Debian Med group policy * Added myself as Uploader * VCS fields * Standards-Version: 3.8.3 (Added README.source) * debhelper >= 7 * Add passive mode to watch file * make use of dh_install * debian/patches/05_no_www_docs.patch: Just do not install those files we do not need in the docs of the package in the first place instead of removing them later * Removed some lintian warnings * debian/patches/06_old_patches_from_diff_gz.patch: Move changes from diff.gz to quilt patches * Remove unused config files from previous versions according to http://wiki.debian.org/DpkgConffileHandling (The former handling in preinst triggered a lintian error) * debian/dcmtk.NEWS: Reformating according to developers reference 6.3.4. Supplementing changelogs with NEWS.Debian files * debian/{01_buildsystem_changes,01_fix_perl_script_path,02_dcmtk_3.5.4-3}.patch split up patches of former maintainer into maintainable pieces * Build-Depends: graphviz * debian/dot: Hack to enable png:gd graphics in doxygen which was told to be more compact and readable. The hack contains also working code to create SVG, but I failed to patch the HTML files to render SVG files * debian/libdcmtk1.lintian-overrides: we bundle more than one library in this package so the warning is void * debian/rules: Try to make backups of original files in config but failed for two remaining files (no idea why) * Move all files of dcmtk-www to /usr/lib/dcmtk/cgi-bin and provide apache configuration which enable easy access via http://localhost/dcmtk_wlm/ Closes: #553495 [Mathieu Malaterre] * debian/rules would not honor DEB_BUILD_OPTIONS=nostrip, since original Makefiles would hardcode call to `strip` directly instead rely on dh_strip instead and remove direct call to `strip` from Makefiles. Closes: #511668, #436758 -- Andreas Tille Wed, 02 Dec 2009 09:54:56 +0100 dcmtk (3.5.4-3) unstable; urgency=low * debian/control: Update standards-version to 3.7.2 * debian/dcmqrscp.init: Add LSB keyword section * dcmnet/apps/{findscu,movescu}.cc: Apply patches in order to fix --add-override-key bug (reported by Mike Miller ) Closes: #429041 * debian/dcmtk.prerm: Stop dcmqrscp/imagectn more sanely * debian/control: Replace ${Source-Version} by ${binary:Version} -- Juergen Salk Sun, 22 Jul 2007 20:41:22 +0200 dcmtk (3.5.4-2) unstable; urgency=low * debian/control: Added build dependency on autotools-dev * debian/rules: Modified clean target to put config.{sub,guess} below ./config * dcmdata/libsrc/Makefile.in: Modified distclean target to delete dicom.tmp as well * debian/rules: Fixed installation path for include files * debian/dcmtk.postinst: Fixed add{user,group} options to reveal possible error msgs (reported by Lars Wirzenius ) Closes: #353288 * debian/control: Removed 'Uploaders: field. | From: Pablo Sau | Subject: Re: dcmtk | Date: Thu, 19 Jan 2006 16:41:06 +0100 | To: Juergen Salk | Hi Juergen: | > I am still keeping you as an active co-maintainer for the Debian | > dcmtk packages in the debian/control file. Would you mind, if I | > drop your name from the control file in one of the next releases? | > | Of course, you must do it! | Thanks for your support of dcmtk and best regards. | Pablo -- Juergen Salk Sun, 15 Jan 2006 17:31:38 +0000 dcmtk (3.5.4-1) unstable; urgency=low * New upstream release * debian/dcmtk.NEWS: Added * debian/copyright: Updated according to upstream's COPYRIGHT file * debian/control: Unversioned build-dependency on libssl (now uses OPENSSL_VERSION_NUMBER macro) * debian/rules: Incremented SONAME version number (DcmFileFormat::loadFile changed) * debian/rules: Changed dh_installinit --name argument to dcmqrscp * debian/README.debian: Updated to reflect imagectn -> dcmqrscp transition * debian/dcmtk.postinst: Added code for imagectn -> dcmqrscp transition * debian/dcmtk.preinst: Created to handle imagectn -> dcmqrscp transition * debian/dcmtk.postrm: Created to handle imagectn -> dcmqrscp transition * debian/imagectn.init: Replaced by dcmqrscp.init * debian/imagectn.default: Replaced by dcmqrscp.default * debian/dcmtk.postinst: Added code to handle dcmtk user/group creation more sanely * debian/control: Adjusted 'Maintainer:' field * config/Makefile.def: Adjusted datadir and docdir * dcmdata/libsrc/Makefile.in: Fixed bug for dicom.dic installation path * dcmdata/apps/Makefile.in: Adjusted dcm2xml.dtd and dumppat.txt install paths * dcmsr/apps/Makefile.in: Adjusted dsr2xml.xsd install path * dcmwlm/perl/*.p[lh]: Adjusted perl hashbangs in CGI scripts * dcmwlm/perl/prefs.ph: Adjusted cgi_path, html_path and data_path * dcmqrdb/etc/dcmqrscp.cfg: Added UserName/GroupName config parameters * dcmqrdb/etc/dcmqrscp.cfg: Commented out and adjusted example configuration * dcmqrdb/docs/dcmqrcnf.txt: Adjusted UserName/GroupName examples * dcmwlm/wlistdb/OFFIS: Added newline to prevent lintian "zero-bye" warning -- Juergen Salk Tue, 20 Dec 2005 20:29:15 +0000 dcmtk (3.5.3-5) unstable; urgency=low * ./dcmsign/libsrc/sicert.cc: Constified d2i_X509 argument to fix build problems with libssl-0.9.8 Closes: #335399 * debian/control: Versioned build-depend on libssl (>= 0.9.8-1) * ./dcmnet/etc/storescp.cfg: Added missing Verification SOP Class -- Juergen Salk Mon, 24 Oct 2005 20:16:56 +0000 dcmtk (3.5.3-4) unstable; urgency=low * debian/control: Added dependency on adduser for dcmtk package * debian/control: Update Standards-Version to 3.6.2 * debian/{control,rules}: Renamed libdcmtk0 to libdcmtk0c2 (gcc/g++-4.0 transition) * debian/control: Added Conflicts/Replaces with previous non-c2 version * config/{configure.in,aclocal.m4,include/cfunix.h.in}, ofstd/libsrc/ofthread.cc: Backport HAVE_POINTER_TYPE_PTHREAD_T patch from CVS version to fix build problems with gcc/g++-4.0 -- Juergen Salk Sun, 22 May 2005 22:02:31 +0200 dcmtk (3.5.3-3) unstable; urgency=low * debian/rules: Utilized binary-indep target for -doc package (suggested by Marc 'HE' Brockschmidt ) * debian/rules: Introduced {build,install}-{indep,arch} targets * debian/rules: Removed unneeded dh_* calls from binary-arch target * Removed stale debian/*.install files -- Juergen Salk Mon, 25 Apr 2005 20:13:09 +0200 dcmtk (3.5.3-2) unstable; urgency=medium * Added imagectn UserName/GroupName security patch * Modified imagectn.cfg to reflect imagectn patch * Modified debian/rules to create imagectn storage area * Updated imagectn/docs/ctnconf.txt * Fixed parser bug in CNF_readConfigLines() (reported by R.M. Rutschmann ) * Added debian/dcmtk.postinst script to create dcmtk system user/group * Added debian/imagectn.init and debian/imagectn.default (suggested by R.M. Rutschmann ) * Updated debian/README.Debian * Removed stale lintian override file * Swapped 'Maintainer:' and 'Uploaders:' field | From: Pablo Sau | Subject: Re: New (inofficial) dcmtk packages available | Date: Thu, 31 Mar 2005 16:44:50 +0200 | > >> Why is Juergen "not official"? | > > Historical reasons. It was Pablo who has filed the ITP for dcmtk | > > initially. That's why we assigned maintainership to him for the | > > first release. | > If I understand Pablo right than he agreed that you will be put | > in the Maintainer field. Pablo, correct me if I'm wrong. | Yes of course,I filed the ITP for dcmtk initially but absolutely all | work has been made by Juergen, so I think he must to be in the | Maintainer field. | Thanks Juergen for your great work and best regards to all of you. -- Juergen Salk Sat, 19 Mar 2005 22:58:21 +0100 dcmtk (3.5.3-1) unstable; urgency=low * Initial Release. Closes: #278914 * Adjusted toplevel Makefile and config/Makefile.def.in to fix $DESTDIR problems * Fixed bug in config/configure.in for DCM_DICT_DEFAULT_PATH * Modified dcmdata/libsrc/Makefile.in to adjust dicom.dic install path * Modified dcmdata/apps/Makefile.in to adjust dcm2xml.dtd and dumppat.txt install paths * Modified dcmsr/apps/Makefile.in to adjust dsr2xml.xsd install path * Modified dcmwlm/Makefile.in to prevent wwwapps from being installed in ${bindir}. * Set GENERATE_HTMLHELP = NO in doxygen/htmldocs to avoid index.hh?.gz cruft * Adjusted hashbangs in dcmwlm/perl CGI scripts * Adjusted cgi_path, html_path and data_path in dcmwlm/perl/prefs.ph * Added newline in dcmwlm/wlistdb/OFFIS to prevent lintian "zero-bye" warning -- Juergen Salk Sat, 30 Oct 2004 11:02:48 +0200 debian/dcmtk-www.install0000644000000000000000000000046212211052474012502 0ustar dcmwlm/images/* usr/share/dcmtk/www dcmwlm/perl/* usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/preplock usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/readoviw usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/readwlst usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/writwlst usr/lib/dcmtk/cgi-bin debian/apache.conf etc/dcmtk debian/rules0000755000000000000000000001407412151373404010254 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # See: http://forum.dcmtk.org/viewtopic.php?t=1237 ARCH="" # Package installation directories pkg=dcmtk PKGDIR_DCMTK=$(CURDIR)/debian/$(pkg) PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk2 PKGDIR_DCMTK_DEV=$(CURDIR)/debian/libdcmtk2-dev PKGDIR_DCMTK_DOC=$(CURDIR)/debian/$(pkg)-doc PKGDIR_DCMTK_WWW=$(CURDIR)/debian/$(pkg)-www # Library version LIB_VERSION=2.0.0 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined # build system is too complex to modify for support -fPIE to exe and -fPIC to # shared libs we would need to use libtool or equivalent to filter shared libs # from exe #export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk config/config.status: configure dh_testdir # keep ap copy of the original config files to be able to move # them back right into place in the clean target cd config && mkdir backup && cp -a config* confmod include backup ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config/config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config/config.guess endif cd config && ./autoall && cd .. && \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --exec-prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --includedir=\$${prefix}/include \ --libdir=\$${prefix}/lib \ --datadir=\$${prefix}/share/libdcmtk2 \ --sysconfdir=/etc/$(pkg) \ --with-private-tags \ --with-libxml \ --with-libtiff \ --with-zlib \ --with-libpng \ --with-libwrap \ --with-openssl build-arch: config/config.status build-arch-stamp build-arch-stamp: dh_testdir # Add here commands to compile the package. # We have to perfom some magic here to have the dcmtk utilies # linked against shared dcmtk libs without forcing the utilities # themselves to be compiled with -fPIC as well. # In a first step we adjust config/Makefile.def to # build shared libraries. In a second step we build # the shared libs only (i.e. without utilities). In a third step we # restore the original state of config/Makefile.def. In a forth # step we run `make clean' on the source tree. (This leaves the # *.so libs untouched but forces recompilation in the next step.) # In the last step we run `make all'. This will build both the # utilities and the static libraries without -fPIC but links the # utilities dynamically against the shared library versions. mv config/Makefile.def config/Makefile.def.static && \ sed -e '/^CFLAGS =/s/-O -/-fPIC -/' -e '/^CXXFLAGS =/s/-O -/-fPIC -/' \ -e '/^AR =/s/ar/g++/' -e '/^ARFLAGS =/s/cruv/$(LDFLAGS) -shared -Wl,-soname,\$$\@.2 -o/' \ -e '/^LIBEXT =/s/a/so/' -e '/^RANLIB =/s/ranlib/:/' \ config/Makefile.def && \ $(MAKE) libsrc-all && \ mv config/Makefile.def.static config/Makefile.def && \ $(MAKE) clean && \ $(MAKE) touch build-arch-stamp build-indep: config/config.status build-indep-stamp build-indep-stamp: dh_testdir $(MAKE) html touch build-indep-stamp build: build-arch clean: dh_testdir dh_testroot if [ -d config/backup ] ; then cd config; mv backup/* . ; rm -rf backup ; fi rm -f build-arch-stamp build-indep-stamp config/config.status [ ! -f config/Makefile.def ] || $(MAKE) distclean # Do not forget to remove shared libs as well find $(CURDIR) -name '*.so' -exec rm -f \{\} \; -test -r config/lzwtest.tif && \ rm -f config/lzwtest.tif rm -f config/config.sub rm -f config/config.guess dh_clean install: install-indep install-arch install-indep: build-indep dh_testdir dh_testroot dh_prep -i dh_installdirs -i $(MAKE) install-html DESTDIR=$(PKGDIR_DCMTK_DOC) install-arch: build-arch dh_testdir dh_testroot dh_prep dh_installdirs -a $(MAKE) install DESTDIR=$(PKGDIR_DCMTK) && \ $(MAKE) install-lib DESTDIR=$(PKGDIR_DCMTK_DEV) # Do not forget to install the shared libs as well # TODO: make use of d-shlibs (andreas tille) find $(CURDIR) -path $(CURDIR)/debian -prune -o \ -name 'lib*.so' -exec install -m 644 \{\} $(PKGDIR_DCMTK_LIB)/usr/lib \; # Fix filenames / add symlinks for shared libs for i in $(PKGDIR_DCMTK_LIB)/usr/lib/*.so; do \ mv $$i $$i.2.0.0 && \ ln -sf `basename \$$i.2.0.0` \ $(PKGDIR_DCMTK_DEV)/usr/lib/`basename $$i` && \ ln -sf `basename \$$i.2.0.0` $$i.2; \ done # cp -a debian/apache.conf $(PKGDIR_DCMTK_WWW)/etc/apache2/conf.d/$(pkg) # Build architecture-independent files here. binary-indep: build-indep install-indep dh_testdir -i dh_testroot -i dh_installchangelogs -i CHANGES.360 dh_installdocs -i dh_installexamples -i dh_installman -i dh_install -i dh_link -i dh_lintian -i dh_strip --dbg-package=libdcmtk2-dbg -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: build-arch install-arch dh_testdir -a dh_testroot -a dh_installchangelogs -a CHANGES.360 dh_installdocs -a dh_installexamples -a dh_installinit -a --name=dcmqrscp dh_installinit -a --name=storescp dh_installman -a dh_install -a chmod 755 $(PKGDIR_DCMTK_WWW)/usr/lib/dcmtk/cgi-bin/*.p[lh] mv $(PKGDIR_DCMTK)/usr/share/libdcmtk2/*.dic $(PKGDIR_DCMTK_LIB)/usr/share/libdcmtk2/ dh_link -a dh_lintian -a dh_strip --dbg-package=libdcmtk2-dbg -a dh_compress -a dh_fixperms -a dh_perl -a dh_makeshlibs -a -V dh_installdeb -a dh_shlibdeps -a -l debian/libdcmtk2/usr/lib dh_gencontrol -a dh_md5sums -a dh_builddeb -a get-orig-source: uscan --force-download --verbose binary: binary-indep binary-arch .PHONY: build-indep build-arch build clean binary-indep binary-arch binary install-indep install-arch install debian/dcmqrscp.default0000644000000000000000000000006011012566355012350 0ustar # Run dcmqrscp at startup ? DCMQRSCP_ENABLE=No debian/source/0000755000000000000000000000000012211052570010461 5ustar debian/source/format0000644000000000000000000000001411521326606011676 0ustar 3.0 (quilt) debian/dcmtk-www.README.Debian0000644000000000000000000000114712120637437013162 0ustar Web interface for the OFFIS DICOM ToolKit in Debian =================================================== Please make sure you read the file wwwapp.txt in this directory. Default data path is: /var/lib/dcmtk/wl-data So at a minimum you can simply do: $ sudo mkdir -p /var/lib/dcmtk/wl-data/AETITLE_1 $ sudo touch /var/lib/dcmtk/wl-data/AETITLE_1/lockfile $ sudo chown www-data:www-data -R /var/lib/dcmtk/wl-data/AETITLE_1 Hint: Apache is configured in this way that you can either point your browser to http://localhost/dcmtk/main.pl Or http://localhost/cgi-bin/dcmtk_wlm/main.pl debian/storescp.init0000755000000000000000000001040211761633617011730 0ustar #!/bin/sh ### BEGIN INIT INFO # Provides: storescp # Required-Start: $network $local_fs $remote_fs # Required-Stop: $network $local_fs $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Init-Script for DCMTK STORE SCP: storescp ### END INIT INFO # Author: Mathieu Malaterre # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="DCMTK storescp" NAME=storescp DAEMON=/usr/bin/$NAME # Introduce the server's location here STORESCP_PORT="11112" DAEMON_ARGS="-v --output-directory /var/lib/dcmtk/db/STORESCP +xa +ac $STORESCP_PORT" # Arguments to run the daemon with PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME STORESCP_CFG="/etc/dcmtk/storescp.cfg" # Exit if the package is not installed [ -x $DAEMON ] || exit 0 # Read configuration variable file if it is present [ -r /etc/default/$NAME ] && . /etc/default/$NAME case "$STORESCP_ENABLE" in [Nn]*) exit 0 ;; esac # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. . /lib/lsb/init-functions # # Function that starts the daemon/service # do_start() { # Return # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started #start-stop-daemon --start --verbose --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ # || return 1 start-stop-daemon --background --start --verbose --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \ $DAEMON_ARGS # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend # on this one. As a last resort, sleep for some time. } # # Function that stops the daemon/service # do_stop() { # Return # 0 if daemon has been stopped # 1 if daemon was already stopped # 2 if daemon could not be stopped # other if a failure occurred #start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME #RETVAL="$?" #[ "$RETVAL" = 2 ] && return 2 # Wait for children to finish too if this is a daemon that forks # and if the daemon is only ever run from this initscript. # If the above conditions are not satisfied then add some other code # that waits for the process to drop all resources that could be # needed by services started subsequently. A last resort is to # sleep for some time. start-stop-daemon --stop --verbose --oknodo --pidfile $PIDFILE RETVAL="$?" #[ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE return "$RETVAL" } # # Function that sends a SIGHUP to the daemon/service # do_reload() { # # If the daemon can reload its configuration without # restarting (for example, when it is sent a SIGHUP), # then implement that here. # start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME return 0 } case "$1" in start) [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" do_start case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; stop) [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" do_stop case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; status) status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? ;; #reload|force-reload) # # If do_reload() is not implemented then leave this commented out # and leave 'force-reload' as an alias for 'restart'. # #log_daemon_msg "Reloading $DESC" "$NAME" #do_reload #log_end_msg $? #;; restart|force-reload) # # If the "reload" option is implemented then remove the # 'force-reload' alias # log_daemon_msg "Restarting $DESC" "$NAME" do_stop case "$?" in 0|1) do_start case "$?" in 0) log_end_msg 0 ;; 1) log_end_msg 1 ;; # Old process is still running *) log_end_msg 1 ;; # Failed to start esac ;; *) # Failed to stop log_end_msg 1 ;; esac ;; *) #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 exit 3 ;; esac : debian/dcmtk-www.postinst0000644000000000000000000000200512211052474012712 0ustar #!/bin/sh -e # postinst script for dcmtk-www pkg=dcmtk apache_install() { webserver=apache2 if [ -d /etc/$webserver/conf-available ] && [ ! -e /etc/$webserver/conf-available/${pkg} ]; then ln -s ../../${pkg}/apache.conf /etc/$webserver/conf-available/${pkg} # Restart webserver to register configuration for dcmtk if config is considered to be OK if ${webserver}ctl configtest 2>/dev/null; then if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d $webserver reload 3>/dev/null || true else /etc/init.d/$webserver reload 3>/dev/null || true fi else echo "Your $webserver configuration is broken, so we're not restarting it for you." fi fi } case "$1" in configure) apache_install ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/copyright0000644000000000000000000004221012211052474011116 0ustar This package was debianized by Juergen Salk on Tue, 20 Dec 2005 23:06:31 +0100 It has been updated by Mathieu Malaterre on Tue, 08 Feb 2011 19:12:12 +0100 It was downloaded from ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk Upstream Author: OFFIS DICOM Team Copyright: Unless otherwise specified, the DCMTK software package has the following copyright: /* * Copyright (C) 1994-2011, OFFIS e.V. * All rights reserved. * * This software and supporting documentation were developed by * * OFFIS e.V. * R&D Division Health * Escherweg 2 * 26121 Oldenburg, Germany * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * - Neither the name of OFFIS nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ Please note that some DCMTK modules, especially those that are not part of the free toolkit, are covered by a separate license which can be found in the COPYRIGHT file in the corresponding module directory. Some portions of the DCMTK software package are derived from earlier versions of this software with the following copyright, and can be identified by the following copyright notice located in each source file: /* * Copyright (C) 1993/1994, OFFIS, Oldenburg University and CERIUM * * This software and supporting documentation were * developed by * * Institut OFFIS * Bereich Kommunikationssysteme * Westerstr. 10-12 * 26121 Oldenburg, Germany * * Fachbereich Informatik * Abteilung Prozessinformatik * Carl von Ossietzky Universitaet Oldenburg * Ammerlaender Heerstr. 114-118 * 26111 Oldenburg, Germany * * CERIUM * Laboratoire SIM * Faculte de Medecine * 2 Avenue du Pr. Leon Bernard * 35043 Rennes Cedex, France * * for CEN/TC251/WG4 as a contribution to the Radiological * Society of North America (RSNA) 1993 Digital Imaging and * Communications in Medicine (DICOM) Demonstration. * * THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND NEITHER OFFIS, * OLDENBURG UNIVERSITY NOR CERIUM MAKE ANY WARRANTY REGARDING * THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR * FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER * DISEASES OR ITS CONFORMITY TO ANY SPECIFICATION. THE * ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE * IS WITH THE USER. * * Copyright of the software and supporting documentation * is, unless otherwise stated, jointly owned by OFFIS, * Oldenburg University and CERIUM and free access is hereby * granted as a license to use this software, copy this * software and prepare derivative works based upon this * software. However, any distribution of this software * source code or supporting documentation or derivative * works (source code and supporting documentation) must * include the three paragraphs of this copyright notice. * */ Some other parts of this software within the dcmtk/dcmnet sub-package related to the DICOM Upper Layer Protocol are derived from software developed for the RSNA'93 DICOM demonstration and kindly made available to us by the Mallinckrodt Institute of Radiology. Such software can be identified by the following copyright notice located in each affected source file: /* * Copyright (C) 1993, RSNA and Washington University * * The software and supporting documentation for the Radiological * Society of North America (RSNA) 1993 Digital Imaging and * Communications in Medicine (DICOM) Demonstration were developed * at the * Electronic Radiology Laboratory * Mallinckrodt Institute of Radiology * Washington University School of Medicine * 510 S. Kingshighway Blvd. * St. Louis, MO 63110 * as part of the 1993 DICOM Central Test Node project for, and * under contract with, the Radiological Society of North America. * * THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND NEITHER RSNA NOR * WASHINGTON UNIVERSITY MAKE ANY WARRANTY ABOUT THE SOFTWARE, ITS * PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR * USE, FREEDOM FROM ANY COMPUTER DISEASES OR ITS CONFORMITY TO ANY * SPECIFICATION. THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF * THE SOFTWARE IS WITH THE USER. * * Copyright of the software and supporting documentation is * jointly owned by RSNA and Washington University, and free access * is hereby granted as a license to use this software, copy this * software and prepare derivative works based upon this software. * However, any distribution of this software source code or * supporting documentation or derivative works (source code and * supporting documentation) must include the three paragraphs of * the copyright notice. */ The dcmjpeg sub-package includes an adapted version of the Independent JPEG Group Toolkit Version 6b, which is contained in dcmjpeg/libijg8, dcmjpeg/libijg12 and dcmjpeg/libijg16. This toolkit is covered by the following copyright. The original README file for the Independent JPEG Group Toolkit is located in dcmjpeg/docs/ijg_readme.txt. /* * The authors make NO WARRANTY or representation, either express or implied, * with respect to this software, its quality, accuracy, merchantability, or * fitness for a particular purpose. This software is provided "AS IS", and you, * its user, assume the entire risk as to its quality and accuracy. * * This software is copyright (C) 1991-1998, Thomas G. Lane. * All Rights Reserved except as specified below. * * Permission is hereby granted to use, copy, modify, and distribute this * software (or portions thereof) for any purpose, without fee, subject to these * conditions: * (1) If any part of the source code for this software is distributed, then this * README file must be included, with this copyright and no-warranty notice * unaltered; and any additions, deletions, or changes to the original files * must be clearly indicated in accompanying documentation. * (2) If only executable code is distributed, then the accompanying * documentation must state that "this software is based in part on the work of * the Independent JPEG Group". * (3) Permission for use of this software is granted only if the user accepts * full responsibility for any undesirable consequences; the authors accept * NO LIABILITY for damages of any kind. * * These conditions apply to any software derived from or based on the IJG code, * not just to the unmodified library. If you use our work, you ought to * acknowledge us. * * Permission is NOT granted for the use of any IJG author's name or company name * in advertising or publicity relating to this software or products derived from * it. This software may be referred to only as "the Independent JPEG Group's * software". * * We specifically permit and encourage the use of this software as the basis of * commercial products, provided that all warranty or liability claims are * assumed by the product vendor. */ The code for the interpolatePixel() image scaling algorithm in module dcmimgle has been derived from code written by Jef Poskanzer for the "Extended Portable Bitmap Toolkit" (pbmplus10dec91) which has the following copyright: /* * Copyright (C) 1991 by Jef Poskanzer. * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, provided * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation. This software is provided "as is" without express or * implied warranty. */ The color quantization code in module dcmimage (dcmquant and the related classes) has been derived from code written by Jef Poskanzer for the NetPBM toolkit which has the following copyright: /* * Copyright (C) 1989, 1991 by Jef Poskanzer. * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, provided * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation. This software is provided "as is" without express or * implied warranty. */ The code for the OFStandard::strlcpy and OFStandard::strlcat helper functions in ofstd/libsrc/ofstd.cc has been derived from the BSD implementation of strlcpy() and strlcat() and which carries the following copyright notice: /* * Copyright (c) 1998 Todd C. Miller * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ The code for the OFStandard::atof helper function in ofstd/libsrc/ofstd.cc has been derived from an implementation which carries the following copyright notice: /* * Copyright 1988 Regents of the University of California * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice appear in all copies. The * University of California makes no representations about the * suitability of this software for any purpose. It is provided "as * is" without express or implied warranty. * * * The code for OFStandard::ftoa has been derived * from an implementation which carries the following copyright notice: * * Copyright (c) 1988 Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted * provided that the above copyright notice and this paragraph are * duplicated in all such forms and that any documentation, * advertising materials, and other materials related to such * distribution and use acknowledge that the software was developed * by the University of California, Berkeley. The name of the * University may not be used to endorse or promote products derived * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ The "Base64" encoder/decoder in ofstd/libsrc/ofstd.cc has been derived from an implementation which carries the following copyright notice: /* * Copyright (c) 1999, Bob Withers - bwit(at)pobox.com * * This code may be freely used for any purpose, either personal or commercial, * provided the authors copyright notice remains intact. */ The oflog sub-package is based on the log4cplus library which is covered by the following two copyright notices (for details see oflog/docs/LICENSE): /* * Copyright (C) 1999-2009 Contributors to log4cplus project. * All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ // Module: Log4CPLUS // File: appender.h // Created: 6/2001 // Author: Tad E. Smith // // // Copyright 2001-2009 Tad E. Smith // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. The dcmjpls sub-package is based on the CharLS library, which is contained in dcmjpls/libcharls. This toolkit is covered by the following copyright: /* * The CharLS library is available under the following license: * ------------------------------------------------------------------------------- * Copyright (c) 2007-2010, Jan de Vaan * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * * Redistributions of source code must retain the above copyright notice, this * list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * * * Neither the name of my employer, nor the names of its contributors may be * used to endorse or promote products derived from this software without * specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ debian/libdcmtk2.dirs0000644000000000000000000000003412151373404011721 0ustar usr/lib usr/share/libdcmtk2