[med-svn] r4480 - trunk/packages/dicom3tools/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-12-28 15:14:35 +0000 (Mon, 28 Dec 2009)
New Revision: 4480

Modified:
   trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch
Log:
fix all compilation errors

Modified: trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch	2009-12-28 14:09:54 UTC (rev 4479)
+++ trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch	2009-12-28 15:14:35 UTC (rev 4480)
@@ -11,10 +11,11 @@
 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 @@
+@@ -1,5 +1,7 @@
 -#include <iostream.h>
 -#include <iomanip.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
 +#include <iomanip>
  #include <string.h>
@@ -35,10 +36,11 @@
 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 @@
+@@ -1,5 +1,7 @@
 -#include <iostream.h>
 -#include <iomanip.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
 +#include <iomanip>
  #include <string.h>
@@ -47,9 +49,10 @@
 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 @@
+@@ -1,4 +1,5 @@
 -#include <fstream.h>
 +#include <fstream>
++#include <stdio.h>
  #include <ctype.h>
  
  #include "attrmxls.h"
@@ -1090,3 +1093,14 @@
  
  // 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 <stdio.h>
+ 
+ static bool
+ isOtherByteOrWordVR(const char *vr)