0020062: [CEA 295] Type coherence in *.i files

diff --git a/src/CONVERTOR/VISU_IDMapper.cxx b/src/CONVERTOR/VISU_IDMapper.cxx
index d278169b5ced927b535962619981c5a936b3b932..c40ede51a6c21395339eb4715d729840275694d7 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.cxx
+++ b/src/CONVERTOR/VISU_IDMapper.cxx
@@ -150,7 +150,7 @@ namespace VISU
 
   vtkCell* 
   TIDMapper
-  ::GetElemCell(int theObjID)
+  ::GetElemCell(vtkIdType theObjID)
   {
     vtkIdType aVtkID = GetElemVTKID(theObjID);
     return GetOutput()->GetCell(aVtkID);

diff --git a/src/CONVERTOR/VISU_MeshValue.cxx b/src/CONVERTOR/VISU_MeshValue.cxx
index a8e47fd5b1077c8b0ecd337d5f750680fa4f7900..502cbb0b4b98d0b139aa6fb5197608328ec5fc36 100644 (file)
--- a/src/CONVERTOR/VISU_MeshValue.cxx
+++ b/src/CONVERTOR/VISU_MeshValue.cxx
@@ -233,7 +233,7 @@ namespace VISU
            const PValForTimeImpl& theValForTime)
     {
       vtkIdType aNbComp = theField->myNbComp;
-      vtkIdType aSize = std::max(3, aNbComp);
+      vtkIdType aSize = std::max(vtkIdType(3), aNbComp);
       TVector<TVTKBasicType> aDataValues(aSize);
       
       const TGeom2MeshValue& aGeom2MeshValue = theValForTime->GetGeom2MeshValue();
@@ -466,7 +466,7 @@ namespace VISU
            const PValForTimeImpl& theValForTime)
     {
       vtkIdType aNbComp = theField->myNbComp;
-      vtkIdType aSize = std::max(3, aNbComp);
+      vtkIdType aSize = std::max(vtkIdType(3), aNbComp);
       TVector<TVTKBasicType> aDataValues(aSize);
 
       const TGeom2MeshValue& aGeom2MeshValue = theValForTime->GetGeom2MeshValue();

diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx
index 0bb31225905cd2227fc397aa923ca109cb151ecb..3140245f1ab358a1595941ffdcc647449740e0c1 100644 (file)
--- a/src/CONVERTOR/VISU_Structures_impl.hxx
+++ b/src/CONVERTOR/VISU_Structures_impl.hxx
@@ -219,7 +219,7 @@ namespace VISU
     //! Get object number of mesh cell by its VTK one
     virtual 
     vtkIdType 
-    GetElemObjID(int theVtkI) const;
+    GetElemObjID(vtkIdType theVtkI) const;
 
     //! Get cell VTK ID for corresponding object ID
     virtual

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 2f829d0136ca58da83e4250043acbd88e225c644..2f0801ddc2a59bb533857794942929b6305eb19a 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -564,7 +564,7 @@ VISU_Actor
 
 vtkFloatingPointType*
 VISU_Actor
-::GetNodeCoord(int theObjID)
+::GetNodeCoord(vtkIdType theObjID)
 {
   if(myIsVTKMapping)
     return Superclass::GetNodeCoord(theObjID);

diff --git a/src/PIPELINE/SALOME_ExtractGeometry.cxx b/src/PIPELINE/SALOME_ExtractGeometry.cxx
index 7ebfe86145ce159a668829a30ae233974d425e59..92e952856d2b6fa218f37305934d4afa82900e34 100755 (executable)
--- a/src/PIPELINE/SALOME_ExtractGeometry.cxx
+++ b/src/PIPELINE/SALOME_ExtractGeometry.cxx
@@ -131,7 +131,7 @@ SALOME_ExtractGeometry
 //----------------------------------------------------------------------------
 vtkIdType
 SALOME_ExtractGeometry
-::GetElemObjId(int theVtkID)
+::GetElemObjId(vtkIdType theVtkID)
 {
   if(!myStoreMapping || myIsDoneShallowCopy)
     return theVtkID;
@@ -145,7 +145,7 @@ SALOME_ExtractGeometry
 
 vtkIdType
 SALOME_ExtractGeometry
-::GetNodeObjId(int theVtkID)
+::GetNodeObjId(vtkIdType theVtkID)
 {
   if(!myStoreMapping || myIsDoneShallowCopy)
     return theVtkID;

diff --git a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx
index b21bd5427fedf47c23792a4531a44b62e1ea98b9..37c2dc699e06613876ed2a67edea99e30b15fdd0 100644 (file)
--- a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx
+++ b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx
@@ -123,7 +123,7 @@ SALOME_ExtractPolyDataGeometry
 //----------------------------------------------------------------------------
 vtkIdType
 SALOME_ExtractPolyDataGeometry
-::GetElemObjId(int theVtkID)
+::GetElemObjId(vtkIdType theVtkID)
 {
   if(!myStoreMapping || myIsDoneShallowCopy)
     return theVtkID;
@@ -137,7 +137,7 @@ SALOME_ExtractPolyDataGeometry
 
 vtkIdType
 SALOME_ExtractPolyDataGeometry
-::GetNodeObjId(int theVtkID)
+::GetNodeObjId(vtkIdType theVtkID)
 {
   if(!myStoreMapping || myIsDoneShallowCopy)
     return theVtkID;

diff --git a/src/PIPELINE/VISU_DataSetMapperHolder.cxx b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
index 38ed76f0eee6d40a74bbfb661036dc323079763c..88dccf477b1c53a40d1e0ab874cf449834ccf4e0 100644 (file)
--- a/src/PIPELINE/VISU_DataSetMapperHolder.cxx
+++ b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
@@ -234,7 +234,7 @@ VISU_DataSetMapperHolder
 //----------------------------------------------------------------------------
 vtkFloatingPointType* 
 VISU_DataSetMapperHolder
-::GetNodeCoord(int theObjID)
+::GetNodeCoord(vtkIdType theObjID)
 {
   return Superclass::GetNodeCoord(theObjID);
 }

diff --git a/src/PIPELINE/VISU_PipeLine.cxx b/src/PIPELINE/VISU_PipeLine.cxx
index b41d8aad8c898293bbe8f3716d981b2098986ce8..9a7d2e2ee7cb53606d2ee8f92ee56b7e9397921e 100644 (file)
--- a/src/PIPELINE/VISU_PipeLine.cxx
+++ b/src/PIPELINE/VISU_PipeLine.cxx
@@ -32,6 +32,7 @@
 #include <vtkObjectFactory.h>
 #include <vtkPlane.h>
 
+#include <climits>
 #include <float.h>
 #include <algorithm>
 
@@ -230,7 +231,7 @@ VISU_PipeLine
 //----------------------------------------------------------------------------
 vtkFloatingPointType* 
 VISU_PipeLine
-::GetNodeCoord(int theObjID)
+::GetNodeCoord(vtkIdType theObjID)
 {
   return GetMapperHolder()->GetNodeCoord(theObjID);
 }

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index d969aed3c01d5cfd0f042e577e7693ebde024bb3..62e1243295236e22b3f105a59957b0b73fe5c9a2 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -886,7 +886,7 @@ VISU_MEDConvertor
          if(MYDEBUG) 
            MESSAGE("VISU_MEDConvertor::Build - Support isOnAllElements = '"<<aSupportName<<
                    "' aVEntity = "<<aVEntity);
-         int aNbCells, aCellsSize;
+         vtkIdType aNbCells, aCellsSize;
          //Check, if there is any data on the support?
          if(aVEntity == VISU::NODE_ENTITY){
            aMesh->myNbPoints = aMeshOnSupport->getNumberOfNodes();
@@ -934,7 +934,7 @@ VISU_MEDConvertor
            continue;
          VISU::PCMeshOnEntity aMeshOnEntity = aMeshOnEntityMapIter->second;
 
-         int aNbCells = aMeshOnEntity->myNbCells, aCellsSize = aMeshOnEntity->myCellsSize;
+         vtkIdType aNbCells = aMeshOnEntity->myNbCells, aCellsSize = aMeshOnEntity->myCellsSize;
          CORBA::Boolean anIsOnAllElements = aMEDSupport->isOnAllElements();
          if(!anIsOnAllElements)
            ::GetCellsSize(aNbCells,aCellsSize,aMEDFamily);
@@ -1685,7 +1685,7 @@ VISU_MEDConvertor
           for (int k = 0; k < aVNbNodes; k++) 
             if(anArray[k] < 0 || aNbPoints <= anArray[k]){
               static QString aString;
-              aString.sprintf("LoadCellsOnEntity >> aNbPoints(%d) <= anArray[%d][%d]=%d < 0 !!!",aNbPoints,iElem,k,anArray[k]);
+              aString.sprintf("LoadCellsOnEntity >> aNbPoints(%d) <= anArray[%d][%d]=%d < 0 !!!",int(aNbPoints),iElem,k,anArray[k]);
               throw std::runtime_error((const char*)aString.toLatin1());
             }
           aCell2Connect.push_back(anArray);