Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 610362 | Differences between
and this patch

Collapse All | Expand All

(-)src/IVtkVTK/IVtkVTK_ShapeData.cxx.orig (+24 lines)
Lines 81-89 Link Here
81
  vtkIdType aPointIdVTK = thePointId;
81
  vtkIdType aPointIdVTK = thePointId;
82
  myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
82
  myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
83
  const vtkIdType aShapeIDVTK = theShapeID;
83
  const vtkIdType aShapeIDVTK = theShapeID;
84
#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
84
  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
85
  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
85
  const vtkIdType aType = theMeshType;
86
  const vtkIdType aType = theMeshType;
86
  myMeshTypes->InsertNextTupleValue (&aType);
87
  myMeshTypes->InsertNextTupleValue (&aType);
88
#else
89
  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
90
  const vtkIdType aType = theMeshType;
91
  myMeshTypes->InsertNextTypedTuple (&aType);
92
#endif
87
}
93
}
88
94
89
//================================================================
95
//================================================================
Lines 98-106 Link Here
98
  vtkIdType aPoints[2] = { thePointId1, thePointId2 };
104
  vtkIdType aPoints[2] = { thePointId1, thePointId2 };
99
  myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
105
  myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
100
  const vtkIdType aShapeIDVTK = theShapeID;
106
  const vtkIdType aShapeIDVTK = theShapeID;
107
#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
101
  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
108
  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
102
  const vtkIdType aType = theMeshType;
109
  const vtkIdType aType = theMeshType;
103
  myMeshTypes->InsertNextTupleValue (&aType);
110
  myMeshTypes->InsertNextTupleValue (&aType);
111
#else
112
  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
113
  const vtkIdType aType = theMeshType;
114
  myMeshTypes->InsertNextTypedTuple (&aType);
115
#endif
104
}
116
}
105
117
106
//================================================================
118
//================================================================
Lines 125-133 Link Here
125
137
126
    myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
138
    myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
127
    const vtkIdType aShapeIDVTK = theShapeID;
139
    const vtkIdType aShapeIDVTK = theShapeID;
140
#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
128
    mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
141
    mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
129
    const vtkIdType aType = theMeshType;
142
    const vtkIdType aType = theMeshType;
130
    myMeshTypes->InsertNextTupleValue (&aType);
143
    myMeshTypes->InsertNextTupleValue (&aType);
144
#else
145
    mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
146
    const vtkIdType aType = theMeshType;
147
    myMeshTypes->InsertNextTypedTuple (&aType);
148
#endif
131
  }
149
  }
132
}
150
}
133
151
Lines 144-150 Link Here
144
  vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
162
  vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
145
  myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
163
  myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
146
  const vtkIdType aShapeIDVTK = theShapeID;
164
  const vtkIdType aShapeIDVTK = theShapeID;
165
#if (VTK_MAJOR_VERSION < 7 ) || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION == 0)
147
  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
166
  mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
148
  const vtkIdType aType = theMeshType;
167
  const vtkIdType aType = theMeshType;
149
  myMeshTypes->InsertNextTupleValue (&aType);
168
  myMeshTypes->InsertNextTupleValue (&aType);
169
#else
170
  mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
171
  const vtkIdType aType = theMeshType;
172
  myMeshTypes->InsertNextTypedTuple (&aType);
173
#endif
150
}
174
}

Return to bug 610362