Skip to content

Merge 3.4 #2360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 23, 2019
Merged

Merge 3.4 #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
854d33b
shifted constructor and destructor definitions
czgdp1807 Nov 20, 2019
e70a4c4
Merge pull request #2355 from czgdp1807:pr-2341-follow-up
alalek Nov 21, 2019
6a95558
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions modules/rgbd/src/odometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,28 +983,6 @@ Ptr<DepthCleaner> DepthCleaner::create(int depth_in, int window_size_in, int met
return makePtr<DepthCleaner>(depth_in, window_size_in, method_in);
}

RgbdPlane::RgbdPlane(int method, int block_size,
int min_size, double threshold, double sensor_error_a,
double sensor_error_b, double sensor_error_c) :
method_(method),
block_size_(block_size),
min_size_(min_size),
threshold_(threshold),
sensor_error_a_(sensor_error_a),
sensor_error_b_(sensor_error_b),
sensor_error_c_(sensor_error_c)
{}

Ptr<RgbdPlane> RgbdPlane::create(int method, int block_size, int min_size, double threshold,
double sensor_error_a, double sensor_error_b,
double sensor_error_c ) {
return makePtr<RgbdPlane>(method, block_size, min_size, threshold,
sensor_error_a, sensor_error_b, sensor_error_c);
}

RgbdPlane::~RgbdPlane()
{}

RgbdFrame::RgbdFrame() : ID(-1)
{}

Expand Down
22 changes: 22 additions & 0 deletions modules/rgbd/src/plane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,28 @@ class InlierFinder

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

RgbdPlane::RgbdPlane(int method, int block_size,
int min_size, double threshold, double sensor_error_a,
double sensor_error_b, double sensor_error_c) :
method_(method),
block_size_(block_size),
min_size_(min_size),
threshold_(threshold),
sensor_error_a_(sensor_error_a),
sensor_error_b_(sensor_error_b),
sensor_error_c_(sensor_error_c)
{}

Ptr<RgbdPlane> RgbdPlane::create(int method, int block_size, int min_size, double threshold,
double sensor_error_a, double sensor_error_b,
double sensor_error_c ) {
return makePtr<RgbdPlane>(method, block_size, min_size, threshold,
sensor_error_a, sensor_error_b, sensor_error_c);
}

RgbdPlane::~RgbdPlane()
{}

void
RgbdPlane::operator()(InputArray points3d_in, OutputArray mask_out, OutputArray plane_coefficients)
{
Expand Down