1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 19:44:14 +08:00

Merge pull request #1933 from ytyytyyt:3.4

This commit is contained in:
Alexander Alekhin
2018-12-05 09:48:10 +00:00

View File

@@ -66,8 +66,6 @@
typedef std::unordered_map<long long /* hash */, int /* vert id */> mapId;
#endif
#define EPS 1e-43f
namespace cv
{
namespace ximgproc
@@ -501,7 +499,7 @@ namespace ximgproc
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);
for (int i = 0; i < npixels; i++)