]>
Commit | Line | Data |
---|---|---|
b9bab0f4 PS |
1 | --- OpenEXR-1.1.0/Imath/ImathEuler.h.orig 2004-02-04 23:12:12.000000000 +0100 |
2 | +++ OpenEXR-1.1.0/Imath/ImathEuler.h 2004-04-01 22:58:58.565948968 +0200 | |
3 | @@ -394,7 +394,7 @@ | |
4 | { | |
5 | setOrder(p); | |
6 | if ( l == XYZLayout ) setXYZVector(v); | |
7 | - else { x = v.x; y = v.y; z = v.z; } | |
8 | + else { this->x = v.x; this->y = v.y; this->z = v.z; } | |
9 | } | |
10 | ||
11 | template<class T> | |
12 | @@ -418,7 +418,7 @@ | |
13 | { | |
14 | setOrder(p); | |
15 | if ( l == XYZLayout ) setXYZVector(Vec3<T>(xi,yi,zi)); | |
16 | - else { x = xi; y = yi; z = zi; } | |
17 | + else { this->x = xi; this->y = yi; this->z = zi; } | |
18 | } | |
19 | ||
20 | template<class T> | |
21 | @@ -453,7 +453,7 @@ | |
22 | // Extract the first angle, x. | |
23 | // | |
24 | ||
25 | - x = Math<T>::atan2 (M[j][i], M[k][i]); | |
26 | + this->x = Math<T>::atan2 (M[j][i], M[k][i]); | |
27 | ||
28 | // | |
29 | // Remove the x rotation from M, so that the remaining | |
30 | @@ -462,7 +462,7 @@ | |
31 | // | |
32 | ||
33 | Vec3<T> r (0, 0, 0); | |
34 | - r[i] = (_parityEven? -x: x); | |
35 | + r[i] = (_parityEven? -(this->x): this->x); | |
36 | ||
37 | Matrix44<T> N; | |
38 | N.rotate (r); | |
39 | @@ -476,8 +476,8 @@ | |
40 | // | |
41 | ||
42 | T sy = Math<T>::sqrt (N[j][i]*N[j][i] + N[k][i]*N[k][i]); | |
43 | - y = Math<T>::atan2 (sy, N[i][i]); | |
44 | - z = Math<T>::atan2 (N[j][k], N[j][j]); | |
45 | + this->y = Math<T>::atan2 (sy, N[i][i]); | |
46 | + this->z = Math<T>::atan2 (N[j][k], N[j][j]); | |
47 | } | |
48 | else | |
49 | { | |
50 | @@ -485,7 +485,7 @@ | |
51 | // Extract the first angle, x. | |
52 | // | |
53 | ||
54 | - x = Math<T>::atan2 (M[j][k], M[k][k]); | |
55 | + this->x = Math<T>::atan2 (M[j][k], M[k][k]); | |
56 | ||
57 | // | |
58 | // Remove the x rotation from M, so that the remaining | |
59 | @@ -494,7 +494,7 @@ | |
60 | // | |
61 | ||
62 | Vec3<T> r (0, 0, 0); | |
63 | - r[i] = (_parityEven? -x: x); | |
64 | + r[i] = (_parityEven? -(this->x): this->x); | |
65 | ||
66 | Matrix44<T> N; | |
67 | N.rotate (r); | |
68 | @@ -508,8 +508,8 @@ | |
69 | // | |
70 | ||
71 | T cy = Math<T>::sqrt (N[i][i]*N[i][i] + N[i][j]*N[i][j]); | |
72 | - y = Math<T>::atan2 (-N[i][k], cy); | |
73 | - z = Math<T>::atan2 (-N[j][i], N[j][j]); | |
74 | + this->y = Math<T>::atan2 (-N[i][k], cy); | |
75 | + this->z = Math<T>::atan2 (-N[j][i], N[j][j]); | |
76 | } | |
77 | ||
78 | if (!_parityEven) | |
79 | @@ -517,9 +517,9 @@ | |
80 | ||
81 | if (!_frameStatic) | |
82 | { | |
83 | - T t = x; | |
84 | - x = z; | |
85 | - z = t; | |
86 | + T t = this->x; | |
87 | + this->x = this->z; | |
88 | + this->z = t; | |
89 | } | |
90 | } | |
91 | ||
92 | @@ -535,7 +535,7 @@ | |
93 | // Extract the first angle, x. | |
94 | // | |
95 | ||
96 | - x = Math<T>::atan2 (M[j][i], M[k][i]); | |
97 | + this->x = Math<T>::atan2 (M[j][i], M[k][i]); | |
98 | ||
99 | // | |
100 | // Remove the x rotation from M, so that the remaining | |
101 | @@ -544,7 +544,7 @@ | |
102 | // | |
103 | ||
104 | Vec3<T> r (0, 0, 0); | |
105 | - r[i] = (_parityEven? -x: x); | |
106 | + r[i] = (_parityEven? -(this->x): this->x); | |
107 | ||
108 | Matrix44<T> N; | |
109 | N.rotate (r); | |
110 | @@ -555,8 +555,8 @@ | |
111 | // | |
112 | ||
113 | T sy = Math<T>::sqrt (N[j][i]*N[j][i] + N[k][i]*N[k][i]); | |
114 | - y = Math<T>::atan2 (sy, N[i][i]); | |
115 | - z = Math<T>::atan2 (N[j][k], N[j][j]); | |
116 | + this->y = Math<T>::atan2 (sy, N[i][i]); | |
117 | + this->z = Math<T>::atan2 (N[j][k], N[j][j]); | |
118 | } | |
119 | else | |
120 | { | |
121 | @@ -564,7 +564,7 @@ | |
122 | // Extract the first angle, x. | |
123 | // | |
124 | ||
125 | - x = Math<T>::atan2 (M[j][k], M[k][k]); | |
126 | + this->x = Math<T>::atan2 (M[j][k], M[k][k]); | |
127 | ||
128 | // | |
129 | // Remove the x rotation from M, so that the remaining | |
130 | @@ -573,7 +573,7 @@ | |
131 | // | |
132 | ||
133 | Vec3<T> r (0, 0, 0); | |
134 | - r[i] = (_parityEven? -x: x); | |
135 | + r[i] = (_parityEven? -(this->x): this->x); | |
136 | ||
137 | Matrix44<T> N; | |
138 | N.rotate (r); | |
139 | @@ -584,8 +584,8 @@ | |
140 | // | |
141 | ||
142 | T cy = Math<T>::sqrt (N[i][i]*N[i][i] + N[i][j]*N[i][j]); | |
143 | - y = Math<T>::atan2 (-N[i][k], cy); | |
144 | - z = Math<T>::atan2 (-N[j][i], N[j][j]); | |
145 | + this->y = Math<T>::atan2 (-N[i][k], cy); | |
146 | + this->z = Math<T>::atan2 (-N[j][i], N[j][j]); | |
147 | } | |
148 | ||
149 | if (!_parityEven) | |
150 | @@ -593,9 +593,9 @@ | |
151 | ||
152 | if (!_frameStatic) | |
153 | { | |
154 | - T t = x; | |
155 | - x = z; | |
156 | - z = t; | |
157 | + T t = this->x; | |
158 | + this->x = this->z; | |
159 | + this->z = t; | |
160 | } | |
161 | } | |
162 | ||
163 | @@ -608,7 +608,7 @@ | |
164 | Vec3<T> angles; | |
165 | ||
166 | if ( _frameStatic ) angles = (*this); | |
167 | - else angles = Vec3<T>(z,y,x); | |
168 | + else angles = Vec3<T>(this->z, this->y, this->x); | |
169 | ||
170 | if ( !_parityEven ) angles *= -1.0; | |
171 | ||
172 | @@ -651,7 +651,7 @@ | |
173 | Vec3<T> angles; | |
174 | ||
175 | if ( _frameStatic ) angles = (*this); | |
176 | - else angles = Vec3<T>(z,y,x); | |
177 | + else angles = Vec3<T>(this->z, this->y, this->x); | |
178 | ||
179 | if ( !_parityEven ) angles *= -1.0; | |
180 | ||
181 | @@ -693,7 +693,7 @@ | |
182 | angleOrder(i,j,k); | |
183 | ||
184 | if ( _frameStatic ) angles = (*this); | |
185 | - else angles = Vec3<T>(z,y,x); | |
186 | + else angles = Vec3<T>(this->z, this->y, this->x); | |
187 | ||
188 | if ( !_parityEven ) angles.y = -angles.y; | |
189 | ||
190 | @@ -781,9 +781,9 @@ | |
191 | template<class T> | |
192 | const Euler<T>& Euler<T>::operator= (const Euler<T> &euler) | |
193 | { | |
194 | - x = euler.x; | |
195 | - y = euler.y; | |
196 | - z = euler.z; | |
197 | + this->x = euler.x; | |
198 | + this->y = euler.y; | |
199 | + this->z = euler.z; | |
200 | _initialAxis = euler._initialAxis; | |
201 | _frameStatic = euler._frameStatic; | |
202 | _parityEven = euler._parityEven; | |
203 | @@ -794,9 +794,9 @@ | |
204 | template<class T> | |
205 | const Euler<T>& Euler<T>::operator= (const Vec3<T> &v) | |
206 | { | |
207 | - x = v.x; | |
208 | - y = v.y; | |
209 | - z = v.z; | |
210 | + this->x = v.x; | |
211 | + this->y = v.y; | |
212 | + this->z = v.z; | |
213 | return *this; | |
214 | } | |
215 | ||
216 | --- OpenEXR-1.1.0/exrmakepreview/makePreview.cpp.orig 2004-02-07 01:43:40.000000000 +0100 | |
217 | +++ OpenEXR-1.1.0/exrmakepreview/makePreview.cpp 2004-04-01 23:02:42.341929848 +0200 | |
218 | @@ -82,7 +82,7 @@ | |
219 | if (x > 1) | |
220 | x = 1 + knee (x - 1, 0.184874f); | |
221 | ||
222 | - return (unsigned char) (clamp (pow (x, 0.4545f) * 84.66f, 0.f, 255.f)); | |
586128ce | 223 | + return (unsigned char) (clamp (pow (x, 0.4545f) * 84.66, 0.0, 255.0)); |
b9bab0f4 PS |
224 | } |
225 | ||
226 |