Merge remote-tracking branch 'upstream/3.4' into merge-3.4

pull/1982/head
Alexander Alekhin 6 years ago
commit cf4ad7a1f0
  1. 8
      modules/rgbd/include/opencv2/rgbd/depth.hpp

@ -112,7 +112,7 @@ namespace rgbd
* @param points a rows x cols x 3 matrix of CV_32F/CV64F or a rows x cols x 1 CV_U16S
* @param normals a rows x cols x 3 matrix
*/
void
CV_WRAP_AS(apply) void
operator()(InputArray points, OutputArray normals) const;
/** Initializes some data that is cached for later computation
@ -219,7 +219,7 @@ namespace rgbd
* @param points a rows x cols x 3 matrix of CV_32F/CV64F or a rows x cols x 1 CV_U16S
* @param depth a rows x cols matrix of the cleaned up depth
*/
void
CV_WRAP_AS(apply) void
operator()(InputArray points, OutputArray depth) const;
/** Initializes some data that is cached for later computation
@ -353,7 +353,7 @@ namespace rgbd
* @param plane_coefficients the coefficients of the corresponding planes (a,b,c,d) such that ax+by+cz+d=0, norm(a,b,c)=1
* and c < 0 (so that the normal points towards the camera)
*/
void
CV_WRAP_AS(apply) void
operator()(InputArray points3d, InputArray normals, OutputArray mask,
OutputArray plane_coefficients);
@ -363,7 +363,7 @@ namespace rgbd
* and 255 if it does not belong to any plane
* @param plane_coefficients the coefficients of the corresponding planes (a,b,c,d) such that ax+by+cz+d=0
*/
void
CV_WRAP_AS(apply) void
operator()(InputArray points3d, OutputArray mask, OutputArray plane_coefficients);
CV_WRAP int getBlockSize() const

Loading…
Cancel
Save