occt-7.3.0_vtk_InsertNextTupleValue.diff 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. --- src/IVtkVTK/IVtkVTK_ShapeData.cxx.orig 2018-05-29 11:14:02.000000000 +0100
  2. +++ src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-05-31 14:07:39.166422383 +0100
  3. @@ -81,9 +81,15 @@
  4. vtkIdType aPointIdVTK = thePointId;
  5. myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
  6. const vtkIdType aShapeIDVTK = theShapeID;
  7. +#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
  8. mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
  9. const vtkIdType aType = theMeshType;
  10. myMeshTypes->InsertNextTupleValue (&aType);
  11. +#else
  12. + mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
  13. + const vtkIdType aType = theMeshType;
  14. + myMeshTypes->InsertNextTypedTuple (&aType);
  15. +#endif
  16. }
  17. //================================================================
  18. @@ -98,9 +104,15 @@
  19. vtkIdType aPoints[2] = { thePointId1, thePointId2 };
  20. myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
  21. const vtkIdType aShapeIDVTK = theShapeID;
  22. +#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
  23. mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
  24. const vtkIdType aType = theMeshType;
  25. myMeshTypes->InsertNextTupleValue (&aType);
  26. +#else
  27. + mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
  28. + const vtkIdType aType = theMeshType;
  29. + myMeshTypes->InsertNextTypedTuple (&aType);
  30. +#endif
  31. }
  32. //================================================================
  33. @@ -125,9 +137,15 @@
  34. myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
  35. const vtkIdType aShapeIDVTK = theShapeID;
  36. +#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
  37. mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
  38. const vtkIdType aType = theMeshType;
  39. myMeshTypes->InsertNextTupleValue (&aType);
  40. +#else
  41. + mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
  42. + const vtkIdType aType = theMeshType;
  43. + myMeshTypes->InsertNextTypedTuple (&aType);
  44. +#endif
  45. }
  46. }
  47. @@ -144,7 +162,13 @@
  48. vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
  49. myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
  50. const vtkIdType aShapeIDVTK = theShapeID;
  51. +#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
  52. mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
  53. const vtkIdType aType = theMeshType;
  54. myMeshTypes->InsertNextTupleValue (&aType);
  55. +#else
  56. + mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
  57. + const vtkIdType aType = theMeshType;
  58. + myMeshTypes->InsertNextTypedTuple (&aType);
  59. +#endif
  60. }