Skip to content

Commit

Permalink
Merge pull request #3577 from lramati/matlab
Browse files Browse the repository at this point in the history
More edits to matlab code in wrapper
  • Loading branch information
dorodnic authored Mar 25, 2019
2 parents e8baae2 + 6e8049e commit 6bfb7e6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion wrappers/matlab/align.m
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 = [email protected](out);
end

Expand Down
8 changes: 4 additions & 4 deletions wrappers/matlab/frameset.m
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
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

0 comments on commit 6bfb7e6

Please sign in to comment.