fix Windows compilation after scicos commits

Change-Id: I7bacf910b9ee76c27ec2eced241120215b20f997

diff --git a/scilab/modules/hdf5/includes/h5_readDataFromFile.h b/scilab/modules/hdf5/includes/h5_readDataFromFile.h
index e204494..03a57d5 100644 (file)
--- a/scilab/modules/hdf5/includes/h5_readDataFromFile.h
+++ b/scilab/modules/hdf5/includes/h5_readDataFromFile.h
@@ -22,7 +22,7 @@
 #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);
 

diff --git a/scilab/modules/scicos/includes/import.h b/scilab/modules/scicos/includes/import.h
index 07bfcfe..96de87f 100644 (file)
--- a/scilab/modules/scicos/includes/import.h
+++ b/scilab/modules/scicos/includes/import.h
@@ -120,6 +120,6 @@ SCICOS_IMPEXP void C2F(getouttb)(int *nsize, int *nvec, double *outtc);
 
 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__ */

diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_getblocklabel.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_getblocklabel.cpp
index 28ca60d..43fcd35 100644 (file)
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_getblocklabel.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_getblocklabel.cpp
@@ -77,12 +77,12 @@ types::Function::ReturnValue sci_getblocklabel(types::typed_list &in, int _iRetC
             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());
@@ -92,7 +92,6 @@ types::Function::ReturnValue sci_getblocklabel(types::typed_list &in, int _iRetC
     label[labelSize] = '\0';
 
     types::String* Label = new types::String(label);
-    delete[] label;
 
     out.push_back(Label);
     return types::Function::OK;

diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_getscicosvars.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_getscicosvars.cpp
index 94dc2ee..70ba5ad 100644 (file)
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_getscicosvars.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_getscicosvars.cpp
@@ -10,15 +10,10 @@
  *
  */
 
-#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"
@@ -29,15 +24,17 @@
 
 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.
 *
@@ -355,7 +352,7 @@ types::Function::ReturnValue sci_getscicosvars(types::typed_list &in, int _iRetC
             /* 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)
             {
@@ -382,7 +379,7 @@ types::Function::ReturnValue sci_getscicosvars(types::typed_list &in, int _iRetC
             /* 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)
             {
@@ -400,7 +397,7 @@ types::Function::ReturnValue sci_getscicosvars(types::typed_list &in, int _iRetC
             /* 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)
             {
@@ -409,38 +406,38 @@ types::Function::ReturnValue sci_getscicosvars(types::typed_list &in, int _iRetC
 
                 /* 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)
@@ -485,7 +482,7 @@ types::Function::ReturnValue sci_getscicosvars(types::typed_list &in, int _iRetC
             /* 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)

diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_model2blk.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_model2blk.cpp
index 18b3b06..0866188 100644 (file)
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_model2blk.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_model2blk.cpp
@@ -25,7 +25,6 @@
 #include <cstring>
 
 #include "gw_scicos.hxx"
-#include "createblklist.hxx"
 
 #include "internal.hxx"
 #include "function.hxx"
@@ -40,7 +39,6 @@
 extern "C"
 {
 #include "machine.h" /* F2C */
-#include "scicos_block4.h"
 #include "sci_malloc.h"
 #include "sciblk4.h"
 #include "sciblk2.h"
@@ -52,6 +50,9 @@ extern "C"
 
     extern void F2C(sciblk)();
 }
+
+#include "createblklist.hxx"
+
 /*--------------------------------------------------------------------------*/
 //extern int *listentry(int *header, int i);
 //extern int C2F(funnum) (char *fname);

diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_set_blockerror.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_set_blockerror.cpp
index f6e7c59..5cc97a6 100644 (file)
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_set_blockerror.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_set_blockerror.cpp
@@ -84,7 +84,7 @@ types::Function::ReturnValue sci_set_blockerror(types::typed_list &in, int _iRet
         return types::Function::Error;
     }
 
-    set_block_error(pIn->get(0));
+    set_block_error(static_cast<int>(pIn->get(0)));
 
     return types::Function::OK;
 }

diff --git a/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj b/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
index 742df3d..fa4780e 100644 (file)
--- a/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
+++ b/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
@@ -1,4 +1,4 @@
-<?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">
@@ -279,7 +279,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <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" />
@@ -387,4 +386,4 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters b/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
index 5b3ae0f..33e07e1 100644 (file)
--- a/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
+++ b/scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
@@ -131,21 +131,12 @@
     <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>
@@ -315,4 +306,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos/src/c/import.c b/scilab/modules/scicos/src/c/import.c
index d151d41..ed37673 100644 (file)
--- a/scilab/modules/scicos/src/c/import.c
+++ b/scilab/modules/scicos/src/c/import.c
@@ -958,14 +958,14 @@ int C2F(getsciblockbylabel)(int*kfun, int label[], int *n)
     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;
 
@@ -973,13 +973,13 @@ int C2F(getscilabel)(int *kfun, char *label[], int *n)
     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)()

