Merge pull request #556 from polarfuchs99:master

e5229a18 · Alexander Alekhin · 5c673477 · c2b55897 · e5229a18 · e5229a18
Commit e5229a18 authored Feb 20, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

perf_matching.cpp modules/line_descriptor/perf/perf_matching.cpp +1 -1

test_matcher_regression.cpp modules/line_descriptor/test/test_matcher_regression.cpp +1 -1

No files found.
--- 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;
 }

--- 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;
 }