Merge from V6_main 06/03/2013

diff --git a/adm_local/cmake_files/FindCADSURF.cmake b/adm_local/cmake_files/FindCADSURF.cmake
index 6822a40296b9b7b2b6a2d65439f6226e1a077959..c567a9a40f484ce6b6a7f4d16786bb4a19217d28 100644 (file)
--- a/adm_local/cmake_files/FindCADSURF.cmake
+++ b/adm_local/cmake_files/FindCADSURF.cmake
@@ -24,14 +24,16 @@ SET(MESHGEMS_CADSURF_INCLUDES ${MESHGEMS_CADSURF_INCLUDES} -I${CADSURF_INCLUDES_
 
 SET(CADSURF_LIBS_PATHS)
 SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib)
+
+SET(suff)
+IF(CMAKE_SIZEOF_VOID_P STREQUAL 8)
+  SET(suff "_64")
+ENDIF()
+
 IF(WINDOWS)
-  SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/WinXP_VC9)
+  SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/WinXP${suff}_VC9)
 ELSE(WINDOWS)
-  IF(CMAKE_SIZEOF_VOID_P STREQUAL 8)
-    SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/Linux_64)
-  ELSE()
-    SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/Linux)
-  ENDIF()
+  SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/Linux${suff})
 ENDIF(WINDOWS)
 
 FIND_LIBRARY(mg-cadsurf mg-cadsurf PATHS ${CADSURF_LIBS_PATHS})

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 69a964074ce0aa48887c07560534c0528468bb34..21be167b614251e6a334dccae7aed443a54eb2f3 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -697,7 +697,7 @@ void BLSURFPlugin_BLSURF::SetParameters(
                                         const BLSURFPlugin_Hypothesis* hyp,
                                         cadsurf_session_t *            css,
                                         precad_session_t *             pcs,
-                                        const TopoDS_Shape&            GeomShape,
+                                        const TopoDS_Shape&            theGeomShape,
                                         bool *                  use_precad
                                        )
 {
@@ -705,7 +705,7 @@ void BLSURFPlugin_BLSURF::SetParameters(
   // Clear map so that it is not stored in the algorithm with old enforced vertices in it
   EnfVertexCoords2EnfVertexList.clear();
   
-   double diagonal               = SMESH_Mesh::GetShapeDiagonalSize( GeomShape );
+   double diagonal               = SMESH_Mesh::GetShapeDiagonalSize( theGeomShape );
    double bbSegmentation         = _gen->GetBoundaryBoxSegmentation();
    int    _physicalMesh          = BLSURFPlugin_Hypothesis::GetDefaultPhysicalMesh();
    int    _geometricMesh         = BLSURFPlugin_Hypothesis::GetDefaultGeometricMesh();
@@ -1139,7 +1139,7 @@ void BLSURFPlugin_BLSURF::SetParameters(
       std::string grpName = BLSURFPlugin_Hypothesis::GetInternalEnforcedVertexAllFacesGroup(hyp);
       MESSAGE("Setting Internal Enforced Vertices");
       gp_Pnt aPnt;
-      TopExp_Explorer exp (GeomShape, TopAbs_FACE);
+      TopExp_Explorer exp (theGeomShape, TopAbs_FACE);
       for (; exp.More(); exp.Next()){
         MESSAGE("Iterating shapes. Shape type is " << exp.Current().ShapeType());
         TopExp_Explorer exp_face (exp.Current(), TopAbs_VERTEX, TopAbs_EDGE);