X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHUtils%2FSMESH_Octree.hxx;h=df25fd5739ef1717854a96f552108eaafae36caf;hp=5fa0e6533a3edb95ceb7f1bb8df23a716e473307;hb=9acd4347a6c7488c3ead4c68861b0944e83e545f;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce diff --git a/src/SMESHUtils/SMESH_Octree.hxx b/src/SMESHUtils/SMESH_Octree.hxx index 5fa0e6533..df25fd573 100644 --- a/src/SMESHUtils/SMESH_Octree.hxx +++ b/src/SMESHUtils/SMESH_Octree.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -49,12 +49,13 @@ public: // Constructor. limit must be provided at tree root construction. // limit will be deleted by SMESH_Octree SMESH_Octree (SMESH_TreeLimit* limit=0); + virtual ~SMESH_Octree() {}; // Compute the bigger dimension of my box double maxSize() const; // Return index of a child the given point is in - inline int getChildIndex(double x, double y, double z, const gp_XYZ& boxMiddle)const; + inline static int getChildIndex(double x, double y, double z, const gp_XYZ& boxMiddle); protected: @@ -66,7 +67,7 @@ public: /*! * \brief Return index of a child the given point is in */ -inline int SMESH_Octree::getChildIndex(double x, double y, double z, const gp_XYZ& mid) const +inline int SMESH_Octree::getChildIndex(double x, double y, double z, const gp_XYZ& mid) { return (x > mid.X()) + ( y > mid.Y())*2 + (z > mid.Z())*4; }