]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
projects / tools / sat_salome.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1ce58bc)
bos #43522 [EDF30827]:Integration of ParaView patch for 9.14.0 which fixes a crash...
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 14 Nov 2024 16:40:11 +0000 (17:40 +0100)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 14 Nov 2024 16:40:11 +0000 (17:40 +0100)
products/ParaView.pyconf patch | blob | history
products/patches/paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch patch | blob | history

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 45616e849facbb27719119e30b83a36425937830..afd4dc566a73f7053f564f403ce42eca04861b42 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -270,7 +270,8 @@ version_5_11_0 :
                'paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -296,7 +297,8 @@ version_5_11_0_int32 :
     patches : [
                'paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -336,7 +338,8 @@ version_5_11_0_win :
                'paraview-5.11.0.p004-vtkUniformHyperTreeGrid.patch',
                'paraview-5.11.0.p006-GIL.patch',
                'paraview-5.11.0.p009-openturns-1.21.patch',
-               'paraview-5.11.0.p0011-add_dll_directory.patch'
+               'paraview-5.11.0.p0011-add_dll_directory.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
 }
 
@@ -362,7 +365,8 @@ version_5_11_0_win_dbg :
                'paraview-5.11.0.p004-vtkUniformHyperTreeGrid.patch',
                'paraview-5.11.0.p005-vtkPython-debug.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
 }
 
@@ -373,8 +377,9 @@ version_5_11_0_MPI :
     patches : ['paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
-              ]
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
+                ]
     depend : [
               'Python',
               'hdf5',
@@ -399,7 +404,8 @@ version_5_11_0_MPI_LATA_64BITS_IDS :
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-0012-LATA_64BITS_IDS.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -428,7 +434,8 @@ version_5_11_0_MPI_UB24_04 :
                'paraview-5.11.0.p008-cstdint-FD38.patch',
                'paraview-5.11.0.p009-openturns-1.21.patch',
                'paraview-5.11.0.p010-python-3.11.patch',
-               'paraview-5.11.0.p012-skip-FindTBB.patch'
+               'paraview-5.11.0.p012-skip-FindTBB.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -455,7 +462,8 @@ version_5_11_0_MPI_DB12 :
                'paraview-5.11.0.p006-GIL.patch',
                'paraview-5.11.0.p007-mpi4py-FD37.patch',
                'paraview-5.11.0.p009-openturns-1.21.patch',
-               'paraview-5.11.0.p010-python-3.11.patch'
+               'paraview-5.11.0.p010-python-3.11.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -481,7 +489,8 @@ version_5_11_0_MPI_DB10 :
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
                ]
     depend : [
               'Python',
@@ -507,7 +516,8 @@ version_5_11_0_MPI_CO9 :
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -533,7 +543,8 @@ version_5_11_0_MPI_CO8 :
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch',
                'paraview-5.11.0.p006-GIL.patch',
-               'paraview-5.11.0.p009-openturns-1.21.patch'
+               'paraview-5.11.0.p009-openturns-1.21.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -561,7 +572,8 @@ version_5_11_0_MPI_FD38 :
                'paraview-5.11.0.p007-mpi4py-FD37.patch',
                'paraview-5.11.0.p008-cstdint-FD38.patch',
                'paraview-5.11.0.p009-openturns-1.21.patch',
-               'paraview-5.11.0.p010-python-3.11.patch'
+               'paraview-5.11.0.p010-python-3.11.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
@@ -588,7 +600,8 @@ version_5_11_0_MPI_FD37 :
                'paraview-5.11.0.p006-GIL.patch',
                'paraview-5.11.0.p007-mpi4py-FD37.patch',
                'paraview-5.11.0.p009-openturns-1.21.patch',
-               'paraview-5.11.0.p010-python-3.11.patch'
+               'paraview-5.11.0.p010-python-3.11.patch',
+               'paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch'
               ]
     depend : [
               'Python',
diff --git a/products/patches/paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch b/products/patches/paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch
index 6029b18e1e780cb5ccb6bb823cb1918f1d0ee654..d59651a88309a8cec79545b8371b19224977f302 100644 (file)
--- a/products/patches/paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch
+++ b/products/patches/paraview-5.11.0.p013-bos-43522-EnSightGoldBinaryReader-fix-int-overflow-when-openin.patch
@@ -1,19 +1,6 @@
-From 7135f862820948c522eaabcc6b9ff5c91fb0ae46 Mon Sep 17 00:00:00 2001
-From: Louis Gombert <louis.gombert@kitware.com>
-Date: Wed, 25 Sep 2024 16:38:20 +0200
-Subject: [PATCH] EnSightGoldBinaryReader: fix int overflow when opening large
- datasets
-
-Convert int to vtkIdType when necessary
-
-(cherry picked from commit 3d830296ece3038d3ab03d195db3200604c4c27c)
----
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 29 +++++++++++------------
- IO/EnSight/vtkEnSightGoldBinaryReader.h   |  2 +-
- 2 files changed, 15 insertions(+), 16 deletions(-)
-
+Submodule VTK contains modified content
 diff --git a/VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index 9ec5d94457..ede20bbf3f 100644
+index 9ec5d94457..c95fe96495 100644
 --- a/VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
 +++ b/VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
 @@ -825,7 +825,7 @@ int vtkEnSightGoldBinaryReader::SkipUnstructuredGrid(char line[256])
@@ -64,7 +51,7 @@ index 9ec5d94457..ede20bbf3f 100644
  
        cellType = vtkEnSightReader::NFACED;
        this->ReadInt(&numElements);
-@@ -2463,10 +2463,9 @@ int vtkEnSightGoldBinaryReader::CreateUnstructuredGridOutput(
+@@ -2463,10 +2463,10 @@ int vtkEnSightGoldBinaryReader::CreateUnstructuredGridOutput(
        this->ReadIntArray(nodeIdList, numNodes);
  
        // yyy begin
@@ -72,13 +59,14 @@ index 9ec5d94457..ede20bbf3f 100644
 -      int faceIdx = 0;              // indexing faces throughout all polyhedra
 -      int nodeIdx = 0;              // indexing nodes throughout all polyhedra
 -      int arayIdx = 0;              // indexing the array of Ids (info of faces)
-+      int k;                      // indexing each node Id of a face
-+      vtkIdType faceIdx = 0;      // indexing faces throughout all polyhedra
-+      vtkIdType nodeIdx = 0;      // indexing nodes throughout all polyhedra
++      vtkIdType k;                        // indexing each node Id of a face
++      vtkIdType faceIdx = 0;        // indexing faces throughout all polyhedra
++      vtkIdType nodeIdx = 0;        // indexing nodes throughout all polyhedra
++      vtkIdType arayIdx = 0;              // indexing the array of Ids (info of faces)
        vtkIdType* faceAry = nullptr; // array of Ids describing a vtkPolyhedron
        // yyy end
  
-@@ -3402,7 +3401,7 @@ int vtkEnSightGoldBinaryReader::ReadFloat(float* result)
+@@ -3402,7 +3402,7 @@ int vtkEnSightGoldBinaryReader::ReadFloat(float* result)
  
  // Internal function to read an integer array.
  // Returns zero if there was an error.
@@ -100,6 +88,3 @@ index dd88876ad9..31bd8faebd 100644
  
    /**
     * Internal function to read in a single long.
--- 
-2.47.0
-
Unnamed repository; edit this file 'description' to name the repository.

Copyright © 2005 - 2024 Open CASCADE.
All rights reserved.
Legal Information