Diffstat (limited to 'noncore/unsupported/qpdf/fixed.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/qpdf/fixed.h | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/noncore/unsupported/qpdf/fixed.h b/noncore/unsupported/qpdf/fixed.h index 111b95e..c912954 100644 --- a/noncore/unsupported/qpdf/fixed.h +++ b/noncore/unsupported/qpdf/fixed.h | |||
@@ -117,12 +117,16 @@ private: | |||
117 | friend bool operator < <> ( int i, const fixed &f ); | 117 | friend bool operator < <> ( int i, const fixed &f ); |
118 | friend bool operator > <> ( int i, const fixed &f ); | 118 | friend bool operator > <> ( int i, const fixed &f ); |
119 | friend bool operator <= <> ( int i, const fixed &f ); | 119 | friend bool operator <= <> ( int i, const fixed &f ); |
120 | friend bool operator >= <> ( int i, const fixed &f ); | 120 | friend bool operator >= <> ( int i, const fixed &f ); |
121 | friend bool operator == <> ( int i, const fixed &f ); | 121 | friend bool operator == <> ( int i, const fixed &f ); |
122 | friend bool operator != <> ( int i, const fixed &f ); | 122 | friend bool operator != <> ( int i, const fixed &f ); |
123 | |||
124 | friend long int lrint ( const fixed &f ); | ||
125 | friend fixed sqrt ( const fixed &f ); | ||
126 | friend fixed fabs ( const fixed &f ); | ||
123 | #endif | 127 | #endif |
124 | }; | 128 | }; |
125 | 129 | ||
126 | 130 | ||
127 | template <unsigned int SH> inline fixed<SH> operator + ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f( i ) + f. m_f, true ); } | 131 | template <unsigned int SH> inline fixed<SH> operator + ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f( i ) + f. m_f, true ); } |
128 | template <unsigned int SH> inline fixed<SH> operator - ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f( i ) - f. m_f, true ); } | 132 | template <unsigned int SH> inline fixed<SH> operator - ( int i, const fixed<SH> &f ) { return fixed<SH> ( fixed<SH>::i2f( i ) - f. m_f, true ); } |
@@ -146,21 +150,37 @@ template <unsigned int SH> inline bool operator < ( int i, const fixed<SH> &f ) | |||
146 | template <unsigned int SH> inline bool operator > ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) > f. m_f; } | 150 | template <unsigned int SH> inline bool operator > ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) > f. m_f; } |
147 | template <unsigned int SH> inline bool operator <= ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) <= f. m_f; } | 151 | template <unsigned int SH> inline bool operator <= ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) <= f. m_f; } |
148 | template <unsigned int SH> inline bool operator >= ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) >= f. m_f; } | 152 | template <unsigned int SH> inline bool operator >= ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) >= f. m_f; } |
149 | template <unsigned int SH> inline bool operator == ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) == f. m_f; } | 153 | template <unsigned int SH> inline bool operator == ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) == f. m_f; } |
150 | template <unsigned int SH> inline bool operator != ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) != f. m_f; } | 154 | template <unsigned int SH> inline bool operator != ( int i, const fixed<SH> &f ) { return fixed<SH>::i2f( i ) != f. m_f; } |
151 | 155 | ||
152 | 156 | template <unsigned int SH> inline long int lrint ( const fixed<SH> &f ) | |
153 | template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f ) | ||
154 | { | 157 | { |
155 | return fixed<SH> ( double( sqrt ( double( f )))); | 158 | return fixed<SH>::f2i (( f. m_f < 0 ) ? f. m_f - ( 1 << ( SH - 1 )) : f. m_f + ( 1 << ( SH - 1 ))); |
156 | } | 159 | } |
157 | 160 | ||
158 | template <unsigned int SH> inline fixed<SH> fabs ( const fixed<SH> &f ) | 161 | template <unsigned int SH> inline fixed<SH> fabs ( const fixed<SH> &f ) |
159 | { | 162 | { |
160 | return ( f < 0 ) ? -f : f; | 163 | return ( f. m_f < 0 ) ? fixed<SH> ( -f. m_f, true ) : f; |
164 | } | ||
165 | |||
166 | // roughly from QPE / qmath.h | ||
167 | template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f ) | ||
168 | { | ||
169 | if ( f. m_f <= 0 ) | ||
170 | return fixed<SH> ( 0, true ); | ||
171 | |||
172 | fixed<SH>::fix_t a0 = 0; | ||
173 | fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation | ||
174 | |||
175 | do { | ||
176 | a0 = a1; | ||
177 | a1 = ( a0 + fixed<SH>::div ( f. m_f, a0 )) >> 1; | ||
178 | } while ( abs ( fixed<SH>::div ( a1 - a0, a1 )) > 1 ); | ||
179 | |||
180 | return fixed<SH> ( a1, true ); | ||
161 | } | 181 | } |
162 | 182 | ||
163 | template <unsigned int SH> inline ostream &operator << ( ostream &o, const fixed<SH> &f ) | 183 | template <unsigned int SH> inline ostream &operator << ( ostream &o, const fixed<SH> &f ) |
164 | { | 184 | { |
165 | o << double( f ); | 185 | o << double( f ); |
166 | return o; | 186 | return o; |