Compatibility patch from E.Adam.

diff --git a/src/CONVERTOR/VISU_MeshValue.cxx b/src/CONVERTOR/VISU_MeshValue.cxx
index bf1038150859eacdaaa853e97018ac1f9c29650d..95e0c6462ebeeb29e48b76c94f8a35014e1129ca 100644 (file)
--- a/src/CONVERTOR/VISU_MeshValue.cxx
+++ b/src/CONVERTOR/VISU_MeshValue.cxx
@@ -342,13 +342,13 @@ namespace VISU
             }
           }
 
-          TVTKBasicType aModule = (TVTKBasicType)sqrt(aModules[0]);
+          TVTKBasicType aModule = (TVTKBasicType)sqrt((double)aModules[0]);
           aDataValues[0] = aModule; // init Min
           aDataValues[1] = aModule; // init Max
           aDataValues[2] = aModule; // init Average
 
           for (vtkIdType ig = 0; ig < aNbGauss; ig++) {
-            aModule = (TVTKBasicType)sqrt(aModules[ig]);
+            aModule = (TVTKBasicType)sqrt((double)aModules[ig]);
 
             aDataValues[0] = std::min(TVTKBasicType(aModule), aDataValues[0]); // Min
             aDataValues[1] = std::max(TVTKBasicType(aModule), aDataValues[1]); // Max

diff --git a/src/ENGINE/Makefile.am b/src/ENGINE/Makefile.am
index 0acbfc138c303f6a063fb1f718580931dca3397c..30618c13c77a306ece0314e01db769087e66b9c8 100644 (file)
--- a/src/ENGINE/Makefile.am
+++ b/src/ENGINE/Makefile.am
@@ -35,5 +35,5 @@ dist_libVISUEngine_la_SOURCES= VISU_Engine_i.cc
 libVISUEngine_la_CPPFLAGS= $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \
        -I$(top_builddir)/idl 
 
-libVISUEngine_la_LDFLAGS= $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSalomeNS -lSalomeContainer $(CORBA_LIBS) \
+libVISUEngine_la_LDFLAGS= $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSALOMELocalTrace -lSalomeNS -lSalomeContainer $(CORBA_LIBS) \
        $(top_builddir)/idl/libSalomeIDLVISU.la

diff --git a/src/PIPELINE/VISU_Extractor.cxx b/src/PIPELINE/VISU_Extractor.cxx
index 361f58497cf6a32a9bfd553b417eaa426adbd62a..a3d3f211305003cbc0751ba2fda384b8844c45bf 100644 (file)
--- a/src/PIPELINE/VISU_Extractor.cxx
+++ b/src/PIPELINE/VISU_Extractor.cxx
@@ -104,14 +104,14 @@ vtkFloatingPointType CutValue (vtkFloatingPointType theValue, int theDecimals)
 {
   vtkFloatingPointType v = theValue;
   vtkFloatingPointType aDegree = 0.0;
-  if (abs((long long)v) > 1)
-    aDegree = (long long)log10(abs((long long)v)) + 1;
+  if (abs((long)v) > 1)
+    aDegree = (long)log10((double)abs((long)v)) + 1;
   aDegree = theDecimals - aDegree;
-  //printf("$$$ 1 v = %.20g , aDegree = %lld \n", v, (long long)aDegree);
+  //printf("$$$ 1 v = %.20g , aDegree = %lld \n", v, (long)aDegree);
 
   aDegree = pow(10, aDegree);
-  v = ((vtkFloatingPointType)((long long)(v * aDegree))) / aDegree;
-  //printf("$$$ 2 v = %.20g , aDegree = %lld \n", v, (long long)aDegree);
+  v = ((vtkFloatingPointType)((long)(v * aDegree))) / aDegree;
+  //printf("$$$ 2 v = %.20g , aDegree = %lld \n", v, (long)aDegree);
 
   return v;
 }

diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am
index 50032a928c79759cfc62dc29931248c07a560662..2f3bb8116085fb3b1e29554c0188ce63afb8d893 100644 (file)
--- a/src/VISU_I/Makefile.am
+++ b/src/VISU_I/Makefile.am
@@ -135,6 +135,7 @@ libVISUEngineImpl_la_LDFLAGS= \
        $(BOOST_LIB_SIGNALS) \
        $(BOOST_LIB_THREAD)  \
        $(BOOST_LIB_SYSTEM)  \
+       $(BOOST_LIB_FILESYSTEM)  \
        $(QT_MT_LIBS) \
        $(QWT_LIBS) \
        $(KERNEL_LDFLAGS) \