diff --git a/src/OpenMesh/Core/IO/SR_binary_spec.hh b/src/OpenMesh/Core/IO/SR_binary_spec.hh index 21242e4d..690fdc0e 100644 --- a/src/OpenMesh/Core/IO/SR_binary_spec.hh +++ b/src/OpenMesh/Core/IO/SR_binary_spec.hh @@ -126,7 +126,7 @@ SIMPLE_BINARY(char); SIMPLE_BINARY(int8_t); SIMPLE_BINARY(int16_t); SIMPLE_BINARY(int32_t); -SIMPLE_BINARY(int64_t); +//SIMPLE_BINARY(int64_t); // TODO: This does not work. Find out why. SIMPLE_BINARY(uint8_t); SIMPLE_BINARY(uint16_t); SIMPLE_BINARY(uint32_t); diff --git a/src/OpenMesh/Core/Utils/PropertyCreator.cc b/src/OpenMesh/Core/Utils/PropertyCreator.cc index 98f21e30..63850beb 100644 --- a/src/OpenMesh/Core/Utils/PropertyCreator.cc +++ b/src/OpenMesh/Core/Utils/PropertyCreator.cc @@ -44,7 +44,8 @@ #include #include #include -//#include +#include + namespace OpenMesh { @@ -62,33 +63,40 @@ bool PropertyCreator::can_you_create(const std::string& _type_name) } /* namespace OpenMesh */ -OM_REGISTER_PROPERTY_TYPE(OpenMesh::FaceHandle) -OM_REGISTER_PROPERTY_TYPE(OpenMesh::EdgeHandle) -OM_REGISTER_PROPERTY_TYPE(OpenMesh::HalfedgeHandle) -OM_REGISTER_PROPERTY_TYPE(OpenMesh::VertexHandle) -OM_REGISTER_PROPERTY_TYPE(OpenMesh::MeshHandle) +OM_REGISTER_PROPERTY_TYPE(FaceHandle) +OM_REGISTER_PROPERTY_TYPE(EdgeHandle) +OM_REGISTER_PROPERTY_TYPE(HalfedgeHandle) +OM_REGISTER_PROPERTY_TYPE(VertexHandle) +OM_REGISTER_PROPERTY_TYPE(MeshHandle) OM_REGISTER_PROPERTY_TYPE(bool) -OM_REGISTER_PROPERTY_TYPE(char) -OM_REGISTER_PROPERTY_TYPE(signed char) -OM_REGISTER_PROPERTY_TYPE(double) OM_REGISTER_PROPERTY_TYPE(float) -OM_REGISTER_PROPERTY_TYPE(int) - +OM_REGISTER_PROPERTY_TYPE(double) +OM_REGISTER_PROPERTY_TYPE(long double) +OM_REGISTER_PROPERTY_TYPE(char) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::int8_t ) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::int16_t ) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::int32_t ) +//OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::int64_t ) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::uint8_t ) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::uint16_t) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::uint32_t) +OM_REGISTER_PROPERTY_TYPE(OpenMesh::IO::uint64_t) OM_REGISTER_PROPERTY_TYPE(std::string) -OM_REGISTER_PROPERTY_TYPE(std::vector) -OM_REGISTER_PROPERTY_TYPE(std::vector) -OM_REGISTER_PROPERTY_TYPE(std::vector) -OM_REGISTER_PROPERTY_TYPE(std::vector) OM_REGISTER_PROPERTY_TYPE(std::vector) - -OM_REGISTER_PROPERTY_TYPE(short) - -OM_REGISTER_PROPERTY_TYPE(unsigned char); -OM_REGISTER_PROPERTY_TYPE(unsigned int); -OM_REGISTER_PROPERTY_TYPE(unsigned short); -OM_REGISTER_PROPERTY_TYPE(unsigned long); +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) +OM_REGISTER_PROPERTY_TYPE(std::vector) OM_REGISTER_PROPERTY_TYPE(Vec1c); OM_REGISTER_PROPERTY_TYPE(Vec1uc);