generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

got rid of "long double" in OpenCV; ticket #1515

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-26 13:36:47 +00:00
parent 0186bd8099
commit 29077f11f8
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/libtiff/tif_aux.c vendored
View File

@ -325,8 +325,8 @@ _TIFFUInt64ToFloat(uint64 ui64)
if (i.part.high >= 0) { if (i.part.high >= 0) {
return (float)i.value; return (float)i.value;
} else { } else {
long double df; double df;
df = (long double)i.value; df = (double)i.value;
df += 18446744073709551616.0; /* adding 2**64 */ df += 18446744073709551616.0; /* adding 2**64 */
return (float)df; return (float)df;
} }
@ -341,8 +341,8 @@ _TIFFUInt64ToDouble(uint64 ui64)
if (i.part.high >= 0) { if (i.part.high >= 0) {
return (double)i.value; return (double)i.value;
} else { } else {
long double df; double df;
df = (long double)i.value; df = (double)i.value;
df += 18446744073709551616.0; /* adding 2**64 */ df += 18446744073709551616.0; /* adding 2**64 */
return (double)df; return (double)df;
} }

4
modules/flann/include/opencv2/flann/dist.h
View File

@ -59,10 +59,6 @@ inline float abs<float>(float x) { return fabsf(x); }
template<> template<>
inline double abs<double>(double x) { return fabs(x); } inline double abs<double>(double x) { return fabs(x); }
template<>
inline long double abs<long double>(long double x) { return fabsl(x); }
template<typename T> template<typename T>
struct Accumulator { typedef T Type; }; struct Accumulator { typedef T Type; };
template<> template<>

2
modules/flann/include/opencv2/flann/hdf5.h
View File

@ -67,8 +67,6 @@ template<>
hid_t get_hdf5_type<float>() { return H5T_NATIVE_FLOAT; } hid_t get_hdf5_type<float>() { return H5T_NATIVE_FLOAT; }
template<> template<>
hid_t get_hdf5_type<double>() { return H5T_NATIVE_DOUBLE; } hid_t get_hdf5_type<double>() { return H5T_NATIVE_DOUBLE; }
template<>
hid_t get_hdf5_type<long double>() { return H5T_NATIVE_LDOUBLE; }
} }