#define sci_void 0
char* getScilabVersionAttribute(int _iFile);
-int getSODFormatAttribute(int _iFile);
+HDF5_SCILAB_IMPEXP int getSODFormatAttribute(int _iFile);
HDF5_SCILAB_IMPEXP int isComplexData(int _iDatasetId);
SCICOS_IMPEXP void C2F(getlabel)(int *kfun, char *label, int *n);
-SCICOS_IMPEXP int C2F(getscilabel)(int *kfun, char *label[], int *n);
+SCICOS_IMPEXP int getscilabel(int *kfun, char *label, int *n);
#endif /* __IMPORT_H__ */
Scierror(999, _("%s: Wrong size for input argument #%d : A scalar expected.\n"), funname.data(), 1);
return types::Function::Error;
}
- blockNumber = BlockNumber->get(0);
+ blockNumber = static_cast<int>(BlockNumber->get(0));
}
int labelSize;
- char* label = new char[100];
- int ierr = C2F(getscilabel)(&blockNumber, &label, &labelSize);
+ char label[100];
+ int ierr = getscilabel(&blockNumber, label, &labelSize);
if (ierr != 0)
{
Scierror(999, _("%s: scicosim is not running.\n"), funname.data());
label[labelSize] = '\0';
types::String* Label = new types::String(label);
- delete[] label;
out.push_back(Label);
return types::Function::OK;
*
*/
-#include <cstring>
#include <string>
#include <vector>
#include "gw_scicos.hxx"
-#include "il_state.hxx"
-#include "il_sim.hxx"
-#include "createblklist.hxx"
-
#include "internal.hxx"
#include "types.hxx"
#include "double.hxx"
extern "C"
{
-#include "import.h"
#include "sciprint.h"
-#include "scicos_block4.h"
#include "charEncoding.h"
-
#include "Scierror.h"
#include "localization.h"
+#include "import.h"
}
+#include "il_state.hxx"
+#include "il_sim.hxx"
+#include "createblklist.hxx"
+
/*--------------------------------------------------------------------------*/
/* getscicosvars interface routine retrieves some information during simulation.
*
/* Retrieve dims and 'prt' of asked array with getscicosvarsfromimport() */
void* ptr = nullptr;
int nv, mv;
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
if (ok)
{
/* Retrieve dims and 'prt' of asked array with getscicosvarsfromimport() */
void* ptr = nullptr;
int nv, mv;
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
if (ok)
{
/* Retrieve scicos_block 'prt' of asked array with getscicosvarsfromimport() */
void* ptr = nullptr;
int nv, mv;
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
if (ok)
{
/* Retrieve 'nblk' by import structure */
strcpy(field, "nblk");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
int nblk = ((int*)ptr)[0];
/* Retrieve 'ng' by import structure */
strcpy(field, "ng");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
//int ng = ((int*)ptr)[0];
/* Retrieve 'xptr' by import structure */
strcpy(field, "xptr");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
int* xptr = ((int*)ptr);
/* Retrieve 'zcptr' by import structure */
strcpy(field, "zcptr");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
int* zcptr = ((int*)ptr);
/* Retrieve 'x' and 'xd' by import structure */
strcpy(field, "x");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
double* x = ((double*)ptr);
//double* xd = &x[xptr[nblk] - 1];
/* Retrieve 'g' by import structure */
strcpy(field, "g");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
double* g = ((double*)ptr);
/* Retrieve 'funtyp' by import structure */
strcpy(field, "funtyp");
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
//int* funtyp = ((int*)ptr);
for (int k = 0; k < nblk; ++k)
/* Retrieve dims and prt of asked array with getscicosvarsfromimport */
void* ptr = nullptr;
int nv, mv;
- ok = getscicosvarsfromimport(field, &ptr, &nv, &mv);
+ ok = getscicosvarsfromimport(field, &ptr, &nv, &mv) != 0;
/* Check 'ok' flag */
if (ok == true)
#include <cstring>
#include "gw_scicos.hxx"
-#include "createblklist.hxx"
#include "internal.hxx"
#include "function.hxx"
extern "C"
{
#include "machine.h" /* F2C */
-#include "scicos_block4.h"
#include "sci_malloc.h"
#include "sciblk4.h"
#include "sciblk2.h"
extern void F2C(sciblk)();
}
+
+#include "createblklist.hxx"
+
/*--------------------------------------------------------------------------*/
//extern int *listentry(int *header, int i);
//extern int C2F(funnum) (char *fname);
return types::Function::Error;
}
- set_block_error(pIn->get(0));
+ set_block_error(static_cast<int>(pIn->get(0)));
return types::Function::OK;
}
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<ClCompile Include="..\..\..\sci_gateway\cpp\sci_vec2var.cpp" />
<ClCompile Include="..\..\..\sci_gateway\c\sci_loadScicos.c" />
<ClCompile Include="..\..\..\sci_gateway\cpp\sci_validvar.cpp" />
- <ClCompile Include="..\..\cpp\copyvarfromtlist.cpp" />
<ClCompile Include="..\..\cpp\il_sim.cpp" />
<ClCompile Include="..\..\cpp\il_state.cpp" />
<ClCompile Include="..\..\cpp\createblklist.cpp" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
<ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_blockerror.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\sci_gateway\cpp\sci_set_xproperty.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\sci_gateway\cpp\sci_sig2data.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\sci_gateway\cpp\sci_var2vec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sci_gateway\cpp\sci_vec2var.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\cpp\copyvarfromtlist.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\cpp\var2vec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
return 0;
}
/*--------------------------------------------------------------------------*/
-int C2F(getscilabel)(int *kfun, char *label[], int *n)
+int getscilabel(int *kfun, char *label, int *n)
{
int k, i;
int *u, *y;
if (scicos_imp.x == (double *)NULL)
{
- return (2); /* undefined import table scicos is not running */
+ return 2; /* undefined import table scicos is not running */
}
k = *kfun;
if (*n > 0 )
{
u = (char **) & (scicos_imp.iz[scicos_imp.izptr[k - 1] - 1]);
- y = label;
+ y = &label;
for (i = 0; i < *n; i++)
{
*(y++) = *(u++);
}
}
- return (0);
+ return 0;
}
/*--------------------------------------------------------------------------*/
int C2F(getcurblock)()
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
</PreBuildEvent>
<ClCompile>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <WholeProgramOptimization>false</WholeProgramOptimization>=
+ <WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>.;../../includes;../cpp/;../cpp/model;../cpp/view_scilab;../scicos_sundials/include;../scicos_sundials/src/ida;../scicos_sundials/include/sundials;../../../../libs/intl;../../../../libs/Eigen/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../../../action_binding/includes;../../../intersci/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;../../../ast/includes/parse;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ClCompile Include="..\cpp\extractblklist.cpp" />
<ClCompile Include="..\cpp\sciblk2.cpp" />
<ClCompile Include="..\cpp\sciblk4.cpp" />
- <ClCompile Include="..\cpp\copyvarfromtlist.cpp" />
<ClCompile Include="..\cpp\var2vec.cpp" />
<ClCompile Include="..\cpp\vec2var.cpp" />
<ClCompile Include="..\cpp\Controller.cpp" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
<ClCompile Include="scilab5_needed_stubs.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\cpp\copyvarfromtlist.cpp">
- <Filter>Source Files\MVC</Filter>
- </ClCompile>
<ClCompile Include="..\cpp\var2vec.cpp">
<Filter>Source Files\MVC</Filter>
</ClCompile>
<ClCompile Include="..\..\sci_gateway\cpp\sci_callblk.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\sci_gateway\cpp\sci_model2blk.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\includes\dynlib_scicos.h">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
* See the file ./license.txt
*/
/*--------------------------------------------------------------------------*/
-#include "createblklist.hxx"
-
#include "internal.hxx"
#include "list.hxx"
#include "tlist.hxx"
extern "C"
{
#include "import.h"
-#include "scicos_block4.h"
}
+
+#include "createblklist.hxx"
/*--------------------------------------------------------------------------*/
//extern void str2sci(char** x, int n, int m); /* core/src/c/str2sci.h */
//extern void C2F(itosci)();
#include <cstring>
#include <cstdio>
-#include "createblklist.hxx"
-
#include "internal.hxx"
#include "callable.hxx"
#include "list.hxx"
#include "import.h"
}
+#include "createblklist.hxx"
+
/*--------------------------------------------------------------------------*/
template <typename T>
bool sci2var(T* p, void* dest, const int row, const int col)
switch (flag)
{
- /**************************
- * update continuous state
- **************************/
+ /**************************
+ * update continuous state
+ **************************/
case 0:
{
if (Blocks->nx != 0)
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../../libs/hdf5/include;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;../../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../../libs/hdf5/include;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;../../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<ClCompile>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../../libs/hdf5/include;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;../../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<ClCompile>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../src/jni;../../../../../libs/intl;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../../libs/hdf5/include;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../windows_tools/includes;../../../../jvm/includes;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../ast/includes/operations;../../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\cpp\fromws_c.cpp" />
<ClCompile Include="..\..\cpp\HelpersCLI.cpp" />
<ClCompile Include="..\absblk.c" />
<ClCompile Include="..\absolute_value.c" />
<ClCompile Include="..\acos_blk.c" />
<ClCompile Include="..\acosh_blk.c" />
<ClCompile Include="..\..\cpp\affich2.cpp" />
- <ClCompile Include="..\..\cpp\fromws.cpp" />
<ClCompile Include="..\..\cpp\scoUtils.cpp" />
<ClCompile Include="..\andlog.c" />
<ClCompile Include="..\asin_blk.c" />
<ProjectReference Include="..\..\..\..\graphic_objects\src\c\graphic_objects.vcxproj">
<Project>{30f9ee41-587b-4618-8de7-698d3fba4985}</Project>
</ProjectReference>
+ <ProjectReference Include="..\..\..\..\hdf5\src\c\hdf5.vcxproj">
+ <Project>{a824ea62-af07-4f43-9036-0e63990556bd}</Project>
+ </ProjectReference>
<ProjectReference Include="..\..\..\..\jvm\libjvm.vcxproj">
<Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
<ClCompile Include="..\..\cpp\affich2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\cpp\fromws.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\andlog.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cpp\HelpersCLI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\cpp\fromws_c.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\includes\blocks.h">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../libs/intl;../../../../libs/hdf5/include;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../libs/intl;../../../../libs/hdf5/include;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<ClCompile>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK32)/include;$(SCILAB_JDK32)/include/win32;../../../../libs/intl;../../../../libs/hdf5/include;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<ClCompile>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../src/jni;$(SCILAB_JDK64)/include;$(SCILAB_JDK64)/include/win32;../../../../libs/intl;../../../../libs/hdf5/include;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../windows_tools/includes;../../../jvm/includes;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../ast/includes/operations;../../../hdf5/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\cpp\fromws_c.cpp" />
<ClCompile Include="..\cpp\HelpersJNI.cpp" />
<ClCompile Include="absblk.c" />
<ClCompile Include="absolute_value.c" />
<ClCompile Include="acos_blk.c" />
<ClCompile Include="acosh_blk.c" />
<ClCompile Include="..\cpp\affich2.cpp" />
- <ClCompile Include="..\cpp\fromws.cpp" />
<ClCompile Include="..\cpp\scoUtils.cpp" />
<ClCompile Include="..\jni\AfficheBlock.cpp" />
<ClCompile Include="andlog.c" />
<ProjectReference Include="..\..\..\graphic_objects\src\c\graphic_objects.vcxproj">
<Project>{30f9ee41-587b-4618-8de7-698d3fba4985}</Project>
</ProjectReference>
+ <ProjectReference Include="..\..\..\hdf5\src\c\hdf5.vcxproj">
+ <Project>{a824ea62-af07-4f43-9036-0e63990556bd}</Project>
+ </ProjectReference>
<ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
<Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
<ClCompile Include="..\cpp\affich2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\cpp\fromws.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\jni\AfficheBlock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\HelpersJNI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\cpp\fromws_c.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\jni\AfficheBlock.hxx">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
#include "scicos_block4.h"
#include "scicos_evalhermite.h"
#include "scicos.h"
-#include "sci_mem_alloc.h" /* FREE */
+#include "sci_malloc.h"
#include "h5_fileManagement.h"
#include "h5_readDataFromFile.h"
#include "h5_attributeConstants.h"
/* Path to "TMPDIR/Workspace/" */
const char* filePrefix = "TMPDIR/Workspace/";
- const int prefixSize = strlen(filePrefix);
+ const int prefixSize = static_cast<int>(strlen(filePrefix));
char FName[100];
for (int i = 0; i < Fnlength; ++i)