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

diff --git a/src/CONVERTOR/VISU_IDMapper.cxx b/src/CONVERTOR/VISU_IDMapper.cxx
index 91cf0e5add0ca9c885b7a7fbe90cbdb4ab9cb50e..0ab74a5ae7c661d852be09636ce62432115151ff 100644 (file)
--- a/src/CONVERTOR/VISU_IDMapper.cxx
+++ b/src/CONVERTOR/VISU_IDMapper.cxx
@@ -149,7 +149,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 fd5d3197b17444e63c45aaf0bbf7362d5db9059f..baa1c33c8f1c51f9aff3fb2d6acd36b278e79dcb 100644 (file)
--- a/src/CONVERTOR/VISU_MeshValue.cxx
+++ b/src/CONVERTOR/VISU_MeshValue.cxx
@@ -232,7 +232,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();
@@ -465,7 +465,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 708f3d376c6fdd053484cb46cdf97c7052466381..a3251b5e2fa5770be05851c8bdfe1a5b5502397f 100644 (file)
--- a/src/CONVERTOR/VISU_Structures_impl.hxx
+++ b/src/CONVERTOR/VISU_Structures_impl.hxx
@@ -216,7 +216,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 f7519151270c494dc5d80229e650139bdc94cea6..dfdd2bd9ca39fc41c463c5592c2910a2eb6171a9 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -403,7 +403,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 db19be239f1b122bcfc710d52afa6c53f64502de..c46cc0c3a090be3d902ffb3e04261285c874ce95 100644 (file)
--- a/src/PIPELINE/VISU_DataSetMapperHolder.cxx
+++ b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
@@ -233,7 +233,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 40bfe9d16167f2feb99afabb50640591bf9daa53..4f2b51a39a9cf949b2b091a4a4406f384da85201 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>
 
@@ -229,7 +230,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 e2289a3b41bacfcf1d1882486d3cada8f7c4fc3e..9f80ba32a7e54587e0cc27d8ab2e5c74ac924836 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);
@@ -1684,7 +1684,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(aString.latin1());
             }
           aCell2Connect.push_back(anArray);