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

Merge branch 'master' into qt6

Browse Source
This commit is contained in:
Johannes Lenzen
2021-05-03 13:43:34 +02:00
parent 42a6e445cc e710d4cb6f
commit e26d263867
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/ci-linux-prepare.sh
View File

@@ -8,7 +8,7 @@ MAKE_OPTIONS=""
BUILDPATH="" BUILDPATH=""
# set GTEST path # set GTEST path
OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0"
if [ "$COMPILER" == "gcc" ]; then if [ "$COMPILER" == "gcc" ]; then
echo "Building with GCC"; echo "Building with GCC";

3
src/OpenMesh/Core/IO/reader/PLYReader.cc
View File

@@ -54,6 +54,7 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <string>
#ifndef WIN32 #ifndef WIN32
#endif #endif
@@ -1089,7 +1090,7 @@ std::string get_property_name(std::string _string1, std::string _string2) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
_PLYReader_::ValueType get_property_type(std::string& _string1, std::string& _string2) { _PLYReader_::ValueType get_property_type(const std::string& _string1, const std::string& _string2) {
if (_string1 == "float32" || _string2 == "float32") if (_string1 == "float32" || _string2 == "float32")

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

@@ -87,9 +87,6 @@ public:
explicit VHierarchyNodeIndex(unsigned int _value) explicit VHierarchyNodeIndex(unsigned int _value)
{ value_ = _value; } { value_ = _value; }
VHierarchyNodeIndex(const VHierarchyNodeIndex &_other)
{ value_ = _other.value_; }
VHierarchyNodeIndex(unsigned int _tree_id, VHierarchyNodeIndex(unsigned int _tree_id,
unsigned int _node_id, unsigned int _node_id,
unsigned short _tree_id_bits) unsigned short _tree_id_bits)