aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch')
-rw-r--r--sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch78
1 files changed, 0 insertions, 78 deletions
diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
deleted file mode 100644
index e0b4e8778..000000000
--- a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -aur src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx
---- src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-07-25 09:16:09.000000000 +0200
-+++ src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-10-16 22:11:49.000000000 +0200
-@@ -88,7 +88,7 @@
- static Standard_Real HatcherConfusion2d = 1.e-8 ;
- static Standard_Real HatcherConfusion3d = 1.e-8 ;
-
--static Standard_Integer lastVTKpoint = 0;
-+static vtkIdType lastVTKpoint = 0;
- static Standard_Integer PlotCount = 0;
- static Standard_Real IsoRatio = 1.001;
- static Standard_Integer MaxPlotCount = 5;
-@@ -483,9 +483,9 @@
- {
- float coord[3];
- coord[0] = P.X(); coord[1] = P.Y(); coord[2] = P.Z();
-- Standard_Integer NewVTKpoint = Pts->InsertNextPoint(coord);
-+ vtkIdType NewVTKpoint = Pts->InsertNextPoint(coord);
-
-- int pts[2];
-+ vtkIdType pts[2];
- pts[0] = lastVTKpoint;
- pts[1] = NewVTKpoint;
-
-@@ -751,7 +751,7 @@
- aP2 = theNodesP(nbnodes);
-
- float coord[3];
-- int pts[2];
-+ vtkIdType pts[2];
-
- for(int j=1;j<nbnodes;j++) {
- gp_Pnt pt1 = theNodesP(j);
-@@ -783,7 +783,7 @@
- aP2 = theNodesPoly(nbnodes);
-
- float coord[3];
-- int pts[2];
-+ vtkIdType pts[2];
-
- for(int j=1;j<nbnodes;j++) {
- Standard_Integer id1 = Nodesidx(j);
-@@ -854,12 +854,12 @@
- float coord[3];
- coord[0] = xo; coord[1] = yo; coord[2] = zo;
-
-- int ptLoc = Pts->InsertNextPoint(coord);
-- int ptFirst = 0;
-- int ptPrev = 0;
-- int ptCur = 0;
-+ vtkIdType ptLoc = Pts->InsertNextPoint(coord);
-+ vtkIdType ptFirst = 0;
-+ vtkIdType ptPrev = 0;
-+ vtkIdType ptCur = 0;
-
-- int pts[2];
-+ vtkIdType pts[2];
-
- int NbPoints = 15;
- for (int i = 1; i <= NbPoints; i++, ptPrev = ptCur)
-@@ -947,7 +947,7 @@
-
- gp_Pnt P = BRep_Tool::Pnt( aVertex );
- float delta = 1, coord[3];
-- int pts[2];
-+ vtkIdType pts[2];
- // insert pt
- ZERO_COORD; coord[0] = +delta;
- pts[0] = Pts->InsertNextPoint(coord);
-@@ -1026,7 +1026,7 @@
- Standard_Integer N1,N2,N3;
- Triangles(i).Get(N1,N2,N3);
-
-- int pts[3];
-+ vtkIdType pts[3];
- pts[0] = N1-1; pts[1] = N2-1; pts[2] = N3-1;
- Cells->InsertNextCell(3,pts);
-