Merge remote-tracking branch 'paolokillerchanges/master'

This commit is contained in:
Daniel Girardeau-Montaut
2016-11-04 18:42:57 +01:00
2 changed files with 33 additions and 1 deletions
+32
View File
@@ -0,0 +1,32 @@
QT -= core gui
INCLUDEPATH -= .
### begin mac specific part #################
# On OSX xcode clang does NOT support OpenMP.
# Use these two lines if you installed an alternative clang with macport
# (something like 'sudo port install clang-3.9')
macx:QMAKE_CXX = clang++-mp-3.9
macx:QMAKE_LFLAGS += -L/opt/local/lib/libomp -lomp
# Use this if you want to use the standard clang distributed with xcode
# macx:QMAKE_CXXFLAGS-= -fopenmp
# Mac specific Config required to avoid to make application bundles
CONFIG -= app_bundle
### end of mac specific part #################
QMAKE_CXXFLAGS+=-fopenmp -Wsign-compare -O3 -DRELEASE -funroll-loops -ffast-math
CONFIG += console warn_off
TEMPLATE = app
SOURCES += Src/PoissonRecon.cpp \
Src/MarchingCubes.cpp \
Src/PlyFile.cpp \
Src/CmdLineParser.cpp \
Src/Factor.cpp \
Src/Geometry.cpp
TARGET=PoissonRecon
+1 -1
View File
@@ -339,7 +339,7 @@ struct DenseNodeData
Data& operator[]( const OctNode< TreeNodeData >* node ) { return _data[ node->nodeData.nodeIndex ]; }
Data* operator()( const OctNode< TreeNodeData >* node ) { return ( node==NULL || node->nodeData.nodeIndex>=(int)_sz ) ? NULL : &_data[ node->nodeData.nodeIndex ]; }
const Data* operator()( const OctNode< TreeNodeData >* node ) const { return ( node==NULL || node->nodeData.nodeIndex>=(int)_sz ) ? NULL : &_data[ node->nodeData.nodeIndex ]; }
int index( const OctNode< TreeNodeData >* node ) const { return ( !node || node->nodeData.nodeIndex<0 || node->nodeData.nodeIndex>=(int)_data.size() ) ? -1 : node->nodeData.nodeIndex; }
int index( const OctNode< TreeNodeData >* node ) const { return ( !node || node->nodeData.nodeIndex<0 || node->nodeData.nodeIndex>=(int)this->_data.size() ) ? -1 : node->nodeData.nodeIndex; }
protected:
size_t _sz;
void _resize( size_t sz ){ DeletePointer( _data ) ; if( sz ) _data = NewPointer< Data >( sz ) ; else _data = NullPointer( Data ) ; _sz = sz; }