aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-10-25 10:36:57 +0000
committerdanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-10-25 10:36:57 +0000
commit8eb5b98a6d8756207917d3372a42773ed08f7dfd (patch)
treeb48c85cebb272dd6a6515862623cb907fc0e0733 /sci-misc/salome-smesh/files
parentAdded support to VTK 5.2 (diff)
downloadsci-8eb5b98a6d8756207917d3372a42773ed08f7dfd.tar.gz
sci-8eb5b98a6d8756207917d3372a42773ed08f7dfd.tar.bz2
sci-8eb5b98a6d8756207917d3372a42773ed08f7dfd.zip
Added support to VTK 5.2
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1322 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-misc/salome-smesh/files')
-rw-r--r--sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch12
-rw-r--r--sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch30
2 files changed, 42 insertions, 0 deletions
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch
new file mode 100644
index 000000000..e7df92bc1
--- /dev/null
+++ b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch
@@ -0,0 +1,12 @@
+diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx
+--- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx 2008-07-25 09:16:09.000000000 +0200
++++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx 2008-07-25 13:09:01.000000000 +0200
+@@ -92,7 +92,7 @@
+ /*!
+ * \brief Return an edge from which hypotheses are propagated from
+ */
+-TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh,
++inline TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh,
+ const TopoDS_Shape& theEdge)
+ {
+ return PropagationMgr::GetSource(theMesh.GetSubMeshContaining( theEdge ));
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch
new file mode 100644
index 000000000..cbb59099d
--- /dev/null
+++ b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch
@@ -0,0 +1,30 @@
+diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+--- src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx 2008-07-25 09:16:09.000000000 +0200
++++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx 2008-10-16 01:33:46.000000000 +0200
+@@ -86,7 +86,7 @@
+
+ namespace SMESH {
+
+- void ReverseConnectivity( vector<int> & ids, int type )
++ void ReverseConnectivity( vector<vtkIdType> & ids, int type )
+ {
+ // for reverse connectivity of other types keeping the first id, see
+ // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900
+@@ -134,7 +134,7 @@
+ reverse( ids.begin(), ids.end() );
+ }
+ else {
+- vector<int> aRevIds( ids.size() );
++ vector<vtkIdType> aRevIds( ids.size() );
+ for ( int i = 0; i < ids.size(); i++)
+ aRevIds[ i ] = ids[ conn[ i ]];
+ ids = aRevIds;
+@@ -597,7 +597,7 @@
+ if (IsValid() && !mySMESHGUI->isActiveStudyLocked()) {
+ myBusy = true;
+
+- vector<int> anIds;
++ vector<vtkIdType> anIds;
+
+ switch (myType) {
+ case QUAD_EDGE: