[med-svn] r2802 - trunk/packages/dicom3tools/debian/patches
malat-guest at alioth.debian.org
malat-guest at alioth.debian.org
Tue Dec 16 10:26:24 UTC 2008
Author: malat-guest
Date: 2008-12-16 10:26:23 +0000 (Tue, 16 Dec 2008)
New Revision: 2802
Modified:
trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch
Log:
adding patch for gcc 4.3
Modified: trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch
===================================================================
--- trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch 2008-12-16 08:37:30 UTC (rev 2801)
+++ trunk/packages/dicom3tools/debian/patches/20_gcc4.3.patch 2008-12-16 10:26:23 UTC (rev 2802)
@@ -1,192 +1,1074 @@
---- dicom3tools-1.0~20081122.orig/libsrc/include/generic/txstream.h
-+++ dicom3tools-1.0~20081122/libsrc/include/generic/txstream.h
-@@ -1,8 +1,8 @@
- #ifndef __Header_txstream__
- #define __Header_txstream__
+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 <iostream.h>/#include <iostream>\nusing namespace std;/g' {} \;
+find . -type f -exec sed -i -e 's/#include <iomanip.h>/#include <iomanip>/g' {} \;
+find . -type f -exec sed -i -e 's/#include <fstream.h>/#include <fstream>/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,6 @@
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
+ #include <string.h>
+ #include <ctype.h>
+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 <iostream.h>
-#include <iomanip.h>
+#include <iostream>
++using namespace std;
+#include <iomanip>
+ #include <string.h>
+ #include <ctype.h>
- class TextOutputStream : public ostream {
- public:
---- dicom3tools-1.0~20081122.orig/libsrc/include/generic/bnstream.h
-+++ dicom3tools-1.0~20081122/libsrc/include/generic/bnstream.h
-@@ -1,8 +1,8 @@
- #ifndef __Header_bnstream__
- #define __Header_bnstream__
+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,6 @@
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
+ #include <string.h>
+ #include <ctype.h>
+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,4 @@
+-#include <fstream.h>
++#include <fstream>
+ #include <ctype.h>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+ //#include <time.h>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+ #include <ctype.h>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <iostream.h>
--//#include <iomanip.h>
+-#include <iomanip.h>
+#include <iostream>
-+//#include <iomanip>
++using namespace std;
++#include <iomanip>
+ #include <string.h>
+ #include <ctype.h>
+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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++using namespace std;
++#include <fstream>
+ #include <assert.h>
+ #include <string.h>
+ #include <stdlib.h> // 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 <iostream.h> // for listsimp.h
+-#include <iomanip.h> // for listsimp.h
+-#include <fstream.h>
++#include <iostream>
++using namespace std; // for listsimp.h
++#include <iomanip> // for listsimp.h
++#include <fstream>
+ #include <stdlib.h> // for atoi()
+ #include <string.h> // for strlen()
+ #include <ctype.h> // 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 <iostream.h>
++#include <iostream>
++using namespace std;
+
#include "basetype.h"
- #include "endtype.h"
---- dicom3tools-1.0~20081122.orig/libsrc/include/dconvert/planev.h
-+++ dicom3tools-1.0~20081122/libsrc/include/dconvert/planev.h
-@@ -4,8 +4,8 @@
+ #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 <iostream.h>
++#include <iostream>
++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 <fstream.h>
+-#include <iomanip.h>
++#include <fstream>
++#include <iomanip>
++#include <iostream>
++using namespace std;
+ #include <stdlib.h> // for atoi()
+ #include <ctype.h>
+ #include <string.h>
+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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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 <fstream.h>
++#include <fstream>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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,5 @@
+-#include <iostream.h>
++#include <iostream>
++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 <iostream.h>
-#include <iomanip.h>
+#include <iostream>
++using namespace std;
+#include <iomanip>
#endif
#include <math.h>
---- dicom3tools-1.0~20081122.orig/libsrc/include/dconvert/ptyhdr.h
-+++ dicom3tools-1.0~20081122/libsrc/include/dconvert/ptyhdr.h
-@@ -1,7 +1,7 @@
+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 <iostream.h>
+#include <iostream>
++using namespace std;
#include "basetype.h"
#include "convtype.h"
---- dicom3tools-1.0~20081122.orig/libsrc/include/generic/endtype.h
-+++ dicom3tools-1.0~20081122/libsrc/include/generic/endtype.h
-@@ -1,7 +1,7 @@
+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 <sstream>
++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 <iostream.h>
+-//#include <iomanip.h>
++#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h> //for debugging only
-+#include <iostream> //for debugging only
++#include <iostream>
++using namespace std; //for debugging only
typedef enum { NoEndian, LittleEndian, BigEndian, ByteEndian } Endian;
---- dicom3tools-1.0~20081122.orig/libsrc/include/generic/ntstream.h
-+++ dicom3tools-1.0~20081122/libsrc/include/generic/ntstream.h
-@@ -2,7 +2,7 @@
+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 <iomanip.h>
++#include <iomanip>
++#include <sstream>
++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 <iostream.h>
+#include <iostream>
++using namespace std;
class netbuf: public streambuf {
protected:
---- dicom3tools-1.0~20081122.orig/libsrc/include/generic/errclass.h
-+++ dicom3tools-1.0~20081122/libsrc/include/generic/errclass.h
-@@ -1,7 +1,7 @@
- #ifndef __Header_errclass__
- #define __Header_errclass__
+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 <iostream.h>
-#include <iomanip.h>
++#include <iostream>
++using namespace std;
+#include <iomanip>
- class ErrorsInClass {
- private:
---- dicom3tools-1.0~20081122.orig/libsrc/src/dcdisp/rdimage.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/dcdisp/rdimage.cc
-@@ -1,5 +1,5 @@
+ 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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
-#include <iomanip.h>
+#include <iostream>
++using namespace std;
+#include <iomanip>
#include "basetype.h"
#include "srcsink.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/dcdisp/usegray.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/dcdisp/usegray.cc
-@@ -1,5 +1,5 @@
+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 <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
+
+ #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 <iostream.h>
++#include <iostream>
++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 <iostream.h>
++#include <iostream>
++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 <iostream.h> // only for debugging
-#include <iomanip.h> // only for debugging
-+#include <iostream> // only for debugging
++#include <iostream>
++using namespace std; // only for debugging
+#include <iomanip> // only for debugging
#include "basetype.h"
#include "usegray.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/binval.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/dctool/binval.cc
+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 <iostream.h> // only for debugging
+-#include <iomanip.h> // only for debugging
++#include <iostream>
++using namespace std; // only for debugging
++#include <iomanip> // 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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h> // for debugging only
++//#include <iostream>
++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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h> // for debugging only
++//#include <iostream>
++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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iostream.h>
+-//#include <iomanip.h>
++//#include <iostream>
++using namespace std;
++//#include <iomanip>
+
+ #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 <iomanip.h>
+#include <iomanip>
#include "basetype.h"
#include "binvalc.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/charset.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/dctool/charset.cc
-@@ -1,6 +1,6 @@
--#include <string.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 <string.h>
-//#include <iostream.h> // for cerr
-//#include <iomanip.h> // for cerr
-+#include <string>
-+//#include <iostream> // for cerr
++//#include <iostream>
++using namespace std; // for cerr
+//#include <iomanip> // for cerr
#include "charset.h"
#include "attr.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/uidgen.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/dctool/uidgen.cc
-@@ -1,18 +1,18 @@
+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 <fstream.h>
++#include <fstream>
+
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <iomanip.h>
+#include <iomanip>
- #ifdef CRAP
--#include <time.h>
-+#include <time>
+ #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 <iostream.h>
++#include <iostream>
++using namespace std;
- #ifdef __MWERKS__
--#include <time.h>
-+#include <time>
- #else /* __MWERKS__ */
- #ifdef __SC__
--#include <types.h>
--#include <time.h>
-+#include <types>
-+#include <time>
- #else /* __SC__ */
--#include <sys/types.h>
--#include <sys/time.h>
--#include <unistd.h>
-+#include <sys/types>
-+#include <sys/time>
-+#include <unistd>
- //long gethostid(void);
- #endif /* __SC__ */
- #endif /* __MWERKS__ */
---- dicom3tools-1.0~20081122.orig/libsrc/src/dctool/tagval.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/dctool/tagval.cc
+ #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 <iomanip.h>
+#include <iomanip>
+ #ifdef CRAP
+ #include <time.h>
+@@ -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=ost.str();
+ }
+
+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 <fstream.h>
++#include <fstream>
+
#include "basetype.h"
- #include "tagvalc.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/generic/getoptns.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/generic/getoptns.cc
-@@ -1,6 +1,6 @@
+ #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 <fstream.h>
++#include <fstream>
+
+ #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 <ctype.h>
+-//#include <iostream.h> // For debugging only
++//#include <iostream>
++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 <iomanip.h>
--#include <ctype.h>
--#include <string.h>
+#include <iomanip>
-+#include <ctype>
-+#include <string>
++using namespace std;
+ #include <ctype.h>
+ #include <string.h>
+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 <fstream.h>
++#include <fstream>
++using namespace std;
+
#include "basetype.h"
- #include "getoptns.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/locale/mesgtext.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/locale/mesgtext.cc
-@@ -1,5 +1,5 @@
--#include <string.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 <fstream.h>
++#include <fstream>
++#include <sstream>
++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 <string.h>
-#include <iomanip.h>
-+#include <string>
+#include <iomanip>
++#include <sstream>
++using namespace std;
#include "basetype.h"
#include "mesgtext.h"
---- dicom3tools-1.0~20081122.orig/libsrc/src/ourdisp/ourdisp.cc
-+++ dicom3tools-1.0~20081122/libsrc/src/ourdisp/ourdisp.cc
-@@ -1,5 +1,5 @@
+@@ -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 <iostream.h>
-#include <iomanip.h>
+#include <iostream>
++using namespace std;
+#include <iomanip>
#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 <sstream>"
++ 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 <sstream>"
++ 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 <time.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <assert.h>
+ #include <stdlib.h>
+
More information about the debian-med-commit
mailing list