OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024276: Memory leak due to a static variable

Browse Source 
Cleaning of selected entities to avoid a memory leak.
This commit is contained in:
vro 2013-10-22 08:49:01 +04:00 committed by abv
parent fd4a696350
commit 30bf45dc70
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AIS/AIS_InteractiveContext.cxx
View File

@ -149,6 +149,9 @@ myIsAutoActivateSelMode( Standard_True )
void AIS_InteractiveContext::Delete() const
{
//Clear the static current selection. Else the memory
//is not release
AIS_Selection::ClearCurrentSelection();
#ifdef OCC172
// to avoid an exception
if ( AIS_Selection::Find( mySelectionName.ToCString() ) )

2
src/AIS/AIS_Selection.cdl
View File

@ -87,6 +87,8 @@ is
---Purpose:
returns mutable Selection from AIS;
ClearCurrentSelection(myclass);
---Purpose: Clears selection.
Select(myclass);
---Purpose: removes all the object of the currentselection.

10
src/AIS/AIS_Selection.cxx
View File

@ -50,9 +50,10 @@
#define MaxSizeOfResult 100000
#endif
//current selection (handle)
static Handle(AIS_Selection) theCurrentSelection;
static void AIS_Sel_CurrentSelection (Handle(AIS_Selection)& InputSel)
{
static Handle(AIS_Selection) theCurrentSelection;
if(!InputSel.IsNull())
theCurrentSelection = InputSel;
else
@ -418,6 +419,11 @@ void AIS_Selection::Remove(const Standard_CString aName)
#endif
AIS_Sel_GetSelections().Remove(I);
}
}
// clean the static current selection handle
void AIS_Selection::ClearCurrentSelection()
{
theCurrentSelection.Nullify();
}

13
src/Visual3d/Visual3d_ViewManager.cxx
View File

@ -1061,6 +1061,19 @@ Standard_Integer Visual3d_ViewManager::Identification (const Handle(Visual3d_Vie
void Visual3d_ViewManager::UnIdentification (const Standard_Integer aViewId)
{
Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
while (MyIterator.More())
{
if ((MyIterator.Value())->Identification () == aViewId)
{
const Handle(Visual3d_View)& theView = MyIterator.Value();
//remove the view from the list
MyDefinedView.Remove(theView);
break;
}
// go to next
MyIterator.Next ();
}
MyViewGenId.Free(aViewId);
}