Type conversions to fix warnings

pull/2027/head
Matthias Bady 11 years ago
parent 67e2d7ec43
commit d270c9e8b6
  1. 6
      modules/ocl/perf/perf_brief.cpp
  2. 8
      modules/ocl/test/test_brief.cpp

@ -78,11 +78,11 @@ PERF_TEST_P( OCL_BRIEF, extract, testing::Combine(
if ( RUN_OCL_IMPL ) if ( RUN_OCL_IMPL )
{ {
Mat kpMat( 2, keypoints.size( ), CV_32FC1 ); Mat kpMat( 2, int( keypoints.size() ), CV_32FC1 );
for ( size_t i = 0; i < keypoints.size( ); ++i ) for ( size_t i = 0; i < keypoints.size( ); ++i )
{ {
kpMat.col( i ).row( 0 ) = keypoints[i].pt.x; kpMat.col( int( i ) ).row( 0 ) = keypoints[i].pt.x;
kpMat.col( i ).row( 1 ) = keypoints[i].pt.y; kpMat.col( int( i ) ).row( 1 ) = keypoints[i].pt.y;
} }
BRIEF_OCL brief( bytes ); BRIEF_OCL brief( bytes );
oclMat imgCL( img ), keypointsCL(kpMat), mask; oclMat imgCL( img ), keypointsCL(kpMat), mask;

@ -79,11 +79,11 @@ OCL_TEST_P( BRIEF, Accuracy )
BriefDescriptorExtractor brief( bytes ); BriefDescriptorExtractor brief( bytes );
brief.compute( img, keypoints, descriptorsGold ); brief.compute( img, keypoints, descriptorsGold );
Mat kpMat( 2, keypoints.size( ), CV_32FC1 ); Mat kpMat( 2, int( keypoints.size() ), CV_32FC1 );
for ( size_t i = 0; i < keypoints.size( ); ++i ) for ( size_t i = 0; i < keypoints.size( ); ++i )
{ {
kpMat.col( i ).row( 0 ) = keypoints[i].pt.x; kpMat.col( i ).row( 0 ) = int( keypoints[i].pt.x );
kpMat.col( i ).row( 1 ) = keypoints[i].pt.y; kpMat.col( i ).row( 1 ) = int( keypoints[i].pt.y );
} }
oclMat imgOcl( img ), keypointsOcl( kpMat ), descriptorsOcl, maskOcl; oclMat imgOcl( img ), keypointsOcl( kpMat ), descriptorsOcl, maskOcl;
@ -96,7 +96,7 @@ OCL_TEST_P( BRIEF, Accuracy )
const int numDesc = cv::countNonZero( mask ); const int numDesc = cv::countNonZero( mask );
if ( numDesc != descriptors.cols ) if ( numDesc != descriptors.cols )
{ {
size_t idx = 0; int idx = 0;
Mat tmp( numDesc, bytes, CV_8UC1 ); Mat tmp( numDesc, bytes, CV_8UC1 );
for ( int i = 0; i < descriptors.rows; ++i ) for ( int i = 0; i < descriptors.rows; ++i )
{ {

Loading…
Cancel
Save