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

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-12-28 14:09:54 +0000 (Mon, 28 Dec 2009)
New Revision: 4479

Modified:
   trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch
Log:
Some compilation issues

Modified: trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch	2009-12-27 14:31:28 UTC (rev 4478)
+++ trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch	2009-12-28 14:09:54 UTC (rev 4479)
@@ -267,9 +267,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -277,9 +278,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -287,9 +289,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -297,9 +300,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -307,9 +311,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -317,9 +322,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -327,9 +333,10 @@
 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 @@
+@@ -1,4 +1,6 @@
 -#include <iostream.h>
 +#include <iostream>
++#include <stdio.h>
 +using namespace std;
  
  #include "basetype.h"
@@ -1072,3 +1079,14 @@
  #include <assert.h>
  #include <stdlib.h>
  
+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 <stdio.h> // EOF
+ 
+ // This may be defined in attrtype.h previously ...
+