Merge pull request #1933 from ytyytyyt:3.4

alalek · alalek · commit 34caac78d8ba · 2018-12-05T09:48:10.000Z
diff --git a/modules/ximgproc/src/fbs_filter.cpp b/modules/ximgproc/src/fbs_filter.cpp
@@ -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++)

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@`
`66`	`66`	`typedef std::unordered_map<long long /* hash /, int / vert id */> mapId;`
`67`	`67`	`#endif`
`68`	`68`
`69`		`-#define EPS 1e-43f`
`70`		`-`
`71`	`69`	`namespace cv`
`72`	`70`	`{`
`73`	`71`	`namespace ximgproc`
`@@ -501,7 +499,7 @@ namespace ximgproc`
`501`	`499`	`x(i) = cv::saturate_cast<float>(pft[i])/255.0f;`
`502`	`500`	`}`
`503`	`501`	`}`
`504`		`- else if(confidence.depth() == CV_32F)`
	`502`	`+ else if(target.depth() == CV_32F)`
`505`	`503`	`{`
`506`	`504`	`const float pft = reinterpret_cast<const float>(target.data);`
`507`	`505`	`for (int i = 0; i < npixels; i++)`