0025442: Visualization, TKOpenGl - prevent inclusion of system header glxext.h

[occt.git] / src / OpenGl / OpenGl_CappingPlaneResource.cxx

diff --git a/src/OpenGl/OpenGl_CappingPlaneResource.cxx b/src/OpenGl/OpenGl_CappingPlaneResource.cxx
old mode 100644 (file)
new mode 100755 (executable)
index d5b9bce..629462e
--- a/src/OpenGl/OpenGl_CappingPlaneResource.cxx
+++ b/src/OpenGl/OpenGl_CappingPlaneResource.cxx
@@ -1,21 +1,17 @@
 // Created on: 2013-08-15
 // Created by: Anton POLETAEV
-// Copyright (c) 2013 OPEN CASCADE SAS
+// Copyright (c) 2013-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 #include <OpenGl_CappingPlaneResource.hxx>
 #include <OpenGl_Context.hxx>
@@ -31,10 +27,10 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_CappingPlaneResource, OpenGl_Resource)
 // =======================================================================
 OpenGl_CappingPlaneResource::OpenGl_CappingPlaneResource (const Handle(Graphic3d_ClipPlane)& thePlane)
 : myOrientation (OpenGl_IdentityMatrix),
-  myAspect (NULL),
-  myPlaneRoot (thePlane),
-  myEquationMod (0),
-  myAspectMod (0)
+  myAspect      (NULL),
+  myPlaneRoot   (thePlane),
+  myEquationMod ((unsigned int )-1),
+  myAspectMod   ((unsigned int )-1)
 {}
 
 // =======================================================================
@@ -60,11 +56,11 @@ void OpenGl_CappingPlaneResource::Update (const Handle(OpenGl_Context)& theConte
 // function : Release
 // purpose  :
 // =======================================================================
-void OpenGl_CappingPlaneResource::Release (const OpenGl_Context* theContext)
+void OpenGl_CappingPlaneResource::Release (OpenGl_Context* theContext)
 {
   OpenGl_Element::Destroy (theContext, myAspect);
-  myEquationMod = 0;
-  myAspectMod   = 0;
+  myEquationMod = (unsigned int )-1;
+  myAspectMod   = (unsigned int )-1;
 }
 
 // =======================================================================
@@ -87,7 +83,7 @@ void OpenGl_CappingPlaneResource::UpdateAspect (const Handle(OpenGl_Context)& th
   // no more used
   if (myAspect != NULL && aCappingAsp.IsNull())
   {
-    OpenGl_Element::Destroy (theContext, myAspect);
+    OpenGl_Element::Destroy (theContext.operator->(), myAspect);
     myAspectMod = myPlaneRoot->MCountAspect();
     return;
   }