Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Release notes at <https://dev.opencascade.org/content/open-cascade-technology-780-released> It includes a patch from ichesnok <ichesnok@opencascade.com> to fix the problem reported at <https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff;h=0f6f5b64d321a988399567f6b901bef385cc8d41> PR: 277294
- Loading branch information
1 parent
3f70a54
commit 70f1baf
Showing
15 changed files
with
1,864 additions
and
1,586 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| TIMESTAMP = 1668069465 | ||
| SHA256 (opencascade-7.7.0.tgz) = 40e8e0e78b56dd407192b4cabf55dd0bdd1fa9c0a292d263b12f7e21733cb07e | ||
| SIZE (opencascade-7.7.0.tgz) = 247268442 | ||
| TIMESTAMP = 1701808276 | ||
| SHA256 (documentation.tar.xz) = 3c5cdd70de9c82d9f0be4b9400d618494cfecd28f502d110111060c9aaaf50c7 | ||
| SIZE (documentation.tar.xz) = 48428333 | ||
| SHA256 (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 3c5cdd70de9c82d9f0be4b9400d618494cfecd28f502d110111060c9aaaf50c7 | ||
| SIZE (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 48428333 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- adm/UDLIST.orig 2023-12-04 15:53:08 UTC | ||
| +++ adm/UDLIST | ||
| @@ -32,6 +32,7 @@ r OS | ||
| n gp | ||
| n math | ||
| r OS | ||
| +n FlexLexer | ||
| t TKMath | ||
| t TKernel | ||
| n Adaptor2d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
cad/opencascade/files/patch-adm_templates_custom.install.sh.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- src/Message/Message_AttributeMeter.cxx.orig 2023-12-04 15:53:08 UTC | ||
| +++ src/Message/Message_AttributeMeter.cxx | ||
| @@ -253,6 +253,6 @@ void Message_AttributeMeter::DumpJson (Standard_OStrea | ||
| anIterator.More(); anIterator.Next()) | ||
| { | ||
| OCCT_DUMP_VECTOR_CLASS (theOStream, Message::MetricToString (anIterator.Key()), | ||
| - 2, anIterator.Value(), anIterator.Value()) | ||
| + 2, anIterator.Value().first, anIterator.Value().second) | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- src/NCollection/NCollection_Array1.hxx.orig 2023-12-04 15:53:08 UTC | ||
| +++ src/NCollection/NCollection_Array1.hxx | ||
| @@ -72,26 +72,10 @@ class NCollection_Array1 (public) | ||
|
|
||
| using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, false>; | ||
| using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, true>; | ||
| + using Iterator = NCollection_Iterator<NCollection_Array1<TheItemType>>; | ||
|
|
||
| public: | ||
|
|
||
| - // Iterator class | ||
| - class Iterator : public NCollection_Iterator<NCollection_Array1> | ||
| - { | ||
| - public: | ||
| - using NCollection_Iterator<NCollection_Array1>::NCollection_Iterator; | ||
| - | ||
| - const_reference Value() const | ||
| - { | ||
| - return *NCollection_Iterator<NCollection_Array1>::ValueIter(); | ||
| - } | ||
| - | ||
| - reference ChangeValue() | ||
| - { | ||
| - return *NCollection_Iterator<NCollection_Array1>::ChangeValueIter(); | ||
| - } | ||
| - }; | ||
| - | ||
| const_iterator begin() const | ||
| { | ||
| return const_iterator(*this); | ||
| @@ -150,7 +134,7 @@ class NCollection_Array1 (public) | ||
| mySize(theUpper - theLower + 1), | ||
| myPointer(nullptr), | ||
| myIsOwner(false), | ||
| - allocator_type(theAlloc) | ||
| + myAllocator(theAlloc) | ||
| { | ||
| if (mySize == 0) | ||
| { |
29 changes: 29 additions & 0 deletions
29
cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- src/NCollection/NCollection_DynamicArray.hxx.orig 2023-12-04 15:53:08 UTC | ||
| +++ src/NCollection/NCollection_DynamicArray.hxx | ||
| @@ -77,25 +77,9 @@ class NCollection_DynamicArray (public) | ||
|
|
||
| using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, false>; | ||
| using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, true>; | ||
| + using Iterator = NCollection_Iterator<NCollection_DynamicArray<TheItemType>>; | ||
|
|
||
| public: | ||
| - | ||
| - // Iterator class | ||
| - class Iterator : public NCollection_Iterator<NCollection_DynamicArray> | ||
| - { | ||
| - public: | ||
| - using NCollection_Iterator<NCollection_DynamicArray>::NCollection_Iterator; | ||
| - | ||
| - const_reference Value() const | ||
| - { | ||
| - return *NCollection_Iterator<NCollection_DynamicArray>::ValueIter(); | ||
| - } | ||
| - | ||
| - reference ChangeValue() | ||
| - { | ||
| - return *NCollection_Iterator<NCollection_DynamicArray>::ChangeValueIter(); | ||
| - } | ||
| - }; | ||
|
|
||
| const_iterator begin() const | ||
| { |
19 changes: 19 additions & 0 deletions
19
cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- src/NCollection/NCollection_Iterator.hxx.orig 2023-12-04 15:53:08 UTC | ||
| +++ src/NCollection/NCollection_Iterator.hxx | ||
| @@ -94,6 +94,16 @@ class NCollection_Iterator (public) | ||
| ++(myCur); | ||
| } | ||
|
|
||
| + const typename Container::const_reference Value() const | ||
| + { | ||
| + return *myCur; | ||
| + } | ||
| + | ||
| + const typename Container::reference ChangeValue() | ||
| + { | ||
| + return *myCur; | ||
| + } | ||
| + | ||
| bool operator==(const NCollection_Iterator& theOther) { return myLast == theOther.myLast && myCur == theOther.myCur; } | ||
|
|
||
| bool operator!=(const NCollection_Iterator& theOther) { return myLast != theOther.myLast || myCur != theOther.myCur; } |
21 changes: 21 additions & 0 deletions
21
cad/opencascade/files/patch-src_STEPCAFControl_STEPCAFControl__Reader.cxx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- src/STEPCAFControl/STEPCAFControl_Reader.cxx.orig 2023-12-04 15:53:08 UTC | ||
| +++ src/STEPCAFControl/STEPCAFControl_Reader.cxx | ||
| @@ -1996,7 +1996,8 @@ Handle(Poly_Triangulation) createMesh(const Handle(Ste | ||
| const Standard_Integer aNbNormals = theTriangulatedSufaceSet->NbNormals(); | ||
| // Number of pairs (Point, Normal). It is possible for one point to have multiple normals. This is | ||
| // useful when the underlying surface is not C1 continuous. | ||
| - const Standard_Integer aNbPairs = aNbNormals > 1 ? theTriangulatedSufaceSet->NbPnindex() : aNodes->Length(); | ||
| + // Patch from https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff;h=0f6f5b64d321a988399567f6b901bef385cc8d41 | ||
| + const Standard_Integer aNbPairs = aNbNormals > 1 ? theTriangulatedSufaceSet->Pnmax() : aNodes->Length(); | ||
| const Standard_Boolean aHasNormals = aNbNormals > 0; | ||
|
|
||
| // Counting number of triangles in the triangle strips list. | ||
| @@ -2021,7 +2022,7 @@ Handle(Poly_Triangulation) createMesh(const Handle(Ste | ||
|
|
||
| for (Standard_Integer j = 1; j <= aNbPairs; ++j) | ||
| { | ||
| - const gp_XYZ& aPoint = aNodes->Value(aNbNormals > 1 ? theTriangulatedSufaceSet->PnindexValue(j) : j); | ||
| + const gp_XYZ& aPoint = aNodes->Value((aNbNormals > 1 && theTriangulatedSufaceSet->NbPnindex() > 0) ? theTriangulatedSufaceSet->PnindexValue(j) : j); | ||
| aMesh->SetNode(j, theFact * aPoint); | ||
| } | ||
|
|
4 changes: 2 additions & 2 deletions
4
cad/opencascade/files/patch-src_Standard_Standard__CString.cxx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
cad/opencascade/files/patch-src_Standard_Standard__MMgrTBBalloc.cxx
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.