Merge pull request #556 from polarfuchs99:master

alalek · alalek · commit e5229a18a453 · 2016-02-20T17:36:01.000Z
diff --git a/modules/line_descriptor/perf/perf_matching.cpp b/modules/line_descriptor/perf/perf_matching.cpp
@@ -101,7 +101,7 @@ uchar invertSingleBits( uchar dividend_char, int numBits )
   /* reconvert to decimal */
   uchar result = 0;
   for ( int i = (int) bin_vector.size() - 1; i >= 0; i-- )
-    result += (uchar) ( bin_vector[i] * pow( 2, i ) );
+    result += (uchar) ( bin_vector[i] * ( 1 << i ) );
 
   return result;
 }
diff --git a/modules/line_descriptor/test/test_matcher_regression.cpp b/modules/line_descriptor/test/test_matcher_regression.cpp
@@ -123,7 +123,7 @@ uchar CV_BinaryDescriptorMatcherTest::invertSingleBits( uchar dividend_char, int
   /* reconvert to decimal */
   uchar result = 0;
   for ( int i = (int) bin_vector.size() - 1; i >= 0; i-- )
-    result += (uchar) ( bin_vector[i] * pow( 2, i ) );
+    result += (uchar) ( bin_vector[i] * ( 1 << i ) );
 
   return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ uchar invertSingleBits( uchar dividend_char, int numBits )`
`101`	`101`	`/* reconvert to decimal */`
`102`	`102`	`uchar result = 0;`
`103`	`103`	`for ( int i = (int) bin_vector.size() - 1; i >= 0; i-- )`
`104`		`- result += (uchar) ( bin_vector[i] * pow( 2, i ) );`
	`104`	`+ result += (uchar) ( bin_vector[i] * ( 1 << i ) );`
`105`	`105`
`106`	`106`	`return result;`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ uchar CV_BinaryDescriptorMatcherTest::invertSingleBits( uchar dividend_char, int`
`123`	`123`	`/* reconvert to decimal */`
`124`	`124`	`uchar result = 0;`
`125`	`125`	`for ( int i = (int) bin_vector.size() - 1; i >= 0; i-- )`
`126`		`- result += (uchar) ( bin_vector[i] * pow( 2, i ) );`
	`126`	`+ result += (uchar) ( bin_vector[i] * ( 1 << i ) );`
`127`	`127`
`128`	`128`	`return result;`
`129`	`129`	`}`