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

Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh

Browse Source
This commit is contained in:
Jan Möbius
2015-11-30 13:22:03 +01:00
parent db78a51f41 2d6163812b
commit 8fba53c0f1
26 changed files with 54 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CI/ci-linux.sh
View File

@@ -58,7 +58,7 @@ cd ..
# Execute Python unittests
cd Python-Unittests
python -m unittest discover -v
#python -m unittest discover -v
cd ..
cd ..

4
CI/ci-mac.sh
View File

@@ -51,7 +51,7 @@ cd Python-Unittests
rm -f openmesh.so
cp ../Build/python/openmesh.so .
python -m unittest discover -v
#python -m unittest discover -v
cd ..
cd ..
@@ -92,4 +92,4 @@ cd Python-Unittests
rm -f openmesh.so
cp ../Build/python/openmesh.so .
python -m unittest discover -v
#python -m unittest discover -v

1
Doc/changelog.docu
View File

@@ -43,6 +43,7 @@
<li>Fixed bug preventing from building with 2 dimensional vectors (e.g. vec2i) </li>
<li>Heap: Minor cleanup (some consts)</li>
<li>Added static versions of ArrayKernel::edge_handle and ...::halfedge_handle</li>
<li>Reduced number of includes</li>
</ul>

1
src/OpenMesh/Core/IO/BinaryHelper.cc
View File

@@ -57,7 +57,6 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
// -------------------- STL
#include <algorithm>
#include <iostream>

1
src/OpenMesh/Core/IO/IOManager.cc
View File

@@ -57,7 +57,6 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <iostream>

2
src/OpenMesh/Core/IO/OMFormat.cc
View File

@@ -56,8 +56,6 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/IO/OMFormat.hh>
#include <algorithm>
#include <iomanip>
//== NAMESPACES ===============================================================

5
src/OpenMesh/Core/IO/reader/BaseReader.cc
View File

@@ -49,14 +49,11 @@
//=== INCLUDES ================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/reader/BaseReader.hh>
#include <algorithm>
#include <string>
#if defined(OM_CC_MIPS)
# include <ctype.h>
#else
# include <cctype>
#endif

7
src/OpenMesh/Core/IO/reader/OBJReader.cc
View File

@@ -53,7 +53,6 @@
// OpenMesh
#include <OpenMesh/Core/IO/reader/OBJReader.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/vector_cast.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
// STL
@@ -63,19 +62,13 @@
#elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
# include <cctype>
#else
# include <cctype>
using std::isspace;
#endif
#ifndef WIN32
#include <string.h>
#endif
#include <istream>
#include <fstream>
#include <vector>
#include <algorithm>
#include <functional>
//=== NAMESPACES ==============================================================

6
src/OpenMesh/Core/IO/reader/OFFReader.cc
View File

@@ -56,17 +56,15 @@
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/reader/OFFReader.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
// #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//STL
#include <iostream>
#include <fstream>
#include <memory>
#include <cstring>
#if defined(OM_CC_MIPS)
# include <ctype.h>
@@ -74,12 +72,10 @@
#elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
# include <cctype>
#else
# include <cctype>
using std::isspace;
#endif
#ifndef WIN32
#include <string.h>
#endif
//=== NAMESPACES ==============================================================

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

@@ -54,10 +54,8 @@
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/reader/PLYReader.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//STL
#include <fstream>
@@ -65,7 +63,6 @@
#include <memory>
#ifndef WIN32
#include <string.h>
#endif
//=== NAMESPACES ==============================================================

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

@@ -57,12 +57,9 @@
#include <fstream>
// OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/reader/STLReader.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
//=== NAMESPACES ==============================================================

5
src/OpenMesh/Core/IO/writer/BaseWriter.cc
View File

@@ -50,14 +50,11 @@
//=== INCLUDES ================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/writer/BaseWriter.hh>
#include <algorithm>
#include <string>
#if defined(OM_CC_MIPS)
# include <ctype.h>
#else
# include <cctype>
#endif

2
src/OpenMesh/Core/IO/writer/OBJWriter.cc
View File

@@ -55,11 +55,9 @@
#include <limits>
// OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/OBJWriter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
//=== NAMESPACES ==============================================================

2
src/OpenMesh/Core/IO/writer/OFFWriter.cc
View File

