diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-13 15:01:23 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-13 15:01:23 +0200 |
commit | 887dd41c5d67c30bd1e9631920d8fc1c3dd1a3f0 (patch) | |
tree | e5962fa5ef14b85b49c3d92752829e4645547efb /tracker-pt/point_extractor.cpp | |
parent | 13f01510132abd3cf08e5a913721d0702c20664f (diff) |
compat/macros: fix "restrict" name clash
Diffstat (limited to 'tracker-pt/point_extractor.cpp')
-rw-r--r-- | tracker-pt/point_extractor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/point_extractor.cpp index cd8b8ce3..9030b520 100644 --- a/tracker-pt/point_extractor.cpp +++ b/tracker-pt/point_extractor.cpp @@ -49,7 +49,7 @@ static cv::Vec2d MeanShiftIteration(const cv::Mat &frame_gray, const cv::Vec2d & cv::Vec2d com(0.0, 0.0); for (int i = 0; i < frame_gray.rows; i++) { - auto frame_ptr = (uint8_t const * restrict)frame_gray.ptr(i); + auto frame_ptr = (uint8_t const* restrict_ptr)frame_gray.ptr(i); for (int j = 0; j < frame_gray.cols; j++) { double val = frame_ptr[j]; @@ -192,7 +192,7 @@ void PointExtractor::extract_points(const cv::Mat& frame, cv::Mat& preview_frame const double max_radius = 15 * cy; const double radius = fmax(0., (max_radius-min_radius) * s.threshold / 255 + min_radius); - float const* restrict ptr = reinterpret_cast<float const* restrict>(hist.ptr(0)); + float const* restrict_ptr ptr = reinterpret_cast<float const* restrict_ptr>(hist.ptr(0)); const unsigned area = uround(3 * M_PI * radius*radius); const unsigned sz = unsigned(hist.cols * hist.rows); unsigned thres = 32; |