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

fixed build problems on Windows

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-04-18 15:14:32 +00:00
parent e58de551c5
commit 9a991a2e10
17 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/core.hpp
View File

@@ -4117,7 +4117,8 @@ public:
int index;
};
#if 0
class CV_EXPORTS AlgorithmImpl;
/*!
@@ -4163,7 +4164,8 @@ protected:
Ptr<AlgorithmImpl> impl;
};
#endif
}
#endif // __cplusplus

4
modules/core/include/opencv2/core/operations.hpp
View File

@@ -3558,7 +3558,7 @@ template<typename _Tp> static inline std::ostream& operator << (std::ostream& ou
return out;
}
template<typename _Tp> struct AlgorithmParamType {};
/*template<typename _Tp> struct AlgorithmParamType {};
template<> struct AlgorithmParamType<int> { enum { type = CV_PARAM_TYPE_INT }; };
template<> struct AlgorithmParamType<double> { enum { type = CV_PARAM_TYPE_REAL }; };
template<> struct AlgorithmParamType<string> { enum { type = CV_PARAM_TYPE_STRING }; };
@@ -3600,7 +3600,7 @@ template<typename _Tp> void Algorithm::addParam(int propId, _Tp& value, bool rea
template<typename _Tp> void Algorithm::setParamRange(int propId, const _Tp& minVal, const _Tp& maxVal)
{
setParamRange_(propId, AlgorithmParamType<_Tp>::type, &minVal, &maxVal);
}
}*/
}

2
modules/core/src/arithm.cpp
View File

@@ -2271,7 +2271,7 @@ void cv::inRange(const InputArray& _src, const InputArray& _lowerb,
BinaryFunc sccvtfunc = getConvertFunc(scdepth, CV_32S);
sccvtfunc(lb.data, 0, 0, 0, (uchar*)ilbuf, 0, Size(cn, 1), 0);
sccvtfunc(ub.data, 0, 0, 0, (uchar*)iubuf, 0, Size(cn, 1), 0);
int minval = getMinVal(depth), maxval = getMaxVal(depth);
int minval = cvRound(getMinVal(depth)), maxval = cvRound(getMaxVal(depth));
for( int k = 0; k < cn; k++ )
{

2
modules/core/src/mathfuncs.cpp
View File

@@ -115,7 +115,7 @@ static void FastAtan2_32f(const float *Y, const float *X, float *angle, int len,
a = (y >= 0 ? CV_PI*0.5 : CV_PI*1.5) -
x*y*(y2 + 0.43157974*x2)/(y2*y2 + x2*(0.76443945*y2 + 0.05831938*x2) + (float)DBL_EPSILON);
}
angle[i] = a*scale;
angle[i] = (float)(a*scale);
}
}

4
modules/core/src/matmul.cpp
View File

@@ -1665,7 +1665,7 @@ diagtransform_( const T* src, T* dst, const WT* m, int len, int cn, int )
{
const WT* _m = m;
for( int j = 0; j < cn; j++, _m += cn + 1 )
dst[j] = src[j]*_m[j] + _m[cn];
dst[j] = saturate_cast<T>(src[j]*_m[j] + _m[cn]);
}
}
}
@@ -2600,7 +2600,7 @@ static double dotProd_8u(const uchar* src1, const uchar* src2, int len)
__m128i z = _mm_setzero_si128();
while( i < len0 )
{
blockSize = std::min(len0 - j, blockSize0);
blockSize = std::min(len0 - i, blockSize0);
__m128i s = _mm_setzero_si128();
for( j = 0; j <= blockSize - 16; j += 16 )
{