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
|
diff -Nrua koffice-1.6.3/krita/core/kis_perspective_math.cpp koffice/krita/core/kis_perspective_math.cpp
--- koffice-1.6.3/krita/core/kis_perspective_math.cpp 2007-05-30 23:40:31.000000000 +0200
+++ koffice/krita/core/kis_perspective_math.cpp 2008-03-12 00:56:21.000000000 +0100
@@ -24,7 +24,7 @@
#if 1
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
#include <math.h>
//#define NDEBUG // uncomment to remove checking of assert()
@@ -57,9 +57,9 @@
void rprint()const; //print entries on a single line
void resize(int n);
int operator==(const vector<ElType>& v)const;
- friend vector<ElType> operator*(ElType c,vector<ElType>& v );
- friend vector<ElType> operator*(vector<ElType>& v,ElType c );
- friend ostream& operator<<(ostream& s,vector<ElType>& v);
+ friend vector<ElType> operator* (ElType c,vector<ElType>& v );
+ friend vector<ElType> operator*(vector<ElType>& v,ElType c );
+ friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
};
template <class ElType>
void vector<ElType>::zero()
@@ -129,10 +129,10 @@
void vector<ElType>::rprint()const //print entries on a single line
{
int i;
- cout << "VECTOR: ";
- cout << "(";
- for(i=0;i<len-1;i++) cout << data[i] << ",";
- cout << data[len-1] << ")" << endl;
+ std::cout << "VECTOR: ";
+ std::cout << "(";
+ for(i=0;i<len-1;i++) std::cout << data[i] << ",";
+ std::cout << data[len-1] << ")" << std::endl;
return;
}
template <class ElType>
@@ -164,7 +164,7 @@
return ans;
}
template <class ElType>
- ostream& operator<<(ostream& s,vector<ElType>& v)
+ std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
{
s << "(";
for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
@@ -192,7 +192,7 @@
matrix<ElType> operator-(const matrix<ElType>& a);
matrix<ElType> transpose();
//matrix<ElType> inverse();
- friend ostream& operator<<(ostream& s,matrix<ElType>& m);
+ friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
};
@@ -357,7 +357,7 @@
return ans;
}
template <class ElType>
- ostream& operator<<(ostream& s,matrix<ElType>& m)
+ std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
{
for(int i=0; i<m.rows;i++) s << m[i];
return s;
@@ -381,7 +381,7 @@
// kdDebug() << "new search" << endl;
for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
/* kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
- if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
+ if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
vv[i]=1.0/big;
}
for (j=0;j<n;j++)
|
GitWeb