--- dicom3tools-1.0~20110529.orig/debian/compat +++ dicom3tools-1.0~20110529/debian/compat @@ -0,0 +1 @@ +7 --- dicom3tools-1.0~20110529.orig/debian/control +++ dicom3tools-1.0~20110529/debian/control @@ -0,0 +1,21 @@ +Source: dicom3tools +Section: graphics +Maintainer: Debian Med Packaging Team +DM-Upload-Allowed: yes +Uploaders: Mathieu Malaterre +Priority: extra +Build-Depends: debhelper (>= 7), quilt, xutils-dev, libx11-dev, libxext-dev +Standards-Version: 3.9.2 +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicom3tools/trunk/?rev=0&sc=0 +Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dicom3tools/trunk/ +Homepage: http://www.dclunie.com/dicom3tools.html + +Package: dicom3tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: dcmtk, libgdcm-tools, pvrg-jpeg +Description: DICOM medical image files manipulation and conversion tools + Command line utilities for creating, modifying, dumping and validating + files of DICOM attributes. Support conversion of some proprietary medical + image formats to DICOM. Can handle older ACR/NEMA format data, and some + proprietary versions of that such as SPI. --- dicom3tools-1.0~20110529.orig/debian/README.source +++ dicom3tools-1.0~20110529/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream source. +Changes are stored in the source package as diffs in debian/patches and applied +during the build. + +For complete information, please see /usr/share/doc/quilt/README.source. --- dicom3tools-1.0~20110529.orig/debian/changelog +++ dicom3tools-1.0~20110529/debian/changelog @@ -0,0 +1,92 @@ +dicom3tools (1.0~20110529-1) unstable; urgency=low + + * New upstream + * Allow new executable: pnmtoraw + + -- Mathieu Malaterre Fri, 17 Jun 2011 12:10:34 +0200 + +dicom3tools (1.0~20110522-1) unstable; urgency=low + + * New upstream + * Update Standards-Version to 3.9.2. No changes needed + * Properly handle uncompressed icon. Closes: #625816 + + -- Mathieu Malaterre Sat, 28 May 2011 17:55:51 +0200 + +dicom3tools (1.0~20110207-1) unstable; urgency=low + + * New upstream + * Fix dctopgm8 and MONOCHROME1 windowing + * Add cmd line opt for dctopgm8 (override VOI LUT) + * Add suggest on pvrg-jpeg + * Use --no-name when compressing orig tarball + + -- Mathieu Malaterre Wed, 20 Apr 2011 11:35:51 +0200 + +dicom3tools (1.0~20101204-1) experimental; urgency=low + + * New upsteam + * Add new command line tools: dctopgm8, dcposn, dctopgx, dctopnm + * Bump Standard-Version to 3.9.1, no change needed + + -- Mathieu Malaterre Thu, 13 Jan 2011 09:11:20 +0100 + +dicom3tools (1.0~20100510-1) unstable; urgency=low + + * New upstream (fix pnmtodc for odd length) + + -- Mathieu Malaterre Tue, 11 May 2010 11:39:07 +0200 + +dicom3tools (1.0~20100206-2) unstable; urgency=low + + * Add jpegdump command line tool for dumping jpeg structure. + + -- Mathieu Malaterre Mon, 03 May 2010 17:50:53 +0200 + +dicom3tools (1.0~20100206-1) unstable; urgency=low + + * New upstream. + * Bump Standard-Version to 3.8.4, no change needed + + -- Mathieu Malaterre Thu, 25 Feb 2010 09:49:28 +0100 + +dicom3tools (1.0~20091217-1) unstable; urgency=low + + * Fix DEB_BUILD_OPTIONS=nostrip discarded (Closes: #559320) + * dciodvfy: Allow RGB for RLE. Closes: #561122 + + -- Mathieu Malaterre Sun, 27 Dec 2009 15:06:08 +0100 + +dicom3tools (1.0~20091113-1) unstable; urgency=low + + * New upstream. + * Add new utilities: dcdirdmp, dcsrdump + * Remove static libraries + + -- Mathieu Malaterre Fri, 20 Nov 2009 14:44:50 +0100 + +dicom3tools (1.0~20090716-4) unstable; urgency=low + + * Fix compilation on hurd-i386 + + -- Mathieu Malaterre Fri, 11 Sep 2009 09:25:13 +0200 + +dicom3tools (1.0~20090716-3) unstable; urgency=low + + * debian/control: adding dep to x11proto-xext-dev, find X11/extensions/XShm.h + * Fix compilation on kFreeBSD (Closes: #545844) + + -- Mathieu Malaterre Wed, 09 Sep 2009 18:27:23 +0200 + +dicom3tools (1.0~20090716-2) unstable; urgency=low + + * debian/control: adding dep to libx11-dev, to find X11/Xlib.h + * Fix compilation on buildd machine with no tty (Closes: #545697) + + -- Mathieu Malaterre Tue, 08 Sep 2009 16:44:03 +0200 + +dicom3tools (1.0~20090716-1) unstable; urgency=low + + * Initial Release (Closes: #508901) + + -- Mathieu Malaterre Sun, 09 Aug 2009 10:39:39 +0200 --- dicom3tools-1.0~20110529.orig/debian/watch +++ dicom3tools-1.0~20110529/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts="uversionmangle=s/.00.snapshot./.0~/" \ +http://www.dclunie.com/dicom3tools/workinprogress dicom3tools_(.*)\.tar\.bz2 --- dicom3tools-1.0~20110529.orig/debian/rules +++ dicom3tools-1.0~20110529/debian/rules @@ -0,0 +1,144 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#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) + +VER_MAJOR = 1 +VER_MINOR = 0 +VER_PATCH = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d- | cut -f2 -d~) +UPSTREAM_SRC = dicom3tools_1.00.snapshot.$(VER_PATCH) + +VER_FULL = $(VER_MAJOR).$(VER_MINOR)~$(VER_PATCH) +DEBIAN_SRC_DIR = dicom3tools-$(VER_FULL) +DEBIAN_SRC_TAR = dicom3tools_$(VER_FULL).orig.tar.gz + +CFLAGS = -Wall -g + +ifneq (,$(findstring regression_testing_dicom,$(MM_BUILD_OPTIONS))) +DCLIST = -name andump\* -o -name dccp\* -o -name dcintro\* -o -name rawtodc\* -o -name pdftodc\* -o -name rawnjl2\* -o -name ancreate\* -o -name dcencap\* -o -name dccp\* -o -name dctoraw\* -o -name dcjpeg\* -o -name dcmulti\* -o -name dcuncat\* -o -name pnmtodc\* -o -name dcjls\* -o -name dcj2k\* -o -name dcunjpeg\* -o -name dcunjls\* -o -name bmpdump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name dctopgx\* -o -name dctopnm\* -o -name pgxtodc\* -o -name pnmtodc\* -o -name rawftodc\* -o -name rawtodc\* +ifneq (,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS))) +DEFAULTUIDROOT = $(patsubst default_uid_root=%,%,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS))) +IMAKEFLAGS = -DDefaultUIDRoot=$(DEFAULTUIDROOT) +endif +else +DCLIST = -name andump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name dctopgx\* -o -name dctopnm\* +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPT_FLAGS = -O0 +else + OPT_FLAGS = -O2 +endif +CFLAGS += $(OPT_FLAGS) + +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + # http://www.gnu.org/manual/gawk/html_node/Special-FD.html + find . -name \*.awk -exec sed -i -e 's@/dev/tty@/dev/stderr@g' {} \; + # Add here commands to configure the package. + sh Configure + imake -I./config -DTmpPath=/tmp -DOptimizeLevel=$(OPT_FLAGS) $(IMAKEFLAGS) + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + # Add here commands to compile the package. + $(MAKE) World "C_DEBUGFLAGS=$(CFLAGS)" "CPLUSPLUS_DEBUGFLAGS=$(CFLAGS)" + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) clean + dh_clean + +install: build + dh_testdir + dh_testroot + #dh_clean -k + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/dicom3tools. + # install everything + $(MAKE) DESTDIR=$(CURDIR)/debian/dicom3tools install + # install man pages: + $(MAKE) DESTDIR=$(CURDIR)/debian/dicom3tools install.man + # remove empty man page + find $(CURDIR)/debian/dicom3tools -type f -size 0 -print | xargs rm + # now that we have removed empty man page, we need to remove associated binaries + for file in ancp andiff antodc.all binpatch dcanon dcburn dccmp dccomb dcdecmpr dcdiff dclutburn \ + dclutmix dcmvhier.8only dcmvhier.all dcortho dcostosr dcpost dcproj dcrmsfx.all \ + dcsrmrg dcsub dcswab dcunjpeg.all dumptiff dumpwhat gentodc.dat.all \ + jpegsplit pbmswbit pgmtobmp pnmpred pqsplit rawarith rawdiff rawmask; do \ + find $(CURDIR)/debian/dicom3tools -type f -name $$file\* -print | xargs rm; \ + done + # Move the special .so (groff source file to /usr/share/dicom3tools to please lintian + mkdir -p $(CURDIR)/debian/dicom3tools/usr/share/dicom3tools + mv $(CURDIR)/debian/dicom3tools/usr/share/man/man1/*.so $(CURDIR)/debian/dicom3tools/usr/share/dicom3tools + # Let's use the new file location: + find $(CURDIR)/debian/dicom3tools/usr/share/man/man1 -type f -exec sed -i -e 's@.so man1@.so ../dicom3tools@g' {} \; + # Cannot start a line with a . (it is a macro) + # http://www.mail-archive.com/groff@gnu.org/msg04712.html + find $(CURDIR)/debian/dicom3tools/usr/share/man/man1 -type f -exec sed -i -e 's/^\.\.\.$$/\\\&\.\.\./g' {} \; + # a newline character is not allowed in an escape name / a space character is not allowed in an escape name + find $(CURDIR)/debian/dicom3tools/usr/share/man/man1 -type f -exec sed -i -e 's/\\n/\\/g' {} \; + # hyphen-used-as-minus-sign + #find $(CURDIR)/debian/dicom3tools/usr/share/man/man1 -type f -exec sed -i -e 's/-/\\-/g' {} \; + # Can't use above -> manpage-has-bad-whatis-entry + # Remove (except special list from official upstream releases) : + find $(CURDIR)/debian/dicom3tools/usr/bin -type f -not \( $(DCLIST) \) -print | xargs rm; + find $(CURDIR)/debian/dicom3tools/usr/share/man -type f -not \( $(DCLIST) \) -print | xargs rm; + # Remove all static lib + rm -rf $(CURDIR)/debian/dicom3tools/usr/lib + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +$(UPSTREAM_SRC).tar.bz2: + wget http://www.dclunie.com/dicom3tools/workinprogress/$@ + +get-orig-source: $(UPSTREAM_SRC).tar.bz2 + tar xjf $(UPSTREAM_SRC).tar.bz2 + mv $(UPSTREAM_SRC) $(DEBIAN_SRC_DIR) + GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR) + rm -rf $(DEBIAN_SRC_DIR) + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- dicom3tools-1.0~20110529.orig/debian/README.Debian +++ dicom3tools-1.0~20110529/debian/README.Debian @@ -0,0 +1,49 @@ +dicom3tools for Debian +---------------------- + +What are the dicom3tools ... + +See: http://www.dclunie.com/dicom3tools.html + +We only distribute the read-only command line executables, just as the official ones: + +$ unzip dicom3tools_winexe_1.00.snapshot.20090716.zip +Archive: dicom3tools_winexe_1.00.snapshot.20090716.zip + inflating: andump.exe + inflating: dcdump.exe + inflating: dcentvfy.exe + inflating: dcfile.exe + inflating: dchist.exe + inflating: dciodvfy.exe + inflating: dckey.exe + inflating: dcsort.exe + inflating: dcsrdump.exe + inflating: dcstats.exe + inflating: dctable.exe + inflating: cygwin1.dll + +In order to use the command line tools that generate DICOM file, you need to compile +dicom3tools from source and set the UID root appropriately. See documentation +for more information. + + + + +Historical footnote: +At first the package was being distributed with tool that +would generate DICOM with invalid root UID: +... +The package is setup so that default Root UID is 0.0.0.0. This means that DICOM +file created will be syntactically correct, but will be refused by standard DICOM +implementation as this is not allowed as valid Root UID. You should either only +use this package for validation, but not in a production site, where produced +DICOM files are supposed to be sent to the outside world. +... + +But the main author objected that this would be extremely dangerous, as such it was decided to +only distribute the exact same binaries as the one for windows and MacOSx. Ref: + +Debian package for dicom3tools: +http://groups.google.com/group/comp.protocols.dicom/browse_thread/thread/719f2662d40e5c63 + + -- Mathieu Malaterre Sun, 09 Aug 2009 10:39:39 +0200 --- dicom3tools-1.0~20110529.orig/debian/copyright +++ dicom3tools-1.0~20110529/debian/copyright @@ -0,0 +1,45 @@ +This package was debianized by Mathieu Malaterre on +Sun, 14 Dec 2008 17:28:00 +0100. + +It was downloaded from http://www.dclunie.com/dicom3tools/workinprogress/ + +Upstream Author: + + David A. Clunie dclunie@dclunie.com + +Copyright: + + Copyright © 1993-2006, David A. Clunie DBA PixelMed Publishing. All rights reserved. + +License: + + 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 disclaimers. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list of + conditions and the following disclaimers in the documentation and/or other materials + provided with the distribution. + + 3. Neither the name of PixelMed Publishing nor the names of its contributors may + be used to endorse or promote products derived from this software. + + 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. + + This software has neither been tested nor approved for clinical use or for incorporation in + a medical device. It is the redistributor's or user's responsibility to comply with any + applicable local, state, national or international regulations. + +The Debian packaging is © 2008, Mathieu Malaterre and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + --- dicom3tools-1.0~20110529.orig/debian/patches/project.tmpl.patch +++ dicom3tools-1.0~20110529/debian/patches/project.tmpl.patch @@ -0,0 +1,25 @@ +This is a patch to install in /usr/bin instead of /local + +--- dicom3tools-1.0~20081122.orig/config/Project.tmpl 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools-1.0~20081122/config/Project.tmpl 2008-12-15 14:38:11.000000000 +0100 +@@ -18,16 +18,16 @@ + PRIVCONFIGDIR = PrivConfigDir + + #ifndef InstallBinDir +-#define InstallBinDir /usr/local/bin ++#define InstallBinDir /usr/bin + #endif + #ifndef InstallIncDir +-#define InstallIncDir /usr/local/include ++#define InstallIncDir /usr/include + #endif + #ifndef InstallLibDir +-#define InstallLibDir /usr/local/lib ++#define InstallLibDir /usr/lib + #endif + #ifndef InstallManDir +-#define InstallManDir /usr/local/man ++#define InstallManDir /usr/share/man + #endif + + PATHSEP = / /* for building filenames */ --- dicom3tools-1.0~20110529.orig/debian/patches/bmpdump.man.patch +++ dicom3tools-1.0~20110529/debian/patches/bmpdump.man.patch @@ -0,0 +1,19 @@ +the bmpdump.man file was empty. We need to provide a minimal one instead. + +--- dicom3tools-1.0~20100206/appsrc/misc/bmpdump.man 2001-11-11 15:57:49.000000000 +0100 ++++ copy/appsrc/misc/bmpdump.man 2010-05-03 17:49:28.000000000 +0200 +@@ -0,0 +1,14 @@ ++.TH bmpdump: "1" "May 2010" "bmpdump" "User Commands" ++.SH NAME ++bmpdump: \- manual page for bmpdump ++.SH SYNOPSIS ++.B bmpdump ++[\fIOPTION\fR]... < \fIFILE\fR... ++.SH DESCRIPTION ++bmpdump ++.PP ++dumps aBMPG file, it will display the structure and values contained in the specified BMP file ++ ++This manual page was written by Mathieu Malaterre ++ for the Debian GNU/Linux system (but may be used by others). ++ --- dicom3tools-1.0~20110529.orig/debian/patches/series +++ dicom3tools-1.0~20110529/debian/patches/series @@ -0,0 +1,7 @@ +project.tmpl.patch +20_gcc4.3.patch +strip.patch +configure.patch +jpegdump.man.patch +bmpdump.man.patch +pvrg_naming.patch --- dicom3tools-1.0~20110529.orig/debian/patches/pvrg_naming.patch +++ dicom3tools-1.0~20110529/debian/patches/pvrg_naming.patch @@ -0,0 +1,33 @@ +Index: dicom3tools-1.0~20110522/appsrc/dcfile/dcjpeg.script +=================================================================== +--- dicom3tools-1.0~20110522.orig/appsrc/dcfile/dcjpeg.script 2003-06-11 16:33:57.000000000 +0200 ++++ dicom3tools-1.0~20110522/appsrc/dcfile/dcjpeg.script 2011-05-28 18:00:48.000000000 +0200 +@@ -13,7 +13,7 @@ + DCTORAW=dctoraw + DCKEY=dckey + DCENCAP=dcencap +-JPEG=jpeg ++JPEG=pvrg-jpeg + + infile="$1" + shift +Index: dicom3tools-1.0~20110522/appsrc/dcfile/dcunjpeg.script +=================================================================== +--- dicom3tools-1.0~20110522.orig/appsrc/dcfile/dcunjpeg.script 2010-11-15 18:13:41.000000000 +0100 ++++ dicom3tools-1.0~20110522/appsrc/dcfile/dcunjpeg.script 2011-05-28 18:00:48.000000000 +0200 +@@ -11,7 +11,7 @@ + DCTORAW=dctoraw + DCKEY=dckey + PNMTORAW=pnmtoraw +-JPEG=jpeg ++JPEG=pvrg-jpeg + DJPEG=djpeg + KDUEXPAND=kdu_expand + +@@ -143,4 +143,4 @@ + else + echo 1>&2 "Could not find suitable codec or codec failed for Transfer Syntax $transfersyntaxuid" + exit 1 +-fi +\ No newline at end of file ++fi --- dicom3tools-1.0~20110529.orig/debian/patches/jpegdump.man.patch +++ dicom3tools-1.0~20110529/debian/patches/jpegdump.man.patch @@ -0,0 +1,19 @@ +the jpegdump.man file was empty. We need to provide a minimal one instead. + +--- dicom3tools-1.0~20100206/appsrc/misc/jpegdump.man 2001-11-11 15:57:49.000000000 +0100 ++++ copy/appsrc/misc/jpegdump.man 2010-05-03 17:49:28.000000000 +0200 +@@ -0,0 +1,14 @@ ++.TH JPEGDUMP: "1" "May 2010" "jpegdump" "User Commands" ++.SH NAME ++jpegdump: \- manual page for jpegdump ++.SH SYNOPSIS ++.B jpegdump ++[\fIOPTION\fR]... < \fIFILE\fR... ++.SH DESCRIPTION ++jpegdump ++.PP ++dumps a JPEG file, it will display the structure and values contained in the specified JPEG file ++ ++This manual page was written by Mathieu Malaterre ++ for the Debian GNU/Linux system (but may be used by others). ++ --- dicom3tools-1.0~20110529.orig/debian/patches/strip.patch +++ dicom3tools-1.0~20110529/debian/patches/strip.patch @@ -0,0 +1,35 @@ +Remove hard-coded strip call, instead rely on dh_strip to do the work +so that we respect DEB_BUILD_OPTION=nostrip +We also need to remove the -s from the 'install' command (InstPgmFlags) + +--- dicom3tools_1.00.snapshot.20081122.orig/config/Imake.p-rules 2009-08-04 16:30:21.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/config/Imake.p-rules 2009-08-04 16:30:30.000000000 +0200 +@@ -72,7 +72,6 @@ + $(CCC) -o $@ objects $(CPLUSPLUS_LDOPTIONS) locallibs \ @@\ + $(CPLUSPLUS_LDLIBS) syslibs \ @@\ + $(CPLUSPLUS_EXTRA_LOAD_FLAGS) @@\ +- $(STRIP) $@$(EXECUTABLESUFFIX) @@\ + @@\ + clean:: @@\ + $(RM) program$(EXECUTABLESUFFIX) +--- dicom3tools_1.00.snapshot.20081122.orig/config/Imake.rules 2009-08-04 16:18:47.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/config/Imake.rules 2009-08-04 16:18:52.000000000 +0200 +@@ -110,7 +110,6 @@ + $(CCC) -o $@ objects $(CPLUSPLUS_LDOPTIONS) locallibs \ @@\ + $(CPLUSPLUS_LDLIBS) syslibs \ @@\ + $(CPLUSPLUS_EXTRA_LOAD_FLAGS) @@\ +- $(STRIP) $@ @@\ + @@\ + clean:: @@\ + $(RM) program +--- old/config/Imake.tmpl 2006-09-17 19:12:12.000000000 +0200 ++++ dicom3tools-1.0~20091113/config/Imake.tmpl 2009-12-03 16:41:35.000000000 +0100 +@@ -203,7 +203,7 @@ + #endif + + #ifndef InstPgmFlags +-#define InstPgmFlags -s ++#define InstPgmFlags + #endif + #ifndef InstBinFlags + #define InstBinFlags -m 0755 --- dicom3tools-1.0~20110529.orig/debian/patches/configure.patch +++ dicom3tools-1.0~20110529/debian/patches/configure.patch @@ -0,0 +1,13 @@ +Add support for kFreeBSD and GNU Hurd + +--- dicom3tools_1.00.snapshot.20081122.orig/config/Configure 2008-09-02 19:18:15.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/config/Configure 2009-09-09 17:24:55.000000000 +0200 +@@ -681,7 +681,7 @@ + fi + fi + +-if [ "$osname" = "Linux" ] ++if [ "$osname" = "Linux" -o "$osname" = "GNU/kFreeBSD" -o "$osname" = "GNU" ] + then + echo 1>&2 "Configure: we are on $osname" + --- dicom3tools-1.0~20110529.orig/debian/patches/20_gcc4.3.patch +++ dicom3tools-1.0~20110529/debian/patches/20_gcc4.3.patch @@ -0,0 +1,1106 @@ +Porting to gcc 4.3 +http://gcc.gnu.org/gcc-4.3/porting_to.html + +Most can be automated with: +find . -type f -exec sed -i -e 's/#include /#include \nusing namespace std;/g' {} \; +find . -type f -exec sed -i -e 's/#include /#include /g' {} \; +find . -type f -exec sed -i -e 's/#include /#include /g' {} \; + +the most complex part comes from the deprecation of ostrstream with a different ostringstream (allocation is not done at same level) + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancp.cc dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancp.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancp.cc 2007-11-24 23:30:27.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancp.cc 2008-12-16 10:43:34.433266000 +0100 +@@ -1,5 +1,7 @@ +-#include +-#include ++#include ++#include ++using namespace std; ++#include + #include + #include + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancreate.cc dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancreate.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancreate.cc 2007-01-20 17:18:28.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancreate.cc 2008-12-16 10:43:34.441258000 +0100 +@@ -1,5 +1,6 @@ +-#include +-#include ++#include ++using namespace std; ++#include + #include + #include + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/andump.cc dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/andump.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/andump.cc 2008-05-21 14:02:24.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/andump.cc 2008-12-16 10:43:34.457250000 +0100 +@@ -1,5 +1,7 @@ +-#include +-#include ++#include ++#include ++using namespace std; ++#include + #include + #include + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc 2008-09-08 21:45:41.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc 2008-12-16 10:43:34.677250000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++#include + #include + + #include "attrmxls.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc_sqlengths dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc_sqlengths +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc_sqlengths 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc_sqlengths 2008-12-16 10:43:34.684250000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdtchg.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdtchg.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdtchg.cc 2007-11-10 17:06:29.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdtchg.cc 2008-12-16 10:43:34.694250000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + //#include + + #include "attrmxls.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcentvfy.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcentvfy.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcentvfy.cc 2008-09-29 10:28:23.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcentvfy.cc 2008-12-16 10:43:34.720250000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "mesgtext.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcmulti.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcmulti.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcmulti.cc 2008-01-12 17:59:44.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcmulti.cc 2008-12-16 10:43:34.853167000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + #include + + #include "attrmxls.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcpost.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcpost.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcpost.cc 2006-09-17 19:24:08.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcpost.cc 2008-12-16 10:43:34.932088000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcrmmeta.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcrmmeta.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcrmmeta.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcrmmeta.cc 2008-12-16 10:43:34.947072000 +0100 +@@ -1,5 +1,6 @@ +-#include +-#include ++#include ++using namespace std; ++#include + #include + #include + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsort.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsort.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsort.cc 2007-03-16 03:00:20.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsort.cc 2008-12-16 10:43:34.969051000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsqextr.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsqextr.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsqextr.cc 2007-03-16 03:00:20.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsqextr.cc 2008-12-16 10:43:34.977043000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "transynu.h" + #include "attrmxls.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsrmrg.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsrmrg.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsrmrg.cc 2006-09-17 19:24:08.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsrmrg.cc 2008-12-16 10:43:34.991029000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dctable.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dctable.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dctable.cc 2008-11-19 23:35:06.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dctable.cc 2008-12-16 10:43:35.019001000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrnew.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuidchg.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuidchg.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuidchg.cc 2007-03-16 03:00:21.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuidchg.cc 2008-12-16 10:43:35.070949000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuncat.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuncat.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuncat.cc 2008-09-04 17:20:37.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuncat.cc 2008-12-16 10:43:35.085934000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attrmxls.h" + #include "attrtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dconvert/pq/pqsplit.cc dicom3tools_1.00.snapshot.20081122/appsrc/dconvert/pq/pqsplit.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dconvert/pq/pqsplit.cc 2004-11-24 19:29:24.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/dconvert/pq/pqsplit.cc 2008-12-16 10:43:35.491570000 +0100 +@@ -1,5 +1,6 @@ +-#include +-#include ++#include ++using namespace std; ++#include + #include + #include + #include // for atoi() +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/binpatch.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/binpatch.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/binpatch.cc 2004-11-24 21:32:57.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/binpatch.cc 2008-12-16 10:43:35.669570000 +0100 +@@ -1,6 +1,7 @@ +-#include // for listsimp.h +-#include // for listsimp.h +-#include ++#include ++using namespace std; // for listsimp.h ++#include // for listsimp.h ++#include + #include // for atoi() + #include // for strlen() + #include // for isdigit() +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dcunmeta.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/dcunmeta.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dcunmeta.cc 2001-11-11 15:57:49.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/dcunmeta.cc 2008-12-16 10:43:35.686570000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "mesgtext.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumptiff.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumptiff.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumptiff.cc 2001-11-11 15:57:49.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumptiff.cc 2008-12-16 10:43:35.693571000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "bnstream.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumpwhat.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumpwhat.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumpwhat.cc 2006-09-17 19:24:08.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumpwhat.cc 2008-12-16 10:58:24.042730000 +0100 +@@ -1,5 +1,7 @@ +-#include +-#include ++#include ++#include ++#include ++using namespace std; + #include // for atoi() + #include + #include +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc 2004-07-23 20:15:58.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc 2008-12-16 10:43:35.725570000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "txstream.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc.pre2000 dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc.pre2000 +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc.pre2000 2001-11-11 15:57:49.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc.pre2000 2008-12-16 10:43:35.731570000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegsplit.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegsplit.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegsplit.cc 2004-11-24 19:29:24.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegsplit.cc 2008-12-16 10:58:53.105967000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + #include "mesgtext.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98id.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98id.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98id.cc 2006-09-17 19:24:08.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98id.cc 2008-12-16 10:43:35.839501000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98topgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98topgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98topgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98topgm.cc 2008-12-16 10:43:35.846494000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/genesis/gentopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/genesis/gentopgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/genesis/gentopgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/genesis/gentopgm.cc 2008-12-16 10:43:35.881460000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/pace/pacetopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/pace/pacetopgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/pace/pacetopgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/pace/pacetopgm.cc 2008-12-16 10:43:35.919422000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/signa/sgntopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/signa/sgntopgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/signa/sgntopgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/signa/sgntopgm.cc 2008-12-16 10:43:35.950390000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/somatom/somtopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/somatom/somtopgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/somatom/somtopgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/somatom/somtopgm.cc 2008-12-16 10:43:35.976364000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/sytec/syttopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/sytec/syttopgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/sytec/syttopgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/sytec/syttopgm.cc 2008-12-16 10:43:36.006334000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/vision/vsntopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/vision/vsntopgm.cc +--- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/vision/vsntopgm.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/vision/vsntopgm.cc 2008-12-16 10:43:36.037303000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/planev.h dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/planev.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/planev.h 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/planev.h 2008-12-16 10:43:36.215125000 +0100 +@@ -4,8 +4,9 @@ + #define __Header_planev__ + + #ifdef DEBUGPLANE +-#include +-#include ++#include ++using namespace std; ++#include + #endif + + #include +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/ptyhdr.h dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/ptyhdr.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/ptyhdr.h 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/ptyhdr.h 2008-12-16 10:43:36.218125000 +0100 +@@ -1,7 +1,8 @@ + #ifndef __Header_ptyhdr__ + #define __Header_ptyhdr__ + +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "convtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dctool/uidgen.h dicom3tools_1.00.snapshot.20081122/libsrc/include/dctool/uidgen.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dctool/uidgen.h 2006-10-22 00:03:44.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/dctool/uidgen.h 2008-12-16 10:59:40.066050000 +0100 +@@ -1,9 +1,12 @@ ++#include ++using namespace std; ++ + #ifndef __Header_uidgen__ + #define __Header_uidgen__ + + class GeneratedUID { +- ostrstream ost; +- char *string; ++ ostringstream ost; ++ char* string; + const char *stamp; + protected: + void setSOPInstance(); +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/bnstream.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/bnstream.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/bnstream.h 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/bnstream.h 2008-12-16 10:43:36.528890000 +0100 +@@ -1,8 +1,9 @@ + #ifndef __Header_bnstream__ + #define __Header_bnstream__ + +-#include +-//#include ++#include ++using namespace std; ++//#include + + #include "basetype.h" + #include "endtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/endtype.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/endtype.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/endtype.h 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/endtype.h 2008-12-16 10:43:36.538891000 +0100 +@@ -1,7 +1,8 @@ + #ifndef __Header_endtype__ + #define __Header_endtype__ + +-#include //for debugging only ++#include ++using namespace std; //for debugging only + + typedef enum { NoEndian, LittleEndian, BigEndian, ByteEndian } Endian; + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/errclass.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/errclass.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/errclass.h 2008-09-04 16:39:41.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/errclass.h 2008-12-16 11:01:13.596258000 +0100 +@@ -1,14 +1,16 @@ + #ifndef __Header_errclass__ + #define __Header_errclass__ + +-#include ++#include ++#include ++using namespace std; + + class ErrorsInClass { + private: + char * errorstring; + protected: + bool good_flag; +- ostrstream errorstream; ++ ostringstream errorstream; + public: + ErrorsInClass(void) + { +@@ -19,15 +21,16 @@ + + ~ErrorsInClass() + { +- if (errorstring) delete[] errorstring; ++ //if (errorstring) delete[] errorstring; ++ if (errorstring) free(errorstring); + } + + bool good(void) { return good_flag; } + + const char * errors(void) + { +- errorstream << ends; +- errorstring=errorstream.str(); ++ errorstream; // << ends; ++ errorstring=strdup(errorstream.str().c_str()); + return errorstring ? errorstring : ""; + } + }; +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/ntstream.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/ntstream.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/ntstream.h 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/ntstream.h 2008-12-16 10:43:36.569891000 +0100 +@@ -2,7 +2,8 @@ + #ifndef __Header_nstream__ + #define __Header_nstream__ + +-#include ++#include ++using namespace std; + + class netbuf: public streambuf { + protected: +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/txstream.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/txstream.h +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/txstream.h 2005-02-26 14:50:12.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/txstream.h 2008-12-16 10:43:36.576893000 +0100 +@@ -1,8 +1,9 @@ + #ifndef __Header_txstream__ + #define __Header_txstream__ + +-#include +-#include ++#include ++using namespace std; ++#include + + class TextOutputStream : public ostream { + public: +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdargb.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdargb.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdargb.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdargb.cc 2008-12-16 10:43:36.915745000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "attr.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdcmyk.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdcmyk.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdcmyk.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdcmyk.cc 2008-12-16 10:43:36.918745000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc 2008-12-16 10:43:36.922738000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc.postsignextend dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc.postsignextend +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc.postsignextend 2008-12-16 10:43:36.926734000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdhsv.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdhsv.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdhsv.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdhsv.cc 2008-12-16 10:43:36.929733000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc 2002-09-02 16:30:42.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc 2008-12-16 10:43:36.934726000 +0100 +@@ -1,5 +1,6 @@ +-#include +-#include ++#include ++using namespace std; ++#include + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc.postsignextend dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc.postsignextend +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc.postsignextend 2008-12-16 10:43:36.939721000 +0100 +@@ -1,5 +1,6 @@ +-#include +-#include ++#include ++using namespace std; ++#include + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdindex.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdindex.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdindex.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdindex.cc 2008-12-16 10:43:36.943718000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "attr.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdrgb.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdrgb.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdrgb.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdrgb.cc 2008-12-16 10:43:36.947713000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "srcsink.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc 2007-10-02 15:10:45.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc 2008-12-16 10:43:36.951709000 +0100 +@@ -1,5 +1,6 @@ +-#include // only for debugging +-#include // only for debugging ++#include ++using namespace std; // only for debugging ++#include // only for debugging + + #include "basetype.h" + #include "usegray.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc.signedwork dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc.signedwork +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc.signedwork 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc.signedwork 2008-12-16 10:43:36.955705000 +0100 +@@ -1,5 +1,6 @@ +-#include // only for debugging +-#include // only for debugging ++#include ++using namespace std; // only for debugging ++#include // only for debugging + + #include "basetype.h" + #include "usegray.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gaw/gawmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gaw/gawmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gaw/gawmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gaw/gawmpln.cc 2008-12-16 10:43:37.100560000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "gawdc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gen/genmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gen/genmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gen/genmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gen/genmpln.cc 2008-12-16 10:43:37.275385000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "gendc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/himr/himrmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/himr/himrmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/himr/himrmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/himr/himrmpln.cc 2008-12-16 10:43:37.454210000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "himrdc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnhdrc.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnhdrc.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnhdrc.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnhdrc.cc 2008-12-16 10:43:37.653211000 +0100 +@@ -1,4 +1,5 @@ +-//#include // for debugging only ++//#include ++using namespace std; // for debugging only + + #include "ptyhdr.h" + #include "imtnptrs.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnmpln.cc 2008-12-16 10:43:37.668210000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "imtndc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pace/pacempln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pace/pacempln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pace/pacempln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pace/pacempln.cc 2008-12-16 10:43:37.823158000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "pacedc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pq/pqmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pq/pqmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pq/pqmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pq/pqmpln.cc 2008-12-16 10:43:37.976005000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "pqdc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimhdrc.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimhdrc.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimhdrc.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimhdrc.cc 2008-12-16 10:43:38.082898000 +0100 +@@ -1,4 +1,5 @@ +-//#include // for debugging only ++//#include ++using namespace std; // for debugging only + + #include "ptyhdr.h" + #include "shimptrs.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimmpln.cc 2008-12-16 10:43:38.097883000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "shimdc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/signa/sgnmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/signa/sgnmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/signa/sgnmpln.cc 2007-11-25 17:26:09.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/signa/sgnmpln.cc 2008-12-16 10:43:38.228752000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "sgndc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/somp/sompmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/somp/sompmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/somp/sompmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/somp/sompmpln.cc 2008-12-16 10:43:38.386594000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "sompdc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/xxxx/xxxxmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/xxxx/xxxxmpln.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/xxxx/xxxxmpln.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/xxxx/xxxxmpln.cc 2008-12-16 10:43:38.617530000 +0100 +@@ -1,5 +1,6 @@ +-//#include +-//#include ++//#include ++using namespace std; ++//#include + + #include "xxxxdc.h" + #include "elmconst.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/binval.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/binval.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/binval.cc 2004-11-24 19:29:25.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/binval.cc 2008-12-16 10:43:38.708534000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "basetype.h" + #include "binvalc.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/charset.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/charset.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/charset.cc 2008-09-08 20:58:40.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/charset.cc 2008-12-16 10:43:38.712530000 +0100 +@@ -1,6 +1,7 @@ + #include +-//#include // for cerr +-//#include // for cerr ++//#include ++using namespace std; // for cerr ++//#include // for cerr + + #include "charset.h" + #include "attr.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopti.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopti.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopti.cc 2007-03-16 03:00:21.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopti.cc 2008-12-16 10:43:38.724530000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "basetype.h" + #include "dcopt.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopto.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopto.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopto.cc 2007-03-06 20:20:20.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopto.cc 2008-12-16 10:43:38.728530000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "attr.h" + #include "attrlist.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/tagval.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/tagval.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/tagval.cc 2004-11-24 19:29:25.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/tagval.cc 2008-12-16 10:43:38.810492000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "basetype.h" + #include "tagvalc.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/transyn.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/transyn.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/transyn.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/transyn.cc 2008-12-16 10:43:38.813491000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "transyn.h" + #include "transynd.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/uidgen.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/uidgen.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/uidgen.cc 2006-10-22 00:03:44.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/uidgen.cc 2008-12-16 11:00:07.251460000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #ifdef CRAP + #include +@@ -117,7 +117,8 @@ + + GeneratedUID::~GeneratedUID() + { +- if (string) delete[] string; ++ //if (string) delete[] string; ++ if (string) free(string); + } + + GeneratedUID::operator char *(void) +@@ -129,8 +130,9 @@ + ost << stamp; + else + ost << (unsigned long)time(0) << "." << (unsigned long)getpid () << "." << (unsigned long)gethostid(); +- ost << ends; ++ //ost << ends; + +- return string=ost.str(); ++ string = strdup( ost.str().c_str() ); ++ return string; + } + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopti.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopti.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopti.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopti.cc 2008-12-16 10:43:39.508851000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "basetype.h" + #include "endtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopto.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopto.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopto.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopto.cc 2008-12-16 10:43:39.512850000 +0100 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "basetype.h" + #include "endtype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/datetype.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/datetype.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/datetype.cc 2006-10-10 23:09:22.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/datetype.cc 2008-12-16 10:43:39.517850000 +0100 +@@ -1,5 +1,6 @@ + #include +-//#include // For debugging only ++//#include ++using namespace std; // For debugging only + + #include "basetype.h" + #include "datetype.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/getoptns.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/getoptns.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/getoptns.cc 2007-11-10 15:29:41.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/getoptns.cc 2008-12-16 10:56:15.435028000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + #include + #include + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopti.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopti.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopti.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopti.cc 2008-12-16 10:56:39.768453000 +0100 +@@ -1,4 +1,5 @@ +-#include ++#include ++using namespace std; + + #include "basetype.h" + #include "ioopt.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopto.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopto.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopto.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopto.cc 2008-12-16 10:57:40.353338000 +0100 +@@ -1,4 +1,6 @@ +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + #include "ioopt.h" +@@ -24,7 +26,7 @@ + char * + OutputOptions::usage(void) + { +- ostrstream ostr; ++ ostringstream ostr; + const char **ptr; + const char *lead; + +@@ -33,10 +35,10 @@ + ostr << lead << "-" << *ptr; + ostr << " " << MMsgDC(OutputFile) << "]"; + +- ostr << ends; ++ //ostr << ends; + + // string deletion becomes callers responsibility ... +- return ostr.str(); ++ return strdup(ostr.str().c_str()); + } + + void +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/locale/mesgtext.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/locale/mesgtext.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/locale/mesgtext.cc 2004-11-24 19:29:25.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/locale/mesgtext.cc 2008-12-16 10:55:51.298479000 +0100 +@@ -1,5 +1,7 @@ + #include +-#include ++#include ++#include ++using namespace std; + + #include "basetype.h" + #include "mesgtext.h" +@@ -35,28 +37,28 @@ + char * + EMSGDC_Class::error(const char *index) + { +- ostrstream stream; ++ ostringstream stream; + stream << findDescription("Error") << " - "; +- if (index && strlen(index)) stream << findDescription(index) << ends; +- return stream.str(); ++ if (index && strlen(index)) stream << findDescription(index); // << ends; ++ return strdup(stream.str().c_str()); + } + + char * + EMSGDC_Class::warning(const char *index) + { +- ostrstream stream; ++ ostringstream stream; + stream << findDescription("Warning") << " - "; +- if (index && strlen(index)) stream << findDescription(index) << ends; +- return stream.str(); ++ if (index && strlen(index)) stream << findDescription(index); // << ends; ++ return strdup(stream.str().c_str()); + } + + char * + EMSGDC_Class::abort(const char *index) + { +- ostrstream stream; ++ ostringstream stream; + stream << findDescription("Abort") << " - "; +- if (index && strlen(index)) stream << findDescription(index) << ends; +- return stream.str(); ++ if (index && strlen(index)) stream << findDescription(index); // << ends; ++ return strdup(stream.str().c_str()); + } + + const char * +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/ourdisp/ourdisp.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/ourdisp/ourdisp.cc +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/ourdisp/ourdisp.cc 2004-11-24 19:29:25.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/src/ourdisp/ourdisp.cc 2008-12-16 10:43:39.635850000 +0100 +@@ -1,5 +1,6 @@ +-#include +-#include ++#include ++using namespace std; ++#include + + #include "basetype.h" + #include "errclass.h" +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/binval.awk dicom3tools_1.00.snapshot.20081122/libsrc/support/binval.awk +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/binval.awk 2002-06-20 17:23:25.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/support/binval.awk 2008-12-16 11:07:57.427834000 +0100 +@@ -13,6 +13,8 @@ + print "" + + if (role == "declare" || role == "define") { ++ print "#include " ++ print "using namespace std;" + print "#ifndef __Header_" outname "__" + print "#define __Header_" outname "__" + print "" +@@ -40,7 +42,7 @@ + print "BinaryBitMapDescription_" name "(Uint16 value)" + print "{" + print "\tUint16 validmask=0;" +- print "\tostrstream ost;" ++ print "\tostringstream ost;" + } + + } +@@ -59,7 +61,7 @@ + print "char *" + print "BinaryValueDescription_" name "(Uint16 value)" + print "{" +- print "\tostrstream ost;" ++ print "\tostringstream ost;" + print "\tswitch (value) {" + } + +@@ -89,8 +91,8 @@ + + if (role == "define") { + print "\t\tcase " code ":" +- print "\t\t\tost << \"" meaning "\" << ends;" +- print "\t\t\treturn ost.str();" ++ print "\t\t\tost << \"" meaning "\" /*<< ends*/;" ++ print "\t\t\treturn strdup(ost.str().c_str());" + } + } + else if (mode == "bitmap") { +@@ -156,7 +158,7 @@ + print "\t{" + print "\t\tvalidmask|=(1<<" bitnumber ");" + print "\t\tUint16 bitvalue=value&(1<<" bitnumber ");" +- print "\t\tost << \"" meaning "(\" << (bitvalue ? \"" truevalue "\" : \"" falsevalue "\") << \") \" << ends;" ++ print "\t\tost << \"" meaning "(\" << (bitvalue ? \"" truevalue "\" : \"" falsevalue "\") << \") \" /*<< ends*/;" + print "\t}" + } + } +@@ -171,7 +173,7 @@ + print "\tif (value&~validmask)" + print "\t\treturn 0;" + print "\telse" +- print "\t\treturn ost.str();" ++ print "\t\treturn strdup(ost.str().c_str());" + print "}" + print "" + } +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/tagval.awk dicom3tools_1.00.snapshot.20081122/libsrc/support/tagval.awk +--- dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/tagval.awk 2002-06-20 17:23:25.000000000 +0200 ++++ dicom3tools_1.00.snapshot.20081122/libsrc/support/tagval.awk 2008-12-16 11:08:53.226942000 +0100 +@@ -11,6 +11,8 @@ + print "" + + if (role == "declare" || role == "define") { ++ print "#include " ++ print "using namespace std;" + print "#ifndef __Header_" outname "__" + print "#define __Header_" outname "__" + print "" +@@ -36,7 +38,7 @@ + print "char *" + print "TagValueDescription_" name "(Uint16 group,Uint16 element)" + print "{" +- print "\tostrstream ost;" ++ print "\tostringstream ost;" + print "\tUint32 value=(((Uint32)group)<<16)|(Uint32)element;" + print "\tswitch (value) {" + } +@@ -82,8 +84,8 @@ + else { + if (role == "define") { + print "\t\tcase (((Uint32)" group ")<<16)|(Uint32)" element" :" +- print "\t\t\tost << \"" meaning "\" << ends;" +- print "\t\t\treturn ost.str();" ++ print "\t\t\tost << \"" meaning "\" /*<< ends*/;" ++ print "\t\t\treturn strdup(ost.str().c_str());" + } + } + +diff -u -r dicom3tools_1.00.snapshot.20081122.orig/support/mktime.cc dicom3tools_1.00.snapshot.20081122/support/mktime.cc +--- dicom3tools_1.00.snapshot.20081122.orig/support/mktime.cc 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools_1.00.snapshot.20081122/support/mktime.cc 2008-12-16 10:43:40.335288000 +0100 +@@ -1,5 +1,6 @@ + #include +-#include ++#include ++using namespace std; + #include + #include + +diff -ru orig/dicom3tools-1.0~20091217/libsrc/src/dctool/attrmxrd.cc patch/dicom3tools-1.0~20091217/libsrc/src/dctool/attrmxrd.cc +--- dicom3tools-1.0~20091217.orig/libsrc/src/dctool/attrmxrd.cc 2009-07-10 01:38:20.000000000 +0200 ++++ dicom3tools-1.0~20091217/libsrc/src/dctool/attrmxrd.cc 2009-12-28 14:39:36.000000000 +0100 +@@ -6,6 +6,7 @@ + #include "attrothr.h" + #include "attrval.h" + #include "mesgtext.h" ++#include // EOF + + // This may be defined in attrtype.h previously ... + +diff -ru orig/dicom3tools-1.0~20091217/appsrc/dcfile/dcfile.cc patch/dicom3tools-1.0~20091217/appsrc/dcfile/dcfile.cc +--- dicom3tools-1.0~20091217.orig/appsrc/dcfile/dcfile.cc 2007-03-06 20:20:19.000000000 +0100 ++++ dicom3tools-1.0~20091217/appsrc/dcfile/dcfile.cc 2009-12-28 15:48:14.000000000 +0100 +@@ -7,6 +7,7 @@ + #include "attrval.h" + #include "elmconst.h" + #include "transynd.h" ++#include + + static bool + isOtherByteOrWordVR(const char *vr)