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
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; }
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; }
22 // Extract the first angle, x.
25 - x = Math<T>::atan2 (M[j][i], M[k][i]);
26 + this->x = Math<T>::atan2 (M[j][i], M[k][i]);
29 // Remove the x rotation from M, so that the remaining
34 - r[i] = (_parityEven? -x: x);
35 + r[i] = (_parityEven? -(this->x): this->x);
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]);
51 // Extract the first angle, x.
54 - x = Math<T>::atan2 (M[j][k], M[k][k]);
55 + this->x = Math<T>::atan2 (M[j][k], M[k][k]);
58 // Remove the x rotation from M, so that the remaining
63 - r[i] = (_parityEven? -x: x);
64 + r[i] = (_parityEven? -(this->x): this->x);
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]);
93 // Extract the first angle, x.
96 - x = Math<T>::atan2 (M[j][i], M[k][i]);
97 + this->x = Math<T>::atan2 (M[j][i], M[k][i]);
100 // Remove the x rotation from M, so that the remaining
105 - r[i] = (_parityEven? -x: x);
106 + r[i] = (_parityEven? -(this->x): this->x);
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]);
122 // Extract the first angle, x.
125 - x = Math<T>::atan2 (M[j][k], M[k][k]);
126 + this->x = Math<T>::atan2 (M[j][k], M[k][k]);
129 // Remove the x rotation from M, so that the remaining
134 - r[i] = (_parityEven? -x: x);
135 + r[i] = (_parityEven? -(this->x): this->x);
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]);
166 if ( _frameStatic ) angles = (*this);
167 - else angles = Vec3<T>(z,y,x);
168 + else angles = Vec3<T>(this->z, this->y, this->x);
170 if ( !_parityEven ) angles *= -1.0;
175 if ( _frameStatic ) angles = (*this);
176 - else angles = Vec3<T>(z,y,x);
177 + else angles = Vec3<T>(this->z, this->y, this->x);
179 if ( !_parityEven ) angles *= -1.0;
184 if ( _frameStatic ) angles = (*this);
185 - else angles = Vec3<T>(z,y,x);
186 + else angles = Vec3<T>(this->z, this->y, this->x);
188 if ( !_parityEven ) angles.y = -angles.y;
192 const Euler<T>& Euler<T>::operator= (const Euler<T> &euler)
200 _initialAxis = euler._initialAxis;
201 _frameStatic = euler._frameStatic;
202 _parityEven = euler._parityEven;
205 const Euler<T>& Euler<T>::operator= (const Vec3<T> &v)
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
220 x = 1 + knee (x - 1, 0.184874f);
222 - return (unsigned char) (clamp (pow (x, 0.4545f) * 84.66f, 0.f, 255.f));
223 + return (unsigned char) (clamp (pow (x, 0.4545f) * 84.66f, 0.0, 255.0));