Skip to content

Commit 8bad009

Browse files
cbalint13cbalint13
committed
Merge pull request #2 from Itseez/master
SYNC upstream
2 parents ae7e5a5 + 4d30d09 commit 8bad009

File tree

7 files changed

+25
-19
lines changed

7 files changed

+25
-19
lines changed

‎modules/adas/tools/fcw_detect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endif()
1313
project(${the_target})
1414

1515
ocv_include_directories("${OpenCV_SOURCE_DIR}/include/opencv")
16-
ocv_include_modules(${OPENCV_${the_target}_DEPS})
16+
ocv_include_modules_recurse(${OPENCV_${the_target}_DEPS})
1717

1818
file(GLOB ${the_target}_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
1919

‎modules/adas/tools/fcw_train/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endif()
1313
project(${the_target})
1414

1515
ocv_include_directories("${OpenCV_SOURCE_DIR}/include/opencv")
16-
ocv_include_modules(${OPENCV_${the_target}_DEPS})
16+
ocv_include_modules_recurse(${OPENCV_${the_target}_DEPS})
1717

1818
file(GLOB ${the_target}_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
1919

‎modules/matlab/include/opencv2/matlab/bridge.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ typedef cv::Ptr<AlignMTB> Ptr_AlignMTB;
8585
typedef cv::Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
8686
typedef cv::Ptr<CalibrateRobertson> Ptr_CalibrateRobertson;
8787
typedef cv::Ptr<DenseOpticalFlow> Ptr_DenseOpticalFlow;
88+
typedef cv::Ptr<DualTVL1OpticalFlow> Ptr_DualTVL1OpticalFlow;
8889
typedef cv::Ptr<MergeDebevec> Ptr_MergeDebevec;
8990
typedef cv::Ptr<MergeMertens> Ptr_MergeMertens;
9091
typedef cv::Ptr<MergeRobertson> Ptr_MergeRobertson;
@@ -468,6 +469,11 @@ class Bridge {
468469
Ptr_DenseOpticalFlow toPtrDenseOpticalFlow() { return Ptr_DenseOpticalFlow(); }
469470
operator Ptr_DenseOpticalFlow() { return toPtrDenseOpticalFlow(); }
470471

472+
// --------------------------- Ptr_DualTVL1OpticalFlow -------------------
473+
Bridge& operator=(const Ptr_DualTVL1OpticalFlow& ) { return *this; }
474+
Ptr_DualTVL1OpticalFlow toPtrDualTVL1OpticalFlow() { return Ptr_DualTVL1OpticalFlow(); }
475+
operator Ptr_DualTVL1OpticalFlow() { return toPtrDualTVL1OpticalFlow(); }
476+
471477
// --------------------------- Ptr_MergeDebevec -----------------------
472478
Bridge& operator=(const Ptr_MergeDebevec& ) { return *this; }
473479
Ptr_MergeDebevec toPtrMergeDebevec() { return Ptr_MergeDebevec(); }

‎modules/optflow/src/motempl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void calcMotionGradient( InputArray _mhi, OutputArray _mask,
212212
float* orient_row = orient.ptr<float>(y);
213213
uchar* mask_row = mask.ptr<uchar>(y);
214214

215-
fastAtan2(dY_max_row, dX_min_row, orient_row, size.width, true);
215+
hal::fastAtan2(dY_max_row, dX_min_row, orient_row, size.width, true);
216216

217217
// make orientation zero where the gradient is very small
218218
for( x = 0; x < size.width; x++ )

‎modules/rgbd/src/depth_to_3d.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ convertDepthToFloat(const cv::Mat& depth, const cv::Mat& mask, float scale, cv::
8181
v_mat((int)n_points, 0) = (float)v;
8282
T depth_i = depth.at<T>(v, u);
8383

84-
if (cvIsNaN(depth_i) || (depth_i == std::numeric_limits<T>::min()) || (depth_i == std::numeric_limits<T>::max()))
84+
if (cvIsNaN((float)depth_i) || (depth_i == std::numeric_limits<T>::min()) || (depth_i == std::numeric_limits<T>::max()))
8585
z_mat((int)n_points, 0) = std::numeric_limits<float>::quiet_NaN();
8686
else
8787
z_mat((int)n_points, 0) = depth_i * scale;
@@ -111,7 +111,7 @@ convertDepthToFloat(const cv::Mat& depth, float scale, const cv::Mat &uv_mat, cv
111111
{
112112
T depth_i = depth.at < T > ((int)(*uv_iter)[1], (int)(*uv_iter)[0]);
113113

114-
if (cvIsNaN(depth_i) || (depth_i == std::numeric_limits < T > ::min())
114+
if (cvIsNaN((float)depth_i) || (depth_i == std::numeric_limits < T > ::min())
115115
|| (depth_i == std::numeric_limits < T > ::max()))
116116
*z_mat_iter = std::numeric_limits<float>::quiet_NaN();
117117
else

‎modules/xfeatures2d/src/agast_score.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ int agast_cornerScore<AgastFeatureDetector::OAST_9_16>(const uchar* ptr, const i
118118

119119
while(true)
120120
{
121-
register const int cb = *pixel + b_test;
122-
register const int c_b = *pixel - b_test;
121+
register const int cb = *ptr + b_test;
122+
register const int c_b = *ptr - b_test;
123123
if(ptr[offset0] > cb)
124124
if(ptr[offset2] > cb)
125125
if(ptr[offset4] > cb)
@@ -2189,8 +2189,8 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_7_12d>(const uchar* ptr, const
21892189

21902190
while(true)
21912191
{
2192-
register const int cb = *pixel + b_test;
2193-
register const int c_b = *pixel - b_test;
2192+
register const int cb = *ptr + b_test;
2193+
register const int c_b = *ptr - b_test;
21942194
if(ptr[offset0] > cb)
21952195
if(ptr[offset5] > cb)
21962196
if(ptr[offset2] > cb)
@@ -3401,8 +3401,8 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_7_12s>(const uchar* ptr, const
34013401

34023402
while(true)
34033403
{
3404-
register const int cb = *pixel + b_test;
3405-
register const int c_b = *pixel - b_test;
3404+
register const int cb = *ptr + b_test;
3405+
register const int c_b = *ptr - b_test;
34063406
if(ptr[offset0] > cb)
34073407
if(ptr[offset5] > cb)
34083408
if(ptr[offset2] < c_b)
@@ -9031,8 +9031,8 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_5_8>(const uchar* ptr, const i
90319031

90329032
while(true)
90339033
{
9034-
register const int cb = *pixel + b_test;
9035-
register const int c_b = *pixel - b_test;
9034+
register const int cb = *ptr + b_test;
9035+
register const int c_b = *ptr - b_test;
90369036
if(ptr[offset0] > cb)
90379037
if(ptr[offset2] > cb)
90389038
if(ptr[offset3] > cb)

‎modules/xfeatures2d/src/sift.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius,
337337
len = k;
338338

339339
// compute gradient values, orientations and the weights over the pixel neighborhood
340-
exp(W, W, len);
341-
fastAtan2(Y, X, Ori, len, true);
342-
magnitude(X, Y, Mag, len);
340+
hal::exp(W, W, len);
341+
hal::fastAtan2(Y, X, Ori, len, true);
342+
hal::magnitude(X, Y, Mag, len);
343343

344344
for( k = 0; k < len; k++ )
345345
{
@@ -620,9 +620,9 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
620620
}
621621

622622
len = k;
623-
fastAtan2(Y, X, Ori, len, true);
624-
magnitude(X, Y, Mag, len);
625-
exp(W, W, len);
623+
hal::fastAtan2(Y, X, Ori, len, true);
624+
hal::magnitude(X, Y, Mag, len);
625+
hal::exp(W, W, len);
626626

627627
for( k = 0; k < len; k++ )
628628
{

0 commit comments

Comments
 (0)