summaryrefslogtreecommitdiffstats
path: root/scilab/modules/api_scilab
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-01-22 15:28:57 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-01-22 15:28:57 +0100
commit83e197f7eeac818fe0d0b054751b1c35a8e4c60a (patch)
tree126effad0476446eebe38ab76e482afdad346fb0 /scilab/modules/api_scilab
parent6d5a61a42bfcea5c1fda275709d46b49c40c4a0e (diff)
parente5f6e79a9c03ddb838018aaad49b5539276abe37 (diff)
downloadscilab-83e197f7eeac818fe0d0b054751b1c35a8e4c60a.zip
scilab-83e197f7eeac818fe0d0b054751b1c35a8e4c60a.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/api_scilab')
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_int.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/api_scilab/src/cpp/api_int.cpp b/scilab/modules/api_scilab/src/cpp/api_int.cpp
index 4afacf2..c195b41 100644
--- a/scilab/modules/api_scilab/src/cpp/api_int.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_int.cpp
@@ -354,7 +354,7 @@ SciErr allocMatrixOfUnsignedInteger32(void* _pvCtx, int _iVar, int _iRows, int _
354 354
355 getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr); 355 getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr);
356 356
357 sciErr = allocCommonMatrixOfInteger(_pvCtx, _iVar, piAddr, SCI_INT32, _iRows, _iCols, (void**)&puiData32); 357 sciErr = allocCommonMatrixOfInteger(_pvCtx, _iVar, piAddr, SCI_UINT32, _iRows, _iCols, (void**)&puiData32);
358 if(sciErr.iErr) 358 if(sciErr.iErr)
359 { 359 {
360 addErrorMessage(&sciErr, API_ERROR_CREATE_INT, _("%s: Unable to create variable in Scilab memory"), "allocMatrixOfUnsignedInteger32"); 360 addErrorMessage(&sciErr, API_ERROR_CREATE_INT, _("%s: Unable to create variable in Scilab memory"), "allocMatrixOfUnsignedInteger32");