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

Drop outdated definitions from internal.hpp

Browse Source 
This also fixes few clang build errors
This commit is contained in:
Andrey Kamaev
2013-03-31 13:26:21 +04:00
parent 605382562d
commit 3890a74565
34 changed files with 248 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/src/calibration.cpp
View File

@@ -2688,7 +2688,7 @@ void cv::reprojectImageTo3D( InputArray _disparity,
for( x = 0; x < cols*3; x++ )
{
int ival = cvRound(dptr[x]);
dptr0[x] = CV_CAST_16S(ival);
dptr0[x] = cv::saturate_cast<short>(ival);
}
}
else if( dtype == CV_32SC3 )

2
modules/calib3d/src/stereobm.cpp
View File

@@ -183,7 +183,7 @@ prefilterXSobel( const Mat& src, Mat& dst, int ftzero )
if( useSIMD )
{
__m128i z = _mm_setzero_si128(), ftz = _mm_set1_epi16((short)ftzero),
ftz2 = _mm_set1_epi8(CV_CAST_8U(ftzero*2));
ftz2 = _mm_set1_epi8(cv::saturate_cast<uchar>(ftzero*2));
for( ; x <= size.width-9; x += 8 )
{
__m128i c0 = _mm_unpacklo_epi8(_mm_loadl_epi64((__m128i*)(srow0 + x - 1)), z);