suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly fix the Tetrahedron node ordering with VTK. This was reported into

Browse Source 
PR #203 back this summer 2016. A memory overwrite is happening if the enum are not
properly sized
This commit is contained in:
Jean-Marie Verdun 2017-03-03 22:10:29 +01:00 committed by Yorik van Havre
parent 19f8fd4c10
commit 732bd85c47
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx vendored
View File

@ -30,7 +30,7 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Type (node, edge, face or volume) of elements /// Type (node, edge, face or volume) of elements
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
enum SMDSAbs_ElementType enum SMDSAbs_ElementType : unsigned long
{ {
SMDSAbs_All, SMDSAbs_All,
SMDSAbs_Node, SMDSAbs_Node,
@ -43,7 +43,7 @@ enum SMDSAbs_ElementType
}; };
/*! enumeration for element geometry type */ /*! enumeration for element geometry type */
enum SMDSAbs_GeometryType enum SMDSAbs_GeometryType : unsigned long
{ {
// 0D element // 0D element
SMDSGeom_POINT, SMDSGeom_POINT,
@ -67,7 +67,8 @@ enum SMDSAbs_GeometryType
}; };
enum SMDSAbs_ElementOrder { enum SMDSAbs_ElementOrder : unsigned long
{
ORDER_ANY, /*! entities of any order */ ORDER_ANY, /*! entities of any order */
ORDER_LINEAR, /*! entities of 1st order */ ORDER_LINEAR, /*! entities of 1st order */
ORDER_QUADRATIC /*! entities of 2nd order */ ORDER_QUADRATIC /*! entities of 2nd order */
@ -76,7 +77,8 @@ enum SMDSAbs_ElementOrder {
/*! /*!
* Enumeration of entity type used in mesh info array * Enumeration of entity type used in mesh info array
*/ */
enum SMDSAbs_EntityType { enum SMDSAbs_EntityType : unsigned long
{
SMDSEntity_Node, SMDSEntity_Node,
SMDSEntity_0D, SMDSEntity_0D,
SMDSEntity_Edge, SMDSEntity_Edge,

3
src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp vendored
View File

@ -63,7 +63,7 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCel
_mesh = mesh; _mesh = mesh;
_cellId = vtkCellId; _cellId = vtkCellId;
_index = 0; _index = 0;
// _type = aType; _type = aType;
//MESSAGE("SMDS_VtkCellInterlacedIterator (UNV)" << _type); //MESSAGE("SMDS_VtkCellInterlacedIterator (UNV)" << _type);
_vtkIdList = vtkIdList::New(); _vtkIdList = vtkIdList::New();
@ -72,7 +72,6 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCel
grid->GetCellPoints((vtkIdType)_cellId, (vtkIdType&)_nbNodes, pts); grid->GetCellPoints((vtkIdType)_cellId, (vtkIdType&)_nbNodes, pts);
_vtkIdList->SetNumberOfIds(_nbNodes); _vtkIdList->SetNumberOfIds(_nbNodes);
const int *ids = 0; const int *ids = 0;
_type = aType;
switch (_type) switch (_type)
{ {
case SMDSEntity_Quad_Edge: case SMDSEntity_Quad_Edge: