Skip to content

registration.cpp merge fix #484

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
floe merged 1 commit into from
Nov 27, 2015
+2 −2
Merged

registration.cpp merge fix #484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/registration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class RegistrationImpl
RegistrationImpl(Freenect2Device::IrCameraParams depth_p, Freenect2Device::ColorCameraParams rgb_p);

void apply(int dx, int dy, float dz, float& cx, float &cy) const;
void apply(const Frame* rgb, const Frame* depth, Frame* undistorted, Frame* registered, const bool enable_filter, Frame* bigdepth) const;
void apply(const Frame* rgb, const Frame* depth, Frame* undistorted, Frame* registered, const bool enable_filter, Frame* bigdepth, int* color_depth_map = 0) const;
void getPointXYZRGB (const Frame* undistorted, const Frame* registered, int r, int c, float& x, float& y, float& z, float& rgb) const;
void distort(int mx, int my, float& dx, float& dy) const;
void depth_to_color(float mx, float my, float& rx, float& ry) const;
Expand Down Expand Up @@ -138,7 +138,7 @@ void Registration::apply(const Frame *rgb, const Frame *depth, Frame *undistorte
impl_->apply(rgb, depth, undistorted, registered, enable_filter, bigdepth);
}

void RegistrationImpl::apply(const Frame *rgb, const Frame *depth, Frame *undistorted, Frame *registered, const bool enable_filter, Frame *bigdepth) const
void RegistrationImpl::apply(const Frame *rgb, const Frame *depth, Frame *undistorted, Frame *registered, const bool enable_filter, Frame *bigdepth, int *color_depth_map) const
{
// Check if all frames are valid and have the correct size
if (!rgb || !depth || !undistorted || !registered ||
Expand Down