diff --git a/scilab/modules/scicos/src/c/scicos.vcxproj b/scilab/modules/scicos/src/c/scicos.vcxproj
index 936437f..709e8ef 100644 (file)
--- a/scilab/modules/scicos/src/c/scicos.vcxproj
+++ b/scilab/modules/scicos/src/c/scicos.vcxproj
@@ -1,4 +1,4 @@
-<?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">
@@ -163,7 +163,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     </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>
@@ -282,7 +282,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <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" />
@@ -440,4 +439,4 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos/src/c/scicos.vcxproj.filters b/scilab/modules/scicos/src/c/scicos.vcxproj.filters
index 8bbf606..eeb8c8c 100644 (file)
--- a/scilab/modules/scicos/src/c/scicos.vcxproj.filters
+++ b/scilab/modules/scicos/src/c/scicos.vcxproj.filters
@@ -101,9 +101,6 @@
     <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>
@@ -266,9 +263,6 @@
     <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">
@@ -471,4 +465,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos/src/cpp/createblklist.cpp b/scilab/modules/scicos/src/cpp/createblklist.cpp
index 7237bb4..d04a4f3 100644 (file)
--- a/scilab/modules/scicos/src/cpp/createblklist.cpp
+++ b/scilab/modules/scicos/src/cpp/createblklist.cpp
@@ -20,8 +20,6 @@
 * See the file ./license.txt
 */
 /*--------------------------------------------------------------------------*/
-#include "createblklist.hxx"
-
 #include "internal.hxx"
 #include "list.hxx"
 #include "tlist.hxx"
@@ -32,8 +30,9 @@
 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)();

diff --git a/scilab/modules/scicos/src/cpp/sciblk4.cpp b/scilab/modules/scicos/src/cpp/sciblk4.cpp
index fd895b3..2b42d07 100644 (file)
--- a/scilab/modules/scicos/src/cpp/sciblk4.cpp
+++ b/scilab/modules/scicos/src/cpp/sciblk4.cpp
@@ -23,8 +23,6 @@
 #include <cstring>
 #include <cstdio>
 
-#include "createblklist.hxx"
-
 #include "internal.hxx"
 #include "callable.hxx"
 #include "list.hxx"
@@ -41,6 +39,8 @@ extern "C"
 #include "import.h"
 }
 
+#include "createblklist.hxx"
+
 /*--------------------------------------------------------------------------*/
 template <typename T>
 bool sci2var(T* p, void* dest, const int row, const int col)
@@ -286,9 +286,9 @@ void sciblk4(scicos_block* Blocks, const int flag)
 
     switch (flag)
     {
-            /**************************
-            * update continuous state
-            **************************/
+        /**************************
+        * update continuous state
+        **************************/
         case 0:
         {
             if (Blocks->nx != 0)

diff --git a/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj b/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
index 5797aa6..1644e48 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
+++ b/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
@@ -1,4 +1,4 @@
-<?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">
@@ -80,7 +80,7 @@
   <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>
@@ -116,7 +116,7 @@ lib /DEF:"$(ProjectDir)../elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS
     </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>
@@ -150,7 +150,7 @@ lib /DEF:"$(ProjectDir)../elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS
     <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>
@@ -191,7 +191,7 @@ lib /DEF:"$(ProjectDir)../elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS
     <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>
@@ -226,13 +226,13 @@ lib /DEF:"$(ProjectDir)../elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS
     </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" />
@@ -593,6 +593,9 @@ lib /DEF:"$(ProjectDir)../elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS
     <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>
@@ -613,4 +616,4 @@ lib /DEF:"$(ProjectDir)../elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj.filters b/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj.filters
index 09ea085..14a66ae 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj.filters
+++ b/scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj.filters
@@ -38,9 +38,6 @@
     <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>
@@ -974,6 +971,9 @@
     <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">
@@ -1043,4 +1043,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj b/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
index 76e3ca0..64cefee 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
+++ b/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
@@ -1,4 +1,4 @@
-<?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">
@@ -80,7 +80,7 @@
   <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>
@@ -115,7 +115,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </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>
@@ -148,7 +148,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <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>
@@ -188,7 +188,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <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>
@@ -222,13 +222,13 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </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" />
@@ -595,6 +595,9 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <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>
@@ -615,4 +618,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters b/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
index aab5c2d..29950f8 100644 (file)
--- a/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
+++ b/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
@@ -38,9 +38,6 @@
     <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>
@@ -977,6 +974,9 @@
     <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">
@@ -1052,4 +1052,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/scilab/modules/scicos_blocks/src/cpp/fromws_c.cpp b/scilab/modules/scicos_blocks/src/cpp/fromws_c.cpp
index a8de2e0..dd9a659 100644 (file)
--- a/scilab/modules/scicos_blocks/src/cpp/fromws_c.cpp
+++ b/scilab/modules/scicos_blocks/src/cpp/fromws_c.cpp
@@ -23,7 +23,7 @@ extern "C"
 #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"
@@ -109,7 +109,7 @@ SCICOS_BLOCKS_IMPEXP void fromws_c(scicos_block* block, int flag)
 
             /* 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)