Commit 34caac78 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #1933 from ytyytyyt:3.4

parents 4bf1ccec 5bdeb648
...@@ -66,8 +66,6 @@ ...@@ -66,8 +66,6 @@
typedef std::unordered_map<long long /* hash */, int /* vert id */> mapId; typedef std::unordered_map<long long /* hash */, int /* vert id */> mapId;
#endif #endif
#define EPS 1e-43f
namespace cv namespace cv
{ {
namespace ximgproc namespace ximgproc
...@@ -501,7 +499,7 @@ namespace ximgproc ...@@ -501,7 +499,7 @@ namespace ximgproc
x(i) = cv::saturate_cast<float>(pft[i])/255.0f; x(i) = cv::saturate_cast<float>(pft[i])/255.0f;
} }
} }
else if(confidence.depth() == CV_32F) else if(target.depth() == CV_32F)
{ {
const float *pft = reinterpret_cast<const float*>(target.data); const float *pft = reinterpret_cast<const float*>(target.data);
for (int i = 0; i < npixels; i++) for (int i = 0; i < npixels; i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment