Skip to content
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

Jump to bottom

More edits to matlab code in wrapper #3577

Merged
merged 2 commits into from
Mar 25, 2019
Merged

More edits to matlab code in wrapper #3577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12b7c70
[Matlab] Fix errors in Align, Frameset
Mar 24, 2019
6e8049e
[matlab] rename frameset.size, points.size to fix isscalar behaviour
Mar 24, 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
2 changes: 1 addition & 1 deletion wrappers/matlab/align.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
function this = align(align_to)
narginchk(1, 1);
validateattributes(align_to, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.stream.count)});
this.objectHandle = realsense.librealsense_mex('rs2::align', 'new', int64(align_to));
out = realsense.librealsense_mex('rs2::align', 'new', int64(align_to));
this = this@realsense.filter(out);
end

Expand Down
8 changes: 4 additions & 4 deletions wrappers/matlab/frameset.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
function frame = first_or_default(this, s)
narginchk(2, 2);
validateattributes(s, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.stream.count}, '', 's', 2);
ret = realsense.librealsense_mex('rs2::frameset', 'first_or_default', this.objectHandle, int64_t(s));
ret = realsense.librealsense_mex('rs2::frameset', 'first_or_default', this.objectHandle, int64(s));
frame = realsense.frame(ret);
end
function frame = first(this, s)
narginchk(2, 2);
validateattributes(s, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.stream.count}, '', 's', 2);
ret = realsense.librealsense_mex('rs2::frameset', 'first', this.objectHandle, int64_t(s));
ret = realsense.librealsense_mex('rs2::frameset', 'first', this.objectHandle, int64(s));
frame = realsense.frame(ret);
end
function depth_frame = get_depth_frame(this)
Expand All @@ -34,11 +34,11 @@
ret = realsense.librealsense_mex('rs2::frameset', 'get_infrared_frame', this.objectHandle);
else
validateattributes(index, {'numeric'}, {'scalar', 'real', 'integer'}, '', 'index', 2);
ret = realsense.librealsense_mex('rs2::frameset', 'get_infrared_frame', this.objectHandle, int64_t(index));
ret = realsense.librealsense_mex('rs2::frameset', 'get_infrared_frame', this.objectHandle, int64(index));
end
infrared_frame = realsense.video_frame(ret);
end
function frameset_size = size(this)
function frameset_size = frame_count(this)
frameset_size = realsense.librealsense_mex('rs2::frameset', 'size', this.objectHandle);
end
% TODO: iterator protocol?
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/points.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function export_to_ply(this, fname, texture)
function texture_coordinates = get_texture_coordinates(this)
texture_coordinates = realsense.librealsense_mex('rs2::points', 'get_texture_coordinates', this.objectHandle);
end
function s = size(this)
function s = point_count(this)
realsense.librealsense_mex('rs2::points', 'size', this.objectHandle);
end
end
Expand Down