Fixed MSVC warnings

This commit is contained in:
Andrey Kamaev
2013-03-13 11:34:04 +04:00
parent 55698548dd
commit 7e50d3e571
6 changed files with 9 additions and 8 deletions

View File

@@ -206,9 +206,9 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
}
for( i = 0; i < tl_count-1; i++ )
hullbuf[nout++] = pointer[tl_stack[i]] - data0;
hullbuf[nout++] = int(pointer[tl_stack[i]] - data0);
for( i = tr_count - 1; i > 0; i-- )
hullbuf[nout++] = pointer[tr_stack[i]] - data0;
hullbuf[nout++] = int(pointer[tr_stack[i]] - data0);
int stop_idx = tr_count > 2 ? tr_stack[1] : tl_count > 2 ? tl_stack[tl_count - 2] : -1;
// lower half
@@ -244,9 +244,9 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
}
for( i = 0; i < bl_count-1; i++ )
hullbuf[nout++] = pointer[bl_stack[i]] - data0;
hullbuf[nout++] = int(pointer[bl_stack[i]] - data0);
for( i = br_count-1; i > 0; i-- )
hullbuf[nout++] = pointer[br_stack[i]] - data0;
hullbuf[nout++] = int(pointer[br_stack[i]] - data0);
}
if( !returnPoints )

View File

@@ -316,7 +316,7 @@ public:
_mm_storel_epi64((__m128i*)(dst+6*6), g1);
}
return bayer - (bayer_end - width);
return int(bayer - (bayer_end - width));
}
bool use_simd;