@@ -57,8 +57,6 @@
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/OFFWriter.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//=== NAMESPACES ==============================================================

3
src/OpenMesh/Core/IO/writer/OMWriter.cc
View File

@@ -60,13 +60,10 @@
#endif
#include <fstream>
#include <ostream>
#include <vector>
// -------------------- OpenMesh
#include <OpenMesh/Core/IO/OMFormat.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Endian.hh>
#include <OpenMesh/Core/IO/exporter/BaseExporter.hh>
#include <OpenMesh/Core/IO/writer/OMWriter.hh>

4
src/OpenMesh/Core/IO/writer/PLYWriter.cc
View File

@@ -50,15 +50,11 @@
//== INCLUDES =================================================================
#include <fstream>
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Endian.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/PLYWriter.hh>
#include <OpenMesh/Core/Utils/GenProg.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
#include <iostream>

1
src/OpenMesh/Core/IO/writer/STLWriter.cc
View File

@@ -54,7 +54,6 @@
#include <fstream>
// OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Geometry/VectorT.hh>
#include <OpenMesh/Core/IO/BinaryHelper.hh>

2
src/OpenMesh/Core/IO/writer/VTKWriter.cc
View File

@@ -3,11 +3,9 @@
#include <fstream>
#include <limits>
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/VTKWriter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
//=== NAMESPACES ==============================================================

1
src/OpenMesh/Core/Mesh/TriConnectivity.cc
View File

@@ -50,7 +50,6 @@
// CLASS TriMeshT - IMPLEMENTATION
#include <OpenMesh/Core/Mesh/TriConnectivity.hh>
#include <OpenMesh/Core/System/omstream.hh>
namespace OpenMesh
{

1
src/OpenMesh/Core/Utils/BaseProperty.cc
View File

@@ -47,7 +47,6 @@
\*===========================================================================*/
#include <OpenMesh/Core/Utils/BaseProperty.hh>
#include <ostream>
namespace OpenMesh
{

1
src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
View File

@@ -59,7 +59,6 @@
#include <OpenMesh/Core/Utils/RandomNumberGenerator.hh>
#include <cstdlib>
//== NAMESPACES ===============================================================

4
src/OpenMesh/Tools/Utils/Gnuplot.cc
View File

@@ -46,8 +46,8 @@
#endif
#ifndef WIN32
#include <stdlib.h>
#include <string.h>
#include <string.h>
#else
#ifdef __MINGW32__
#include <stdlib.h>

2
src/OpenMesh/Tools/Utils/conio.cc
View File

@@ -46,7 +46,6 @@
* *
\*===========================================================================*/
#include <OpenMesh/Core/System/config.hh>
#include <OpenMesh/Tools/Utils/conio.hh>
// ----------------------------------------------------------------- MSVC Compiler ----
@@ -92,7 +91,6 @@ int getche() { return ::getche(); }
#endif
#include <termios.h> /* tcsetattr() */
#include <sys/ioctl.h> /* ioctl() */
#include <sys/time.h> /* struct timeval */
namespace OpenMesh {
namespace Utils {

2
src/OpenMesh/Tools/Utils/conio.hh
View File

@@ -49,6 +49,8 @@
#ifndef OPENMESH_UTILS_CONIO_HH
#define OPENMESH_UTILS_CONIO_HH
// ----------------------------------------------------------------------------
#include <OpenMesh/Core/System/OpenMeshDLLMacros.hh>
namespace OpenMesh {
namespace Utils {
// ----------------------------------------------------------------------------

4
src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc
View File

@@ -57,9 +57,9 @@
#include <OpenMesh/Tools/VDPM/VHierarchyWindow.hh>
#include <cstring>
#ifndef WIN32
#include <string.h>
#include <cstdlib>
#else
#if defined(__MINGW32__)
#include <stdlib.h>

4
src/Python/Bindings.cc
View File

@@ -1,11 +1,11 @@
#include "Python/Bindings.hh"
#include "Python/Vector.hh"
#include "Python/Mesh.hh"
#include "Python/Iterator.hh"
#include "Python/Circulator.hh"
#include "Python/PropertyManager.hh"
#include "Python/InputOutput.hh"
#include <memory>
namespace OpenMesh {
namespace Python {