From d60ee438e1aef28e41ec3bb5d34bd5a5113c9ae4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20DAVID?= Date: Mon, 17 Mar 2014 12:46:38 +0100 Subject: [PATCH] * Bug #13267 fixed - Implicit typecasts in scicos.c has been fixed. Thanks to Atri Bhattacharya for the spot. Change-Id: I1c9abdc3d36ca0b43005dbc2f71caa6a45739eff --- scilab/CHANGES_5.5.X | 2 ++ scilab/modules/scicos/.gitignore | 3 --- scilab/modules/scicos/src/c/ddaskr.c | 12 ++++++------ scilab/modules/scicos/src/c/ddaskr.h | 2 +- scilab/modules/scicos/src/c/import.c | 4 ++-- scilab/modules/scicos/src/c/scicos.c | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X index 2a65f7d..4bde6b4 100644 --- a/scilab/CHANGES_5.5.X +++ b/scilab/CHANGES_5.5.X @@ -767,6 +767,8 @@ Scilab Bug Fixes * Bug #13258 fixed - Bad number display in datatips fixed. +* Bug #13267 fixed - Implicit typecasts in scicos.c have been fixed. + * Bug #13271 fixed - plot2d with logarithmic scale and %nan value freezed Scilab. diff --git a/scilab/modules/scicos/.gitignore b/scilab/modules/scicos/.gitignore index 00bdf74..8ee7264 100644 --- a/scilab/modules/scicos/.gitignore +++ b/scilab/modules/scicos/.gitignore @@ -19,9 +19,6 @@ src/modelica_compiler/modelicac.exe src/modelica_compiler/*.obj # - -*.mli - XML2Modelica XML2Modelica.ocamlc xml2modelica.exe diff --git a/scilab/modules/scicos/src/c/ddaskr.c b/scilab/modules/scicos/src/c/ddaskr.c index f1c9c6a..f8e97bf 100644 --- a/scilab/modules/scicos/src/c/ddaskr.c +++ b/scilab/modules/scicos/src/c/ddaskr.c @@ -400,13 +400,13 @@ int DDaskrSetUserData (void * ddaskr_mem, void * User_data) if (ddaskr_mem == NULL) { DDASProcessError(NULL, IDA_MEM_NULL, "DDASKR", "DDaskrSetUserData", MSG_NO_MEM); - return(IDA_MEM_NULL); + return (IDA_MEM_NULL); } ddas_mem = (DDaskrMem) ddaskr_mem; user_data = User_data; - return(IDA_SUCCESS); + return (IDA_SUCCESS); } /* ============================= @@ -480,7 +480,7 @@ int DDaskrSetStopTime (void * ddaskr_mem, realtype tCrit) * Ensure that ddaskr will consider it via flag info[16], and stock it in iwork[33]. */ -int DDaskrSetMaxNumSteps (void * ddaskr_mem, int maxnh) +int DDaskrSetMaxNumSteps (void * ddaskr_mem, long int maxnh) { DDaskrMem ddas_mem = NULL; @@ -756,7 +756,7 @@ int DDaskrSolve (void * ddaskr_mem, realtype tOut, realtype * tOld, N_Vector yOu if (tOld == NULL) { DDASProcessError(ddas_mem, IDA_ILL_INPUT, "DDASKR", "DDaskrSolve", MSG_TRET_NULL); - return(IDA_ILL_INPUT); + return (IDA_ILL_INPUT); } if ((itask != DDAS_NORMAL) && (itask != DDAS_ONE_STEP)) @@ -1026,14 +1026,14 @@ int DDaskrSetErrHandlerFn (void * ddaskr_mem, DDASErrHandlerFn ehFun, void * eh_ if (ddaskr_mem == NULL) { DDASProcessError(NULL, IDA_MEM_NULL, "DDASKR", "DDaskrSetErrHandlerFn", MSG_NO_MEM); - return(IDA_MEM_NULL); + return (IDA_MEM_NULL); } ddas_mem = (DDaskrMem) ddaskr_mem; ehfun = ehFun; - return(IDA_SUCCESS); + return (IDA_SUCCESS); } /* ============================= diff --git a/scilab/modules/scicos/src/c/ddaskr.h b/scilab/modules/scicos/src/c/ddaskr.h index 27116fd..48d38a7 100644 --- a/scilab/modules/scicos/src/c/ddaskr.h +++ b/scilab/modules/scicos/src/c/ddaskr.h @@ -111,7 +111,7 @@ int DDaskrSetMaxStep (void * ddaskr_mem, realtype hmax); int DDaskrSetStopTime (void * ddaskr_mem, realtype tcrit); // Sets the maximum number of steps in an integration interval -int DDaskrSetMaxNumSteps (void * ddaskr_mem, int maxnh); +int DDaskrSetMaxNumSteps (void * ddaskr_mem, long int maxnh); // Sets the maximum number of Jacobian or preconditioner evaluations int DDaskrSetMaxNumJacsIC (void * ddaskr_mem, int maxnj); diff --git a/scilab/modules/scicos/src/c/import.c b/scilab/modules/scicos/src/c/import.c index 39b70fc..6d05167 100644 --- a/scilab/modules/scicos/src/c/import.c +++ b/scilab/modules/scicos/src/c/import.c @@ -900,7 +900,7 @@ void C2F(getblockbylabel)(int *kfun, char **label, int *n) int job = 0; int lab[40]; - nblk = (int)(scicos_imp.nblk); + nblk = scicos_imp.nblk[0]; F2C(cvstr)(n, lab, *label, &job, *n); *kfun = 0; @@ -932,7 +932,7 @@ int C2F(getsciblockbylabel)(int*kfun, int label[], int *n) { return (2); /* undefined import table scicos is not running */ } - nblk = (int)(scicos_imp.nblk); + nblk = scicos_imp.nblk[0]; *kfun = 0; for (k = 0; k < nblk; k++) diff --git a/scilab/modules/scicos/src/c/scicos.c b/scilab/modules/scicos/src/c/scicos.c index 4efc122..18e1252 100644 --- a/scilab/modules/scicos/src/c/scicos.c +++ b/scilab/modules/scicos/src/c/scicos.c @@ -2148,7 +2148,7 @@ static void cossimdaskr(double *told) int (* DAEGetRootInfo) (void*, int*); int (* DAESStolerances) (void*, realtype, realtype); int (* DAEGetConsistentIC) (void*, N_Vector, N_Vector); - int (* DAESetMaxNumSteps) (void*, int*); + int (* DAESetMaxNumSteps) (void*, long int); int (* DAESetMaxNumJacsIC) (void*, int); int (* DAESetMaxNumItersIC) (void*, int); int (* DAESetMaxNumStepsIC) (void*, int); -- 1.7.9.5