Skip to content

Commit 9677bd7

Browse files
committed
fix vs2010 samples build
1 parent fb55f29 commit 9677bd7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

modules/line_descriptor/samples/knn_matching.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ uchar invertSingleBits( uchar dividend_char, int numBits )
111111
/* reconvert to decimal */
112112
uchar result = 0;
113113
for ( int i = (int) bin_vector.size() - 1; i >= 0; i-- )
114-
result += (uchar) ( bin_vector[i] * pow( 2, i ) );
114+
result += (uchar) ( bin_vector[i] * (1 << i) );
115115

116116
return result;
117117
}

modules/optflow/samples/optical_flow_evaluation.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "opencv2/video.hpp"
33
#include "opencv2/optflow.hpp"
44
#include <fstream>
5+
#include <limits>
56

67
using namespace std;
78
using namespace cv;
@@ -40,7 +41,7 @@ static Mat endpointError( const Mat_<Point2f>& flow1, const Mat_<Point2f>& flow2
4041
const Point2f diff = u1 - u2;
4142
result.at<float>(i, j) = sqrt((float)diff.ddot(diff)); //distance
4243
} else
43-
result.at<float>(i, j) = NAN;
44+
result.at<float>(i, j) = std::numeric_limits<float>::quiet_NaN();
4445
}
4546
}
4647
return result;
@@ -61,7 +62,7 @@ static Mat angularError( const Mat_<Point2f>& flow1, const Mat_<Point2f>& flow2
6162
if ( isFlowCorrect(u1) && isFlowCorrect(u2) )
6263
result.at<float>(i, j) = acos((float)(u1.ddot(u2) / norm(u1) * norm(u2)));
6364
else
64-
result.at<float>(i, j) = NAN;
65+
result.at<float>(i, j) = std::numeric_limits<float>::quiet_NaN();
6566
}
6667
}
6768
return result;

0 commit comments

Comments
 (0)