[med-svn] r5932 - in trunk/packages/dcmtk/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Feb 8 18:24:31 UTC 2011
Author: malat-guest
Date: 2011-02-08 18:24:26 +0000 (Tue, 08 Feb 2011)
New Revision: 5932
Added:
trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.6.0-1.patch
Removed:
trunk/packages/dcmtk/trunk/debian/patches/01_buildsystem_changes.patch
trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.5.4-3.patch
trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch
Modified:
trunk/packages/dcmtk/trunk/debian/changelog
trunk/packages/dcmtk/trunk/debian/copyright
trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS
trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian
trunk/packages/dcmtk/trunk/debian/patches/series
Log:
Incorporate changes suggested by J?\195?\182rg Riesmeier on debian med ML
Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/changelog 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,3 +1,12 @@
+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 <mathieu.malaterre at gmail.com> Tue, 08 Feb 2011 19:20:13 +0100
+
dcmtk (3.6.0-1) experimental; urgency=low
[ Mathieu Malaterre ]
Modified: trunk/packages/dcmtk/trunk/debian/copyright
===================================================================
--- trunk/packages/dcmtk/trunk/debian/copyright 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/copyright 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,6 +1,9 @@
This package was debianized by Juergen Salk <juergen.salk at gmx.de> on
Tue, 20 Dec 2005 23:06:31 +0100
+It has been updated by Mathieu Malaterre <mathieu.malaterre at gmail.com> 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 <dicom at offis.de>
@@ -11,62 +14,80 @@
following copyright:
/*
- * Copyright (C) 1994-2004, OFFIS
+ * Copyright (C) 1994-2011, OFFIS e.V.
+ * All rights reserved.
*
* This software and supporting documentation were developed by
*
- * Kuratorium OFFIS e.V.
- * Healthcare Information and Communication Systems
+ * OFFIS e.V.
+ * R&D Division Health
* Escherweg 2
- * D-26121 Oldenburg, Germany
+ * 26121 Oldenburg, Germany
*
- * THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS MAKES NO 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
*
- * Copyright of the software and supporting documentation is, unless
- * otherwise stated, owned by OFFIS, 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.
+ * - 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
-identifed by the following copyright notice located in each source file:
+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
@@ -74,7 +95,7 @@
* 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
@@ -84,15 +105,15 @@
* 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 identifed by the
-following copyright notice located in each affected source file:
+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
@@ -126,8 +147,8 @@
* 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,
+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.
@@ -169,10 +190,25 @@
* 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) is derived from code written by Jef Poskanzer for the NetPBM
-toolkit which has the following copyright:
+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.
@@ -185,7 +221,6 @@
* 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
@@ -218,11 +253,10 @@
* 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:
-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
@@ -262,61 +296,87 @@
* provided the authors copyright notice remains intact.
*/
-The dcmjp2k sub-package (which is currently not part of the free
-toolkit) includes an adapted version of the JasPer JPEG 2000 toolkit,
-which is contained in dcmjp2k/libjaspr. This toolkit is covered by
-the following copyright.
+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):
-/* JasPer License Version 2.0
- *
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- * Copyright (c) 2001-2003 Michael David Adams
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1. The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2. The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE. AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY. THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- */
+/*
+ * 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.
+ */
Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,89 +1,137 @@
-dcmtk (3.5.4-1) unstable; urgency=low
+dcmtk (3.6.0-1) unstable; urgency=low
- Version 3.5.4 of the OFFIS DCMTK (DICOM ToolKit) software includes
- the following main changes over the previous version (Version 3.5.3):
+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:
- * The former "imagectn" tool has been renamed to "dcmqrscp" (Q/R
- SCP) and has been refactored into a simple class structure that
- offers a clean API for exchanging the index file
- back-end. Minimal support for compressed transfer syntaxes has
- been added. The tool can now also be started by root and change
- privileges to a different user and group specified in the config
- file.
+- DCMTK 3.6.0 now also builds correctly with GNU gcc 4.1 (and higher), Visual
+ Studio 2008 and 2010.
- * New tool pdf2dcm allows to convert PDF files to DICOM
- Encapsulated PDF Storage SOP instances.
+- Tested with latest versions of the following operating systems/environments:
- * New lossless JPEG encoder that guarantees "true lossless"
- compression in contrast to the old implementation which could
- cause rounding errors in certain cases.
+ - 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
- * StoreSCP now supports multi-process mode both on Posix and Win32
- platforms where a separate client process is forked for each
- incoming association. On Posix platforms, the tool can also be
- started from inetd.
+ For a complete list of tested systems and compilers, see the INSTALL file.
- * New schema for include files. All includes files are now
- included as #include "dcmtk/module/file.h", e.g. #include
- "dcmtk/dcmdata/dctk.h". This allows the DCMTK header files to be
- installed in a public directory such as /usr/local/include and
- eliminates the risk of name clashes.
+- 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.
- * DcmFileFormat::loadFile can now be prevented from attempting to
- load non-part 10 files as DICOM datasets. Many tools support a
- corresponding command line option "--read-file-only".
+- 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.
- * Many tools support a new command line option that ignores the
- transfer syntax specified in the meta header and tries to detect
- the transfer syntax automatically from the dataset.
+- 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.
- * Added support for X-Ray Radiation Dose SR and Procedure Log SR
- documents in dcmsr module.
+- 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.
- * TLS module now supports AES ciphersuites if compiled with
- OpenSSL 0.9.7 or newer. All TLS-enabled tools now support the
- "AES TLS Secure Transport Connection Profile".
+- New tool dcm2pdf allows for extracting PDF files from DICOM Encapsulated PDF
+ Storage SOP instances.
- * Added command line options for separate DIMSE and ACSE timeouts
- to many tools
+- New tool dcml2pnm allows for converting JPEG-LS compressed DICOM images to
+ standard image formats like TIFF or BMP.
- * The dcmdata module now supports an automatic re-conversion of
- defined length UN elements read in an explicit VR transfer
- syntax, if the real VR is defined in the data dictionary. A
- corresponding command line option "--convert-un" is available in
- dcmdump and dcmconv.
+- The tools dcmdump and storescu have new options for searching directories
+ recursively for DICOM files.
- * Compilation with OpenSSL 0.9.8, which introduces an incompatible
- API change, is now supported.
+- 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).
- * Network tools support transmission and receipt of JPEG 2000
- transfer syntaxes.
+- 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.
- * DICOMDIR tools and classes now support Encapsulated Document,
- Real World Value Mapping, Hanging Protocol and Color
- Presentation State objects.
+- 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 toolkit can now read DICOM files in which the meta header
- group length attribute (0002,0000) is absent, based on a
- heuristic that checks for group 0002 attribute tags.
+- The tool dump2dcm now also supports compressed pixel data. In addition,
+ the memory requirements for very large data elements have been reduced.
- * Added option --read-dataset to dcmdjpeg that allows to
- decompress JPEG compressed DICOM objects that have been stored
- as dataset without meta-header.
+- 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.
- * Added support for reading UN elements with undefined length
- according to CP 246. A flag allows to revert to the prior
- behaviour in which UN elements with undefined length were parsed
- like a normal explicit VR SQ element.
+- The tool storescp now has a new option that allows for accepting all
+ supported transfer syntaxes on a single association.
- * Added support for new Media Storage Application Profiles
- according to DICOM PS 3.12-2004. Removed support for
- non-standard conformant "No profile".
+- 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.
- * The DICOM data dictionary has been re-worked based on the latest
- supplements and correction proposals, as usual.
+- Refactored code of the tool findscu into a C++ class. This facilitates
+ re-use of the findscu code in other applications.
- * Many bug fixes and minor improvements as usual - see the
- /usr/share/doc/dcmtk/changelog.gz file for more details.
+- 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.
- -- Juergen Salk <jsa at debian.org> Tue, 20 Dec 2005 20:29:15 +0000
+- 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 <mathieu.malaterre at gmail.com> Tue, 08 Feb 2011 19:14:53 +0100
Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian 2011-02-08 18:24:26 UTC (rev 5932)
@@ -168,9 +168,9 @@
--exec-prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --includedir=/usr/include/dcmtk \
+ --includedir=/usr/include \
--libdir=/usr/lib \
- --datadir=/usr/share \
+ --datadir=/usr/share/dcmtk \
--sysconfdir=/etc/dcmtk \
--with-private-tags \
--with-libtiff \
Deleted: trunk/packages/dcmtk/trunk/debian/patches/01_buildsystem_changes.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/01_buildsystem_changes.patch 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/patches/01_buildsystem_changes.patch 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,95 +0,0 @@
-Author: Jürgen Salk <jsa at debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the build system of dcmtk. These are
- bundled in this patch set.
-
---- dcmtk-3.5.4.orig/dcmdata/apps/Makefile.in
-+++ dcmtk-3.5.4/dcmdata/apps/Makefile.in
-@@ -73,13 +73,18 @@
- done
-
- install-support:
-- $(configdir)/mkinstalldirs $(libdir)
-+ if [ "x$(prefix)" = "x" ] ; then \
-+ SUPPORTPATH="$(libdir)" ;\
-+ else \
-+ SUPPORTPATH="$(datadir)" ;\
-+ fi ; \
-+ $(configdir)/mkinstalldirs $$SUPPORTPATH ;\
- for file in $(support_lib); do \
-- $(INSTALL_DATA) $$file $(libdir) ;\
-- done
-- $(configdir)/mkinstalldirs $(datadir)
-+ $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
-+ done ;\
-+ $(configdir)/mkinstalldirs $$SUPPORTPATH ;\
- for file in $(support_data); do \
-- $(INSTALL_DATA) $$file $(datadir) ;\
-+ $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
- done
-
- clean:
---- dcmtk-3.5.4.orig/dcmdata/libsrc/Makefile.in
-+++ dcmtk-3.5.4/dcmdata/libsrc/Makefile.in
-@@ -56,12 +56,17 @@
- $(INSTALL_DATA) $(library) $(libdir)/$(library)
-
- install-support: $(DICTFILE) $(PRIVDICTFILE)
-- $(configdir)/mkinstalldirs $(libdir)
-+ if [ "x$(prefix)" = "x" ] ; then \
-+ DICTPATH="$(libdir)" ; \
-+ else \
-+ DICTPATH="$(datadir)" ; \
-+ fi ; \
-+ $(configdir)/mkinstalldirs $$DICTPATH ; \
- if [ "x$(INSTALL_PRIVATE_DICTIONARY)" = "xYES" ] ; then \
- cat $(DICTFILE) $(PRIVDICTFILE) >dicom.tmp ; \
-- $(INSTALL_DATA) dicom.tmp $(libdir)/dicom.dic ; \
-+ $(INSTALL_DATA) dicom.tmp $$DICTPATH/dicom.dic ; \
- else \
-- $(INSTALL_DATA) $(DICTFILE) $(libdir)/dicom.dic ; \
-+ $(INSTALL_DATA) $(DICTFILE) $$DICTPATH/dicom.dic ; \
- fi
-
-
-@@ -69,7 +74,7 @@
- rm -f $(support_progs) $(support_objs) $(objs) $(library) $(TRASH)
-
- distclean: nobuiltindict clean
-- rm -f $(DISTTRASH)
-+ rm -f $(DISTTRASH) dicom.tmp
-
-
- $(library): $(objs)
---- dcmtk-3.5.4.orig/dcmsr/apps/Makefile.in
-+++ dcmtk-3.5.4/dcmsr/apps/Makefile.in
-@@ -49,9 +49,14 @@
- done
-
- install-support:
-- $(configdir)/mkinstalldirs $(libdir)
-+ if [ "x$(prefix)" = "x" ] ; then \
-+ SUPPORTPATH="$(libdir)" ;\
-+ else \
-+ SUPPORTPATH="$(datadir)" ;\
-+ fi ; \
-+ $(configdir)/mkinstalldirs $$SUPPORTPATH ;\
- for file in $(support); do \
-- $(INSTALL_DATA) $$file $(libdir) ;\
-+ $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
- done
-
- clean:
---- dcmtk-3.5.4.orig/config/Makefile.def.in
-+++ dcmtk-3.5.4/config/Makefile.def.in
-@@ -11,8 +11,8 @@
-
- bindir = $(DESTDIR)@bindir@
- etcdir = $(DESTDIR)@sysconfdir@
--datadir = $(DESTDIR)@datadir@/data
--docdir = $(DESTDIR)@datadir@/doc
-+datadir = $(DESTDIR)@datadir@/dcmtk
-+docdir = $(DESTDIR)@datadir@/doc/dcmtk
- mandir = $(DESTDIR)@mandir@
- libdir = $(DESTDIR)@libdir@
- includedir = $(DESTDIR)@includedir@
Deleted: trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.5.4-3.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.5.4-3.patch 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.5.4-3.patch 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,89 +0,0 @@
-Author: Jürgen Salk <jsa at debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code. This file contains
- changes to C++ code
-
-Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
-===================================================================
---- dcmtk-3.6.0.orig/dcmqrdb/etc/dcmqrscp.cfg 2010-09-09 19:20:25.000000000 +0200
-+++ dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg 2011-01-28 09:49:02.000000000 +0100
-@@ -10,6 +10,9 @@
- NetworkTCPPort = 104
- MaxPDUSize = 16384
- MaxAssociations = 16
-+UserName = "dcmtk"
-+GroupName = "dcmtk"
-+
- #
- # UserName = <not used>
- # GroupName = <not used>
-@@ -28,12 +31,13 @@
- # NOTE: in the current implementation you cannot substitute an IP address
- # for a hostname.
- #
--acme1 = (ACME1, acmehost1, 5678)
--acme2 = (ACME2, acmehost2, 5678)
--acmeCTcompany = acme1, acme2
--united1 = (UNITED1, unitedhost1, 104)
--united2 = (UNITED2, unitedhost2, 104)
--unitedMRcompany = united1, united2
-+# Example:
-+#acme1 = (ACME1, acmehost1, 5678)
-+#acme2 = (ACME2, acmehost2, 5678)
-+#acmeCTcompany = acme1, acme2
-+#united1 = (UNITED1, unitedhost1, 104)
-+#united2 = (UNITED2, unitedhost2, 104)
-+#unitedMRcompany = united1, united2
- #
- HostTable END
-
-@@ -51,8 +55,9 @@
- # VendorName = SymbolicName
- # The symbolic name should be defined in the HostTable.
- #
--"Acme CT Company" = acmeCTcompany
--"United MR Company" = unitedMRcompany
-+# Example:
-+#"Acme CT Company" = acmeCTcompany
-+#"United MR Company" = unitedMRcompany
- #
- VendorTable END
-
-@@ -70,8 +75,13 @@
- # Entry in HostTable |
- # ANY
- #
--COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
--ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
--UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
-+# Example:
-+#
-+#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
-+#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
-+#
-+# Uncomment and adjust the following lines for a common r/rw storage area:
-+#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
-+#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
- #
- AETable END
-Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
-===================================================================
---- dcmtk-3.6.0.orig/dcmqrdb/docs/dcmqrcnf.txt 2010-09-09 19:20:12.000000000 +0200
-+++ dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt 2011-01-28 09:46:02.000000000 +0100
-@@ -44,8 +44,8 @@
- NetworkTCPPort = 104
- MaxPDUSize = 8192
- MaxAssociations = 20
--UserName = (do not change user)
--GroupName = (do not change group)
-+UserName = "dcmtk"
-+GroupName = "dcmtk"
-
- NOTE: You must have root privileges to bind port 104 for DICOM association
- requests on Unix/Linux/Posix platforms as this is a privileged port number
-Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile 2011-01-28 09:46:02.000000000 +0100
-@@ -0,0 +1 @@
-+
Copied: trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.6.0-1.patch (from rev 5931, trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.5.4-3.patch)
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.6.0-1.patch (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/patches/02_dcmtk_3.6.0-1.patch 2011-02-08 18:24:26 UTC (rev 5932)
@@ -0,0 +1,89 @@
+Author: Jürgen Salk <jsa at debian.org>
+Description: The original maintainer Jürgen Salk applied
+ a set of patches to the original code. This file contains
+ changes to C++ code
+
+Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
+===================================================================
+--- dcmtk-3.6.0.orig/dcmqrdb/etc/dcmqrscp.cfg 2010-09-09 19:20:25.000000000 +0200
++++ dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg 2011-01-28 09:49:02.000000000 +0100
+@@ -10,6 +10,9 @@
+ NetworkTCPPort = 104
+ MaxPDUSize = 16384
+ MaxAssociations = 16
++UserName = "dcmtk"
++GroupName = "dcmtk"
++
+ #
+ # UserName = <not used>
+ # GroupName = <not used>
+@@ -28,12 +31,13 @@
+ # NOTE: in the current implementation you cannot substitute an IP address
+ # for a hostname.
+ #
+-acme1 = (ACME1, acmehost1, 5678)
+-acme2 = (ACME2, acmehost2, 5678)
+-acmeCTcompany = acme1, acme2
+-united1 = (UNITED1, unitedhost1, 104)
+-united2 = (UNITED2, unitedhost2, 104)
+-unitedMRcompany = united1, united2
++# Example:
++#acme1 = (ACME1, acmehost1, 5678)
++#acme2 = (ACME2, acmehost2, 5678)
++#acmeCTcompany = acme1, acme2
++#united1 = (UNITED1, unitedhost1, 104)
++#united2 = (UNITED2, unitedhost2, 104)
++#unitedMRcompany = united1, united2
+ #
+ HostTable END
+
+@@ -51,8 +55,9 @@
+ # VendorName = SymbolicName
+ # The symbolic name should be defined in the HostTable.
+ #
+-"Acme CT Company" = acmeCTcompany
+-"United MR Company" = unitedMRcompany
++# Example:
++#"Acme CT Company" = acmeCTcompany
++#"United MR Company" = unitedMRcompany
+ #
+ VendorTable END
+
+@@ -70,8 +75,13 @@
+ # Entry in HostTable |
+ # ANY
+ #
+-COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
+-ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
+-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
++# Example:
++#
++#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
++#
++# Uncomment and adjust the following lines for a common r/rw storage area:
++#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
++#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
+ #
+ AETable END
+Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
+===================================================================
+--- dcmtk-3.6.0.orig/dcmqrdb/docs/dcmqrcnf.txt 2010-09-09 19:20:12.000000000 +0200
++++ dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt 2011-01-28 09:46:02.000000000 +0100
+@@ -44,8 +44,8 @@
+ NetworkTCPPort = 104
+ MaxPDUSize = 8192
+ MaxAssociations = 20
+-UserName = (do not change user)
+-GroupName = (do not change group)
++UserName = "dcmtk"
++GroupName = "dcmtk"
+
+ NOTE: You must have root privileges to bind port 104 for DICOM association
+ requests on Unix/Linux/Posix platforms as this is a privileged port number
+Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile 2011-01-28 09:46:02.000000000 +0100
+@@ -0,0 +1 @@
++
Deleted: trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/patches/06_old_patches_from_diff_gz.patch 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,12 +0,0 @@
---- dcmtk-3.5.4.orig/CHANGES.354
-+++ dcmtk-3.5.4/CHANGES.354
-@@ -1,3 +1,9 @@
-+**** Changes from 2006.01.17 (onken)
-+
-+- Fixed "--key" option, which was broken when using the optional assignment
-+ ("=") operation inside the option value.
-+ Affects: dcmnet/apps/movescu.cc
-+ dcmnet/apps/findscu.cc
-
- Release 3.5.4 (Public Release - 2005-12-20)
-
Modified: trunk/packages/dcmtk/trunk/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/series 2011-02-08 15:24:20 UTC (rev 5931)
+++ trunk/packages/dcmtk/trunk/debian/patches/series 2011-02-08 18:24:26 UTC (rev 5932)
@@ -1,5 +1,5 @@
01_fix_perl_script_path.patch
-02_dcmtk_3.5.4-3.patch
+02_dcmtk_3.6.0-1.patch
04_nostrip.patch
05_no_www_docs.patch
07_doxygen.patch
More information about the debian-med-commit
mailing list