Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed explicit making cppcheck fail and some lineendings

Browse Source 
(cherry picked from commit 25178d9dcb)
This commit is contained in:
Jan Möbius
2017-02-02 13:53:46 +01:00
parent 57bc372adc
commit fd5b60fcba
10 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh
View File

@@ -37,97 +37,97 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS newClass
//
//=============================================================================
#ifndef OPENMESH_VDPROGMESH_VHIERARCHYNODEINDEX_HH
#define OPENMESH_VDPROGMESH_VHIERARCHYNODEINDEX_HH
//== INCLUDES =================================================================
#include <vector>
#include <cassert>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
namespace OpenMesh {
namespace VDPM {
//== CLASS DEFINITION =========================================================
/** Index of vertex hierarchy node
*/
class VHierarchyNodeIndex
{
private:
unsigned int value_;
public:
static const VHierarchyNodeIndex InvalidIndex;
public:
VHierarchyNodeIndex()
{ value_ = 0; }
VHierarchyNodeIndex(unsigned int _value)
{ value_ = _value; }
VHierarchyNodeIndex(const VHierarchyNodeIndex &_other)
{ value_ = _other.value_; }
VHierarchyNodeIndex(unsigned int _tree_id,
unsigned int _node_id,
unsigned short _tree_id_bits)
{
assert(_tree_id < ((unsigned int) 0x00000001 << _tree_id_bits));
assert(_node_id < ((unsigned int) 0x00000001 << (32 - _tree_id_bits)));
value_ = (_tree_id << (32 - _tree_id_bits)) | _node_id;
}
bool is_valid(unsigned short _tree_id_bits) const
{ return node_id(_tree_id_bits) != 0 ? true : false; }
unsigned int tree_id(unsigned short _tree_id_bits) const
{ return value_ >> (32 - _tree_id_bits); }
unsigned int node_id(unsigned short _tree_id_bits) const
{ return value_ & ((unsigned int) 0xFFFFFFFF >> _tree_id_bits); }
bool operator< (const VHierarchyNodeIndex &other) const
{ return (value_ < other.value_) ? true : false; }
unsigned int value() const
{ return value_; }
};
/// Container for vertex hierarchy node indices
typedef std::vector<VHierarchyNodeIndex> VHierarchyNodeIndexContainer;
//=============================================================================
} // namespace VDPM
} // namespace OpenMesh
//=============================================================================
#endif // OPENMESH_VDPROGMESH_VHIERARCHYNODEINDEX_HH defined
//=============================================================================
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS newClass
//
//=============================================================================
#ifndef OPENMESH_VDPROGMESH_VHIERARCHYNODEINDEX_HH
#define OPENMESH_VDPROGMESH_VHIERARCHYNODEINDEX_HH
//== INCLUDES =================================================================
#include <vector>
#include <cassert>
//== FORWARDDECLARATIONS ======================================================
//== NAMESPACES ===============================================================
namespace OpenMesh {
namespace VDPM {
//== CLASS DEFINITION =========================================================
/** Index of vertex hierarchy node
*/
class VHierarchyNodeIndex
{
private:
unsigned int value_;
public:
static const VHierarchyNodeIndex InvalidIndex;
public:
VHierarchyNodeIndex()
{ value_ = 0; }
explicit VHierarchyNodeIndex(unsigned int _value)
{ value_ = _value; }
VHierarchyNodeIndex(const VHierarchyNodeIndex &_other)
{ value_ = _other.value_; }
VHierarchyNodeIndex(unsigned int _tree_id,
unsigned int _node_id,
unsigned short _tree_id_bits)
{
assert(_tree_id < ((unsigned int) 0x00000001 << _tree_id_bits));
assert(_node_id < ((unsigned int) 0x00000001 << (32 - _tree_id_bits)));
value_ = (_tree_id << (32 - _tree_id_bits)) | _node_id;
}
bool is_valid(unsigned short _tree_id_bits) const
{ return node_id(_tree_id_bits) != 0 ? true : false; }
unsigned int tree_id(unsigned short _tree_id_bits) const
{ return value_ >> (32 - _tree_id_bits); }
unsigned int node_id(unsigned short _tree_id_bits) const
{ return value_ & ((unsigned int) 0xFFFFFFFF >> _tree_id_bits); }
bool operator< (const VHierarchyNodeIndex &other) const
{ return (value_ < other.value_) ? true : false; }
unsigned int value() const
{ return value_; }
};
/// Container for vertex hierarchy node indices
typedef std::vector<VHierarchyNodeIndex> VHierarchyNodeIndexContainer;
//=============================================================================
} // namespace VDPM
} // namespace OpenMesh
//=============================================================================
#endif // OPENMESH_VDPROGMESH_VHIERARCHYNODEINDEX_HH defined
//=============================================================================