Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_VtkCellIterator.cxx
diff --git
a/src/SMDS/SMDS_VtkCellIterator.cxx
b/src/SMDS/SMDS_VtkCellIterator.cxx
index 5c6aec32ddb1b2dbaea01f0ee1be646bd175a011..d9a553891c5d304babb2cf10db8e49e4127e8bf6 100644
(file)
--- a/
src/SMDS/SMDS_VtkCellIterator.cxx
+++ b/
src/SMDS/SMDS_VtkCellIterator.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2010-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-25,12
+25,13
@@
_GetVtkNodes::_GetVtkNodes( TVtkIdList& vtkIds,
SMDS_Mesh* mesh,
_GetVtkNodes::_GetVtkNodes( TVtkIdList& vtkIds,
SMDS_Mesh* mesh,
-
int
vtkCellId,
+
vtkIdType
vtkCellId,
SMDSAbs_EntityType type )
{
vtkUnstructuredGrid* grid = mesh->GetGrid();
const std::vector<int>& interlace = SMDS_MeshCell::fromVtkOrder( type );
SMDSAbs_EntityType type )
{
vtkUnstructuredGrid* grid = mesh->GetGrid();
const std::vector<int>& interlace = SMDS_MeshCell::fromVtkOrder( type );
- vtkIdType npts, *pts;
+ vtkIdType npts;
+ vtkIdType const *pts(nullptr);
grid->GetCellPoints( vtkCellId, npts, pts );
vtkIds.resize( npts );
if ( interlace.empty() )
grid->GetCellPoints( vtkCellId, npts, pts );
vtkIds.resize( npts );
if ( interlace.empty() )
@@
-46,11
+47,12
@@
_GetVtkNodes::_GetVtkNodes( TVtkIdList& vtkIds,
_GetVtkNodesToUNV::_GetVtkNodesToUNV( TVtkIdList& vtkIds,
SMDS_Mesh* mesh,
_GetVtkNodesToUNV::_GetVtkNodesToUNV( TVtkIdList& vtkIds,
SMDS_Mesh* mesh,
-
int
vtkCellId,
+
vtkIdType
vtkCellId,
SMDSAbs_EntityType type )
{
vtkUnstructuredGrid* grid = mesh->GetGrid();
SMDSAbs_EntityType type )
{
vtkUnstructuredGrid* grid = mesh->GetGrid();
- vtkIdType npts, *pts;
+ vtkIdType npts;
+ vtkIdType const *pts(nullptr);
grid->GetCellPoints( vtkCellId, npts, pts );
const int *ids = 0;
switch ( type )
grid->GetCellPoints( vtkCellId, npts, pts );
const int *ids = 0;
switch ( type )
@@
-131,7
+133,7
@@
_GetVtkNodesToUNV::_GetVtkNodesToUNV( TVtkIdList& vtkIds,
_GetVtkNodesPolyh::_GetVtkNodesPolyh( TVtkIdList& vtkIds,
SMDS_Mesh* mesh,
_GetVtkNodesPolyh::_GetVtkNodesPolyh( TVtkIdList& vtkIds,
SMDS_Mesh* mesh,
-
int
vtkCellId,
+
vtkIdType
vtkCellId,
SMDSAbs_EntityType type )
{
vtkUnstructuredGrid* grid = mesh->GetGrid();
SMDSAbs_EntityType type )
{
vtkUnstructuredGrid* grid = mesh->GetGrid();
@@
-140,7
+142,7
@@
_GetVtkNodesPolyh::_GetVtkNodesPolyh( TVtkIdList& vtkIds,
case SMDSEntity_Polyhedra:
{
vtkIdType nFaces = 0;
case SMDSEntity_Polyhedra:
{
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
grid->GetFaceStream( vtkCellId, nFaces, ptIds );
int id = 0, nbNodesInFaces = 0;
for ( int i = 0; i < nFaces; i++ )
grid->GetFaceStream( vtkCellId, nFaces, ptIds );
int id = 0, nbNodesInFaces = 0;
for ( int i = 0; i < nFaces; i++ )