Fix compilation error and some warnings

[modules/geom.git] / src / OBJECT / GEOM_Actor.cxx

diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index 306d146e04c7070319a4aac85816c4a6ae37b99b..422f2b740d837be3cd970ab6e63952537b7fe63b 100644 (file)
--- a/src/OBJECT/GEOM_Actor.cxx
+++ b/src/OBJECT/GEOM_Actor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -111,20 +111,21 @@ GEOM_Actor::GEOM_Actor():
   myShadingFaceSource(GEOM_ShadingFace::New(),true), 
  
   myHighlightActor(GEOM_DeviceActor::New(),true), 
-  myAppendFilter(vtkAppendPolyData::New(),true), 
-  // Use mapper as an instance of GEOM_PainterPolyDataMapper class
-  // to prevent drawing of mappers' content (due to an empty definition
-  // of GEOM_PainterPolyDataMapper::RenderPiece(...)).
-  // !!! Presentation of GEOM_Actor is drawing only with help of actors
-  // defined in this class !!!
-  myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true),
 
   myTextActor( vtkTextActor::New() ),
 
   myHighlightProp(vtkProperty::New()),
   myPreHighlightProp(vtkProperty::New()),
   myShadingFaceProp(vtkProperty::New()),
-  myShadingBackFaceProp(vtkProperty::New())
+  myShadingBackFaceProp(vtkProperty::New()),
+
+  myAppendFilter(vtkAppendPolyData::New(),true), 
+  // Use mapper as an instance of GEOM_PainterPolyDataMapper class
+  // to prevent drawing of mappers' content (due to an empty definition
+  // of GEOM_PainterPolyDataMapper::RenderPiece(...)).
+  // !!! Presentation of GEOM_Actor is drawing only with help of actors
+  // defined in this class !!!
+  myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true)
 { 
 #ifdef MYDEBUG
   MESSAGE (this<< " GEOM_Actor::GEOM_Actor");
@@ -217,6 +218,7 @@ GEOM_Actor::~GEOM_Actor()
 #ifdef MYDEBUG
   MESSAGE (this<< " ~GEOM_Actor::GEOM_Actor");
 #endif
+  myTextActor->Delete();
   myHighlightProp->Delete();
   myPreHighlightProp->Delete();
   myShadingFaceProp->Delete();
@@ -338,9 +340,9 @@ setDisplayMode(int theMode)
     myIsolatedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0],
                                                  myIsolatedEdgeColor[1],
                                                  myIsolatedEdgeColor[2]);
-    mySharedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0],
-                                               myIsolatedEdgeColor[1],
-                                               myIsolatedEdgeColor[2]);
+    mySharedEdgeActor->GetProperty()->SetColor(mySharedEdgeColor[0],
+                                               mySharedEdgeColor[1],
+                                               mySharedEdgeColor[2]);
     myOneFaceEdgeActor->GetProperty()->SetColor(myOneFaceEdgeColor[0],
                                                myOneFaceEdgeColor[1],
                                                myOneFaceEdgeColor[2]);