From 12b7c70587927f383b40311f908cdb0d579ed707 Mon Sep 17 00:00:00 2001
From: Lior Ramati <lior.ramati@intel.com>
Date: Sun, 24 Mar 2019 16:02:18 +0200
Subject: [PATCH 1/2] [Matlab] Fix errors in Align, Frameset

---
 wrappers/matlab/align.m    | 2 +-
 wrappers/matlab/frameset.m | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wrappers/matlab/align.m b/wrappers/matlab/align.m
index 77813a8a72..4da50b74f4 100644
--- a/wrappers/matlab/align.m
+++ b/wrappers/matlab/align.m
@@ -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
         
diff --git a/wrappers/matlab/frameset.m b/wrappers/matlab/frameset.m
index c36111a2b3..e26309315a 100644
--- a/wrappers/matlab/frameset.m
+++ b/wrappers/matlab/frameset.m
@@ -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)
@@ -34,7 +34,7 @@
                 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

From 6e8049ecec3f25582c59785dba894b8cf57f7765 Mon Sep 17 00:00:00 2001
From: Lior Ramati <lior.ramati@intel.com>
Date: Sun, 24 Mar 2019 17:01:50 +0200
Subject: [PATCH 2/2] [matlab] rename frameset.size, points.size to fix
 isscalar behaviour

---
 wrappers/matlab/frameset.m | 2 +-
 wrappers/matlab/points.m   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/matlab/frameset.m b/wrappers/matlab/frameset.m
index e26309315a..32fb4cd6f6 100644
--- a/wrappers/matlab/frameset.m
+++ b/wrappers/matlab/frameset.m
@@ -38,7 +38,7 @@
             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?
diff --git a/wrappers/matlab/points.m b/wrappers/matlab/points.m
index 9a747ec8e0..158477308e 100644
--- a/wrappers/matlab/points.m
+++ b/wrappers/matlab/points.m
@@ -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