OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0025734: GCC warnings in Android build

Browse Source 
Warnings were fixed.

Fixed wrong re-initialization.
This commit is contained in:
ski
2015-02-05 14:23:17 +03:00
committed by bugmaster
parent 5fd3308acd
commit bcf50875e3
29 changed files with 103 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/AIS/AIS_LocalContext_1.cxx
View File

@@ -567,8 +567,6 @@ void AIS_LocalContext::Unhilight (const Handle(SelectMgr_EntityOwner)& theOwner,
//=======================================================================
void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
{
Standard_Boolean updMain(Standard_False);
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765
if( Sel.IsNull() ) return;
@@ -601,13 +599,8 @@ void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
if(BROwnr.IsNull() || !BROwnr->ComesFromDecomposition()){
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
IO = *((Handle(AIS_InteractiveObject)*)&SO);
updMain = Standard_True;
}
else
updMain = Standard_True;
}
else
updMain = Standard_True;
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
Standard_Integer HM = GetHiMod(*((Handle(AIS_InteractiveObject)*)&SO));
if ( Ownr->IsAutoHilight() )
@@ -642,8 +635,6 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
{
myMainPM->ClearImmediateDraw();
Standard_Boolean updMain(Standard_False);
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765
if( Sel.IsNull() ) return;
@@ -680,10 +671,7 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
Handle(AIS_InteractiveObject) IO = *((Handle(AIS_InteractiveObject)*)&SO);
HM = GetHiMod(IO);
#endif
updMain = Standard_True;
}
else
updMain = Standard_True;
}
Ownr->Unhilight(PM,HM);
}
@@ -696,14 +684,8 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
anIter1.Key()->ClearSelected();
}
if(updateviewer){
#ifdef BUC60774
if(updateviewer)
myCTX->CurrentViewer()->Update();
#else
if(updMain) myCTX->CurrentViewer()->Update();
#endif
}
}
//=======================================================================