r45654 - in /packages/scilab/branches/5.4/debian: changelog control patches/0001-Port-to-matio-1.5.0.patch
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Thu Mar 21 23:03:37 UTC 2013
Author: sylvestre
Date: Thu Mar 21 23:03:37 2013
New Revision: 45654
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45654
Log:
various fixes
Modified:
packages/scilab/branches/5.4/debian/changelog
packages/scilab/branches/5.4/debian/control
packages/scilab/branches/5.4/debian/patches/0001-Port-to-matio-1.5.0.patch
Modified: packages/scilab/branches/5.4/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/changelog?rev=45654&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/changelog (original)
+++ packages/scilab/branches/5.4/debian/changelog Thu Mar 21 23:03:37 2013
@@ -1,8 +1,9 @@
-scilab (5.4.1~git20130314-27e240f-1~exp2) experimental; urgency=low
-
+scilab (5.4.1~git20130321-2df5f3a-1~exp1) experimental; urgency=low
+
+ * New snapshot release
* Force the usage of matio 1.5
- --
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 21 Mar 2013 23:48:10 +0100
scilab (5.4.1~git20130314-27e240f-1~exp1) experimental; urgency=low
Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=45654&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Thu Mar 21 23:03:37 2013
@@ -20,7 +20,7 @@
libxml-commons-external-java,
# Optional Scilab features
libfftw3-dev, libsuitesparse-dev (>= 3.4.0),
- libmatio-dev (=> 1.5.0),
+ libmatio-dev (>= 1.5.0),
# latex rendering
libjlatexmath-java (>= 1.0.1), libjlatexmath-fop-java (>= 1.0.1),
libscirenderer-java (>= 1.0.6),
Modified: packages/scilab/branches/5.4/debian/patches/0001-Port-to-matio-1.5.0.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/0001-Port-to-matio-1.5.0.patch?rev=45654&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/0001-Port-to-matio-1.5.0.patch (original)
+++ packages/scilab/branches/5.4/debian/patches/0001-Port-to-matio-1.5.0.patch Thu Mar 21 23:03:37 2013
@@ -39,10 +39,10 @@
.../modules/matio/tests/nonreg_tests/bug_5462.tst | 4 +-
31 files changed, 2320 insertions(+), 1777 deletions(-)
-diff --git a/scilab/configure b/scilab/configure
+diff --git a/configure b/configure
index 44c4a19..628e5fe 100755
---- a/scilab/configure
-+++ b/scilab/configure
+--- a/configure
++++ b/configure
@@ -25544,7 +25544,7 @@ MATIO_ENABLE=no
if test "$with_matio" != no; then
if test -n "$with_matio_include" -o -n "$with_matio_library" ; then
@@ -166,10 +166,10 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-diff --git a/scilab/configure.ac b/scilab/configure.ac
+diff --git a/configure.ac b/configure.ac
index 5005667..6226d8f 100644
---- a/scilab/configure.ac
-+++ b/scilab/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -1556,9 +1556,9 @@ MATIO_ENABLE=no
if test "$with_matio" != no; then
if test -n "$with_matio_include" -o -n "$with_matio_library" ; then
@@ -201,10 +201,10 @@
fi
-diff --git a/scilab/modules/core/includes/machine.h.in b/scilab/modules/core/includes/machine.h.in
+diff --git a/modules/core/includes/machine.h.in b/modules/core/includes/machine.h.in
index c08feab..a783dfa 100644
---- a/scilab/modules/core/includes/machine.h.in
-+++ b/scilab/modules/core/includes/machine.h.in
+--- a/modules/core/includes/machine.h.in
++++ b/modules/core/includes/machine.h.in
@@ -176,9 +176,6 @@
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -215,10 +215,10 @@
/* Define to 1 if you have the <matio.h> header file. */
#undef HAVE_MATIO_H
-diff --git a/scilab/modules/matio/sci_gateway/c/gw_matio.c b/scilab/modules/matio/sci_gateway/c/gw_matio.c
+diff --git a/modules/matio/sci_gateway/c/gw_matio.c b/modules/matio/sci_gateway/c/gw_matio.c
index 5e83921..787fdc4 100644
---- a/scilab/modules/matio/sci_gateway/c/gw_matio.c
-+++ b/scilab/modules/matio/sci_gateway/c/gw_matio.c
+--- a/modules/matio/sci_gateway/c/gw_matio.c
++++ b/modules/matio/sci_gateway/c/gw_matio.c
@@ -1,26 +1,24 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -281,10 +281,10 @@
-/*-----------------------------------------------------------------------------------*/
+/*-----------------------------------------------------------------------------------*/
-diff --git a/scilab/modules/matio/sci_gateway/c/sci_matfile_close.c b/scilab/modules/matio/sci_gateway/c/sci_matfile_close.c
+diff --git a/modules/matio/sci_gateway/c/sci_matfile_close.c b/modules/matio/sci_gateway/c/sci_matfile_close.c
index b70fc48..00a67d8 100644
---- a/scilab/modules/matio/sci_gateway/c/sci_matfile_close.c
-+++ b/scilab/modules/matio/sci_gateway/c/sci_matfile_close.c
+--- a/modules/matio/sci_gateway/c/sci_matfile_close.c
++++ b/modules/matio/sci_gateway/c/sci_matfile_close.c
@@ -1,86 +1,95 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -437,10 +437,10 @@
+
+ return TRUE;
}
-diff --git a/scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c b/scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
+diff --git a/modules/matio/sci_gateway/c/sci_matfile_listvar.c b/modules/matio/sci_gateway/c/sci_matfile_listvar.c
index 8663163..bc75094 100644
---- a/scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
-+++ b/scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
+--- a/modules/matio/sci_gateway/c/sci_matfile_listvar.c
++++ b/modules/matio/sci_gateway/c/sci_matfile_listvar.c
@@ -82,7 +82,7 @@ int sci_matfile_listvar(char *fname, unsigned long fname_len)
/* Back to the beginning of the file */
if (Mat_Rewind(matfile) != 0)
@@ -485,10 +485,10 @@
{
printError(&sciErr, 0);
return 0;
-diff --git a/scilab/modules/matio/sci_gateway/c/sci_matfile_open.c b/scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
+diff --git a/modules/matio/sci_gateway/c/sci_matfile_open.c b/modules/matio/sci_gateway/c/sci_matfile_open.c
index efa956f..b506c00 100644
---- a/scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
-+++ b/scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
+--- a/modules/matio/sci_gateway/c/sci_matfile_open.c
++++ b/modules/matio/sci_gateway/c/sci_matfile_open.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -785,10 +785,10 @@
+
+ return TRUE;
}
-diff --git a/scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c b/scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
+diff --git a/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c b/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
index 072a720..b41a0b2 100644
---- a/scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
-+++ b/scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
+--- a/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
++++ b/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1019,10 +1019,10 @@
+ PutLhsVar();
+ return TRUE;
}
-diff --git a/scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c b/scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
+diff --git a/modules/matio/sci_gateway/c/sci_matfile_varwrite.c b/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
index 19e4d09..5a3a262 100644
---- a/scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
-+++ b/scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
+--- a/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
++++ b/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1298,10 +1298,10 @@
+
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateBooleanVariable.c b/scilab/modules/matio/src/c/CreateBooleanVariable.c
+diff --git a/modules/matio/src/c/CreateBooleanVariable.c b/modules/matio/src/c/CreateBooleanVariable.c
index 9496f92..6681cab 100644
---- a/scilab/modules/matio/src/c/CreateBooleanVariable.c
-+++ b/scilab/modules/matio/src/c/CreateBooleanVariable.c
+--- a/modules/matio/src/c/CreateBooleanVariable.c
++++ b/modules/matio/src/c/CreateBooleanVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1481,10 +1481,10 @@
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateCellVariable.c b/scilab/modules/matio/src/c/CreateCellVariable.c
+diff --git a/modules/matio/src/c/CreateCellVariable.c b/modules/matio/src/c/CreateCellVariable.c
index 322847b..9498fed 100644
---- a/scilab/modules/matio/src/c/CreateCellVariable.c
-+++ b/scilab/modules/matio/src/c/CreateCellVariable.c
+--- a/modules/matio/src/c/CreateCellVariable.c
++++ b/modules/matio/src/c/CreateCellVariable.c
@@ -1,11 +1,11 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1663,10 +1663,10 @@
+
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateCharVariable.c b/scilab/modules/matio/src/c/CreateCharVariable.c
+diff --git a/modules/matio/src/c/CreateCharVariable.c b/modules/matio/src/c/CreateCharVariable.c
index c51e76c..1cbda14 100644
---- a/scilab/modules/matio/src/c/CreateCharVariable.c
-+++ b/scilab/modules/matio/src/c/CreateCharVariable.c
+--- a/modules/matio/src/c/CreateCharVariable.c
++++ b/modules/matio/src/c/CreateCharVariable.c
@@ -22,94 +22,96 @@
#include "localization.h"
#include "Scierror.h"
@@ -1842,10 +1842,10 @@
- return TRUE;
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateDoubleVariable.c b/scilab/modules/matio/src/c/CreateDoubleVariable.c
+diff --git a/modules/matio/src/c/CreateDoubleVariable.c b/modules/matio/src/c/CreateDoubleVariable.c
index 37a0edf..18f715e 100644
---- a/scilab/modules/matio/src/c/CreateDoubleVariable.c
-+++ b/scilab/modules/matio/src/c/CreateDoubleVariable.c
+--- a/modules/matio/src/c/CreateDoubleVariable.c
++++ b/modules/matio/src/c/CreateDoubleVariable.c
@@ -1,74 +1,89 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -1982,10 +1982,10 @@
- return TRUE;
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateHyperMatrixVariable.c b/scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
+diff --git a/modules/matio/src/c/CreateHyperMatrixVariable.c b/modules/matio/src/c/CreateHyperMatrixVariable.c
index 25631e4..76fde31 100644
---- a/scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
-+++ b/scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
+--- a/modules/matio/src/c/CreateHyperMatrixVariable.c
++++ b/modules/matio/src/c/CreateHyperMatrixVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -2297,10 +2297,10 @@
+
return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateIntegerVariable.c b/scilab/modules/matio/src/c/CreateIntegerVariable.c
+diff --git a/modules/matio/src/c/CreateIntegerVariable.c b/modules/matio/src/c/CreateIntegerVariable.c
index 23bbadd..71fd72b 100644
---- a/scilab/modules/matio/src/c/CreateIntegerVariable.c
-+++ b/scilab/modules/matio/src/c/CreateIntegerVariable.c
+--- a/modules/matio/src/c/CreateIntegerVariable.c
++++ b/modules/matio/src/c/CreateIntegerVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -2795,10 +2795,10 @@
+
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateMatlabVariable.c b/scilab/modules/matio/src/c/CreateMatlabVariable.c
+diff --git a/modules/matio/src/c/CreateMatlabVariable.c b/modules/matio/src/c/CreateMatlabVariable.c
index f96be35..4ee2d98 100644
---- a/scilab/modules/matio/src/c/CreateMatlabVariable.c
-+++ b/scilab/modules/matio/src/c/CreateMatlabVariable.c
+--- a/modules/matio/src/c/CreateMatlabVariable.c
++++ b/modules/matio/src/c/CreateMatlabVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -2955,10 +2955,10 @@
- return TRUE;
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateMatlabVariable.h b/scilab/modules/matio/src/c/CreateMatlabVariable.h
+diff --git a/modules/matio/src/c/CreateMatlabVariable.h b/modules/matio/src/c/CreateMatlabVariable.h
index 25a2405..fbc350b 100644
---- a/scilab/modules/matio/src/c/CreateMatlabVariable.h
-+++ b/scilab/modules/matio/src/c/CreateMatlabVariable.h
+--- a/modules/matio/src/c/CreateMatlabVariable.h
++++ b/modules/matio/src/c/CreateMatlabVariable.h
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -3132,10 +3132,10 @@
+int CreateBooleanVariable(void *pvApiCtx, int iVar, matvar_t *matVariable, int * parent, int item_position);
#endif /* !__CREATEMATLABVARIABLE_H__ */
-diff --git a/scilab/modules/matio/src/c/CreateSparseVariable.c b/scilab/modules/matio/src/c/CreateSparseVariable.c
+diff --git a/modules/matio/src/c/CreateSparseVariable.c b/modules/matio/src/c/CreateSparseVariable.c
index ee4c2c4..0edae61 100644
---- a/scilab/modules/matio/src/c/CreateSparseVariable.c
-+++ b/scilab/modules/matio/src/c/CreateSparseVariable.c
+--- a/modules/matio/src/c/CreateSparseVariable.c
++++ b/modules/matio/src/c/CreateSparseVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -3539,10 +3539,10 @@
+
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/CreateStructVariable.c b/scilab/modules/matio/src/c/CreateStructVariable.c
+diff --git a/modules/matio/src/c/CreateStructVariable.c b/modules/matio/src/c/CreateStructVariable.c
index f6dc231..6e5fb29 100644
---- a/scilab/modules/matio/src/c/CreateStructVariable.c
-+++ b/scilab/modules/matio/src/c/CreateStructVariable.c
+--- a/modules/matio/src/c/CreateStructVariable.c
++++ b/modules/matio/src/c/CreateStructVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -3813,10 +3813,10 @@
+ return TRUE;
}
-diff --git a/scilab/modules/matio/src/c/GetCellVariable.c b/scilab/modules/matio/src/c/GetCellVariable.c
+diff --git a/modules/matio/src/c/GetCellVariable.c b/modules/matio/src/c/GetCellVariable.c
index cda3ac2..b45434e 100644
---- a/scilab/modules/matio/src/c/GetCellVariable.c
-+++ b/scilab/modules/matio/src/c/GetCellVariable.c
+--- a/modules/matio/src/c/GetCellVariable.c
++++ b/modules/matio/src/c/GetCellVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -3978,10 +3978,10 @@
- return Mat_VarCreate(name, MAT_C_CELL, MAT_T_CELL, dimensionsVariable->rank, dimensionsVariable->data, cellEntries, 0);
+ return Mat_VarCreate(name, MAT_C_CELL, MAT_T_CELL, dimensionsVariable->rank, pszDims, cellEntries, 0);
}
-diff --git a/scilab/modules/matio/src/c/GetCharVariable.c b/scilab/modules/matio/src/c/GetCharVariable.c
+diff --git a/modules/matio/src/c/GetCharVariable.c b/modules/matio/src/c/GetCharVariable.c
index a8af5f6..b2abce2 100644
---- a/scilab/modules/matio/src/c/GetCharVariable.c
-+++ b/scilab/modules/matio/src/c/GetCharVariable.c
+--- a/modules/matio/src/c/GetCharVariable.c
++++ b/modules/matio/src/c/GetCharVariable.c
@@ -1,13 +1,13 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -4273,10 +4273,10 @@
FREE(piLen);
return NULL;
}
-diff --git a/scilab/modules/matio/src/c/GetDoubleVariable.c b/scilab/modules/matio/src/c/GetDoubleVariable.c
+diff --git a/modules/matio/src/c/GetDoubleVariable.c b/modules/matio/src/c/GetDoubleVariable.c
index 2fdc009..c0baa97 100644
---- a/scilab/modules/matio/src/c/GetDoubleVariable.c
-+++ b/scilab/modules/matio/src/c/GetDoubleVariable.c
+--- a/modules/matio/src/c/GetDoubleVariable.c
++++ b/modules/matio/src/c/GetDoubleVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -4504,10 +4504,10 @@
- return createdVar;
+ return createdVar;
}
-diff --git a/scilab/modules/matio/src/c/GetIntegerVariable.c b/scilab/modules/matio/src/c/GetIntegerVariable.c
+diff --git a/modules/matio/src/c/GetIntegerVariable.c b/modules/matio/src/c/GetIntegerVariable.c
index 909e6ed..3a894de 100644
---- a/scilab/modules/matio/src/c/GetIntegerVariable.c
-+++ b/scilab/modules/matio/src/c/GetIntegerVariable.c
+--- a/modules/matio/src/c/GetIntegerVariable.c
++++ b/modules/matio/src/c/GetIntegerVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -4840,10 +4840,10 @@
- return createdVar;
+ return createdVar;
}
-diff --git a/scilab/modules/matio/src/c/GetMatlabVariable.c b/scilab/modules/matio/src/c/GetMatlabVariable.c
+diff --git a/modules/matio/src/c/GetMatlabVariable.c b/modules/matio/src/c/GetMatlabVariable.c
index a769288..34a906d 100644
---- a/scilab/modules/matio/src/c/GetMatlabVariable.c
-+++ b/scilab/modules/matio/src/c/GetMatlabVariable.c
+--- a/modules/matio/src/c/GetMatlabVariable.c
++++ b/modules/matio/src/c/GetMatlabVariable.c
@@ -16,23 +16,23 @@
#include "sci_types.h"
#include "api_scilab.h"
@@ -4963,10 +4963,10 @@
}
return tmp_res;
-diff --git a/scilab/modules/matio/src/c/GetMatlabVariable.h b/scilab/modules/matio/src/c/GetMatlabVariable.h
+diff --git a/modules/matio/src/c/GetMatlabVariable.h b/modules/matio/src/c/GetMatlabVariable.h
index 7a138ab..2ffa9da 100644
---- a/scilab/modules/matio/src/c/GetMatlabVariable.h
-+++ b/scilab/modules/matio/src/c/GetMatlabVariable.h
+--- a/modules/matio/src/c/GetMatlabVariable.h
++++ b/modules/matio/src/c/GetMatlabVariable.h
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -5109,10 +5109,10 @@
+matvar_t *GetDoubleVariable(void *pvApiCtx, int iVar, const char *name, int matfile_version, int * parent, int item_position);
#endif /* !__GETMATLABVARIABLE_H__ */
-diff --git a/scilab/modules/matio/src/c/GetMlistVariable.c b/scilab/modules/matio/src/c/GetMlistVariable.c
+diff --git a/modules/matio/src/c/GetMlistVariable.c b/modules/matio/src/c/GetMlistVariable.c
index 67f9737..a5336fb 100644
---- a/scilab/modules/matio/src/c/GetMlistVariable.c
-+++ b/scilab/modules/matio/src/c/GetMlistVariable.c
+--- a/modules/matio/src/c/GetMlistVariable.c
++++ b/modules/matio/src/c/GetMlistVariable.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -5287,10 +5287,10 @@
+ return NULL;
}
}
-diff --git a/scilab/modules/matio/src/c/GetSparseVariable.c b/scilab/modules/matio/src/c/GetSparseVariable.c
+diff --git a/modules/matio/src/c/GetSparseVariable.c b/modules/matio/src/c/GetSparseVariable.c
index 2025678..95e909e 100644
---- a/scilab/modules/matio/src/c/GetSparseVariable.c
-+++ b/scilab/modules/matio/src/c/GetSparseVariable.c
+--- a/modules/matio/src/c/GetSparseVariable.c
++++ b/modules/matio/src/c/GetSparseVariable.c
@@ -14,46 +14,57 @@
#include "stack-c.h"
#include "api_scilab.h"
@@ -5533,10 +5533,10 @@
}
else
{
-diff --git a/scilab/modules/matio/src/c/GetStructVariable.c b/scilab/modules/matio/src/c/GetStructVariable.c
+diff --git a/modules/matio/src/c/GetStructVariable.c b/modules/matio/src/c/GetStructVariable.c
index 20d131e..7d21f07 100644
---- a/scilab/modules/matio/src/c/GetStructVariable.c
-+++ b/scilab/modules/matio/src/c/GetStructVariable.c
+--- a/modules/matio/src/c/GetStructVariable.c
++++ b/modules/matio/src/c/GetStructVariable.c
@@ -1,13 +1,13 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -5659,10 +5659,10 @@
- return Mat_VarCreate(name, MAT_C_STRUCT, MAT_T_STRUCT, dimensionsVariable->rank, dimensionsVariable->data, structEntries, 0);
+ return Mat_VarCreate(name, MAT_C_STRUCT, MAT_T_STRUCT, dimensionsVariable->rank, pszDims, structEntries, 0);
}
-diff --git a/scilab/modules/matio/src/c/matfile_manager.c b/scilab/modules/matio/src/c/matfile_manager.c
+diff --git a/modules/matio/src/c/matfile_manager.c b/modules/matio/src/c/matfile_manager.c
index 2ba34db..fe97a78 100644
---- a/scilab/modules/matio/src/c/matfile_manager.c
-+++ b/scilab/modules/matio/src/c/matfile_manager.c
+--- a/modules/matio/src/c/matfile_manager.c
++++ b/modules/matio/src/c/matfile_manager.c
@@ -1,12 +1,12 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
@@ -5816,10 +5816,10 @@
+ /* Return NULL */
}
}
-diff --git a/scilab/modules/matio/tests/nonreg_tests/bug_5462.dia.ref b/scilab/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
+diff --git a/modules/matio/tests/nonreg_tests/bug_5462.dia.ref b/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
index 2b6709b..8fb3d45 100644
---- a/scilab/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
-+++ b/scilab/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
+--- a/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
++++ b/modules/matio/tests/nonreg_tests/bug_5462.dia.ref
@@ -4,7 +4,6 @@
//
// This file is distributed under the same license as the Scilab package.
@@ -5840,10 +5840,10 @@
-loadmatfile('test_matfile.mat','A');
+loadmatfile(TMPDIR + filesep() + "bug_5462.mat", "A");
if (norm(A1 - A)>=10*%eps) then bugmes();quit;end
-diff --git a/scilab/modules/matio/tests/nonreg_tests/bug_5462.tst b/scilab/modules/matio/tests/nonreg_tests/bug_5462.tst
+diff --git a/modules/matio/tests/nonreg_tests/bug_5462.tst b/modules/matio/tests/nonreg_tests/bug_5462.tst
index 9d6a0b4..5497bc4 100644
---- a/scilab/modules/matio/tests/nonreg_tests/bug_5462.tst
-+++ b/scilab/modules/matio/tests/nonreg_tests/bug_5462.tst
+--- a/modules/matio/tests/nonreg_tests/bug_5462.tst
++++ b/modules/matio/tests/nonreg_tests/bug_5462.tst
@@ -17,9 +17,9 @@
// Can not save correctly a sparse matrix in a MAT-file using savematfile.
More information about the debian-science-commits
mailing list