fix write array error

Author: mpsonntag

src/nixdataarray.cc

@@ -52,8 +52,18 @@ namespace nixdataarray {
         nix::DataArray da = input.entity<nix::DataArray>(1);
         nix::DataType dtype = input.dtype(2);
 
-        nix::NDSize count = input.ndsize(2);
-        nix::NDSize offset(0);
+        const mxArray *arr = input.get_mx_array(2);
+
+        mwSize ndims = mxGetNumberOfDimensions(arr);
+        const mwSize *dims = mxGetDimensions(arr);
+
+        nix::NDSize count(ndims);
+
+        for (mwSize i = 0; i < ndims; i++) {
+            count[(ndims - i) - 1] = static_cast<nix::ndsize_t>(dims[i]);
+        }
+
+        nix::NDSize offset(count.size(), 0);
         double *ptr = input.get_raw(2);
 
         if (dtype == nix::DataType::String) {

src/utils/arguments.h

@@ -18,9 +18,9 @@ class argument_helper {
 
     bool check_size(size_t pos, bool fatal = false) const {
         bool res = pos + 1 > number;
-		if (!res && fatal) {
-			throw std::out_of_range("argument position is out of bounds");
-		}
+        if (!res && fatal) {
+            throw std::out_of_range("argument position is out of bounds");
+        }
         return res;
     }
 
@@ -49,7 +49,7 @@ class argument_helper {
     size_t number;
 };
 
-class extractor : public argument_helper<const mxArray> {
+class extractor : public argument_helper < const mxArray > {
 public:
     extractor(const mxArray **arr, int n) : argument_helper(arr, n) { }
 
@@ -76,7 +76,7 @@ class extractor : public argument_helper<const mxArray> {
     nix::NDSize ndsize(size_t pos) const {
         return mx_to_ndsize(array[pos]);
     }
-    
+
     nix::DataType dtype(size_t pos) const {
         return dtype_mex2nix(array[pos]);
     }
@@ -97,7 +97,7 @@ class extractor : public argument_helper<const mxArray> {
     }
 
     handle hdl(size_t pos) const {
-		handle h = handle(num<uint64_t>(pos));
+        handle h = handle(num<uint64_t>(pos));
         return h;
     }
 
@@ -114,24 +114,28 @@ class extractor : public argument_helper<const mxArray> {
         return mxGetPr(array[pos]);
     }
 
+    const mxArray *get_mx_array(size_t pos) const {
+        return array[pos];
+    }
+
 private:
 };
 
 template<>
 inline std::vector<std::string> extractor::vec(size_t pos) const {
-	return mx_to_strings(array[pos]);
+    return mx_to_strings(array[pos]);
 }
 
 
 class infusor : public argument_helper<mxArray> {
 public:
     infusor(mxArray **arr, int n) : argument_helper(arr, n) { }
 
-	template<typename T>
-	void set(size_t pos, T &&value) {
-		mxArray *array = make_mx_array(std::forward<T>(value));
-		set(pos, array);
-	}
+    template<typename T>
+    void set(size_t pos, T &&value) {
+        mxArray *array = make_mx_array(std::forward<T>(value));
+        set(pos, array);
+    }
 
     void set(size_t pos, mxArray *arr) {
         array[pos] = arr;