[Octave-cvsupdate] SF.net SVN: octave:[11036] trunk/octave-forge/main/instrument-control/src/ i2c/i2c_read.cc

[<ean...@us...>]

Revision: 11036
          http://octave.svn.sourceforge.net/octave/?rev=11036&view=rev
Author:   eandrius
Date:     2012-09-16 17:47:16 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
instrument-control: i2c, fixed return value for i2c_read

Modified Paths:
--------------
    trunk/octave-forge/main/instrument-control/src/i2c/i2c_read.cc

Modified: trunk/octave-forge/main/instrument-control/src/i2c/i2c_read.cc
===================================================================
--- trunk/octave-forge/main/instrument-control/src/i2c/i2c_read.cc	2012-09-16 17:08:22 UTC (rev 11035)
+++ trunk/octave-forge/main/instrument-control/src/i2c/i2c_read.cc	2012-09-16 17:47:16 UTC (rev 11036)
@@ -14,6 +14,7 @@
 // along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include <octave/oct.h>
+#include <octave/uint8NDArray.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,15 +65,15 @@
     
     retval = i2c->read(buffer, buffer_len);
     
-    octave_value_list return_list;
-    uint8NDArray data(retval);
+    octave_value_list return_list(2);
+    uint8NDArray data( dim_vector(1, retval) );
     
     for (int i = 0; i < retval; i++)
         data(i) = buffer[i];
 
+    return_list(0) = data;
     return_list(1) = retval; 
-    return_list(0) = data;
-
+        
     delete[] buffer;
 
     return return_list;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.