Contents of /trunk/libemf/patches/libEMF-1.0-gcc3.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2429 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2429 byte(s)
-import
1 | diff -ru libEMF-1.0/libemf/libemf.cpp libEMF-1.0-new/libemf/libemf.cpp |
2 | --- libEMF-1.0/libemf/libemf.cpp 2002-01-29 04:37:54.000000000 +0100 |
3 | +++ libEMF-1.0-new/libemf/libemf.cpp 2002-11-20 19:03:37.000000000 +0100 |
4 | @@ -48,7 +48,7 @@ |
5 | be32 = !be16; |
6 | |
7 | if ( be32 != be16 ) { |
8 | - cerr << "endian-ness not consistent between short's and int's!" << endl; |
9 | + std::cerr << "endian-ness not consistent between short's and int's!" << std::endl; |
10 | ::abort(); |
11 | } |
12 | |
13 | @@ -849,7 +849,7 @@ |
14 | if ( dc->fp ) { |
15 | |
16 | std::for_each( dc->records.begin(), dc->records.end(), |
17 | - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), |
18 | + std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), |
19 | dc->ds ) ); |
20 | fclose( dc->fp ); |
21 | |
22 | @@ -896,7 +896,7 @@ |
23 | if ( dc->fp ) { |
24 | |
25 | std::for_each( dc->records.begin(), dc->records.end(), |
26 | - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), |
27 | + std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), |
28 | dc->ds ) ); |
29 | } |
30 | |
31 | @@ -1032,7 +1032,7 @@ |
32 | if ( feof( fp ) ) break; |
33 | |
34 | if ( emr.nSize == 0 ) { |
35 | - cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << endl; |
36 | + std::cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << std::endl; |
37 | fclose( fp ); |
38 | return 0; |
39 | } |
40 | @@ -1050,8 +1050,8 @@ |
41 | dc->appendRecord( record ); |
42 | } |
43 | else |
44 | - cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType |
45 | - << " of size " << emr.nSize << endl; |
46 | + std::cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType |
47 | + << " of size " << emr.nSize << std::endl; |
48 | |
49 | // Regardless, position ourselves at the next record. |
50 | fseek( fp, next_position, SEEK_SET ); |
51 | @@ -1108,7 +1108,7 @@ |
52 | if ( dc == 0 ) return; |
53 | |
54 | std::for_each( dc->records.begin(), dc->records.end(), |
55 | - std::mem_fun( &EMF::METARECORD::edit ) ); |
56 | + mem_fun( &EMF::METARECORD::edit ) ); |
57 | #endif /* ENABLE_EDITING */ |
58 | } |
59 | |
60 | diff -ru libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h |
61 | --- libEMF-1.0.orig/libemf/libemf.h 2002-01-29 05:54:27.000000000 +0100 |
62 | +++ libEMF-1.0/libemf/libemf.h 2002-11-20 19:08:00.000000000 +0100 |
63 | @@ -21,10 +21,12 @@ |
64 | #ifndef _LIBEMF_H |
65 | #define _LIBEMF_H 1 |
66 | |
67 | +#include <iostream> |
68 | #include <cmath> |
69 | #include <vector> |
70 | #include <map> |
71 | #include <functional> |
72 | +#include <backward/function.h> |
73 | #include <algorithm> |
74 | |
75 | #include <config.h> |