X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FNCollection%2FNCollection_Vec2.hxx;h=3d1e67563202f352ae3ea96e239c25f3dcc9a0dd;hp=fed42146a0b1a481b11b0d830d9e940ff80bde98;hb=5640d65355d1da3f48c9e3b3b7c5e4114b70f050;hpb=bf75be98674edf9cd074ce92ed73675e79283762 diff --git a/src/NCollection/NCollection_Vec2.hxx b/src/NCollection/NCollection_Vec2.hxx index fed4214..3d1e675 100644 --- a/src/NCollection/NCollection_Vec2.hxx +++ b/src/NCollection/NCollection_Vec2.hxx @@ -1,20 +1,16 @@ // Created by: Kirill GAVRILOV -// Copyright (c) 2012 OPEN CASCADE SAS +// Copyright (c) 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 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. #ifndef _NCollection_Vec2_H__ #define _NCollection_Vec2_H__ @@ -83,7 +79,7 @@ public: Element_t y() const { return v[1]; } //! @return 2 components by their names in specified order (in GLSL-style) - NCOLLECTION_VEC_COMPONENTS_2D(x, y); + NCOLLECTION_VEC_COMPONENTS_2D(x, y) //! Alias to 1st component as X coordinate in XY. Element_t& x() { return v[0]; } @@ -91,10 +87,11 @@ public: //! Alias to 2nd component as Y coordinate in XY. Element_t& y() { return v[1]; } - //! Raw access to the data (to simplify OpenGL exchange). - const Element_t* GetData() const { return v; } - operator const Element_t*() const { return v; } - operator Element_t*() { return v; } + //! Raw access to the data (for OpenGL exchange). + const Element_t* GetData() const { return v; } + Element_t* ChangeData() { return v; } + operator const Element_t*() const { return v; } + operator Element_t*() { return v; } //! Compute per-component summary. NCollection_Vec2& operator+= (const NCollection_Vec2& theAdd)