1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
--- src/ps/pfb2pfa.cc.orig Fri Oct 31 20:57:37 2003
+++ src/ps/pfb2pfa.cc Sun Nov 2 11:47:20 2003
@@ -4,8 +4,8 @@
#include "encode.h"
void PS::pfb2pfa(std::istream &in, std::ostream &out) {
- in.exceptions(std::ios_base::eofbit); // throw exception on eof
- try {
+// in.exceptions(std::ios_base::eofbit); // throw exception on eof
+// try {
while(in) { // parse header
if (in.peek() != 128)
throw std::runtime_error("bad magic number for segment");
@@ -40,9 +40,9 @@
filter.end();
}
}
- } catch (std::ios_base::failure) {
- throw std::runtime_error("unexpected end of file");
- }
+// } catch (std::ios::failure) {
+// throw std::runtime_error("unexpected end of file");
+// }
}
#ifdef PFB2PFA_STANDALONE
--- src/pptout/docview.cc.orig Sun Nov 2 11:56:40 2003
+++ src/pptout/docview.cc Sun Nov 2 12:04:37 2003
@@ -467,7 +467,7 @@
void Document_View::on_clipboard_clear() {
// not really necessary
- clip.clear();
+ clip.resize(0);
}
void Document_View::cut() {
--- src/util/filesys.h.orig Fri Sep 19 16:46:08 2003
+++ src/util/filesys.h Thu Dec 4 03:59:31 2003
@@ -4,7 +4,8 @@
// Copyright (C) 2002, 2003, Fredrik Arnerup & Rasmus Kaj, See COPYING
///
#include <string>
-#include <ios> // mode for access
+//#include <ios> // mode for access
+#include <iostream>
#include <stdexcept>
/**
--- src/fonts/fontmetrics.cc.orig Thu Dec 4 04:08:47 2003
+++ src/fonts/fontmetrics.cc Thu Dec 4 10:06:36 2003
@@ -109,7 +109,8 @@
cerr << " found " << ch << "!\n";
#endif
}
- source.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+// source.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+ source.ignore(UINT_MAX,'\n');
}
}
--- src/util/stringutil.cc.orig Sat Jan 17 23:00:21 2004
+++ src/util/stringutil.cc Sat Jan 17 23:03:14 2004
@@ -18,7 +18,7 @@
bool whitespace(char c)
{
- return std::isspace(c);
+ return isspace(c);
}
std::string strip_whitespace(std::string s, bool front, bool back)
--- src/util/cmdline.cc.orig Mon Jan 12 14:01:33 2004
+++ src/util/cmdline.cc Sun Jan 18 00:06:17 2004
@@ -75,7 +75,7 @@
// end of arguments
if(argi == arguments.end())
- return std::make_pair(null_option, "");
+ return std::make_pair(null_option, std::string());
// not an option
if(argi->at(0) != '-' || seen_double_dash || *argi == "-")
@@ -146,7 +146,7 @@
break;
}
} else { // not REQ_PARAM
- arg_queue.push(std::make_pair(option->id, ""));
+ arg_queue.push(std::make_pair(option->id, std::string()));
}
}
argi++;
|
