diff options
Diffstat (limited to 'src/3rdparty/assimp/code/DXFLoader.cpp')
-rw-r--r-- | src/3rdparty/assimp/code/DXFLoader.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/code/DXFLoader.cpp b/src/3rdparty/assimp/code/DXFLoader.cpp index 3e69eff1e..1e932e509 100644 --- a/src/3rdparty/assimp/code/DXFLoader.cpp +++ b/src/3rdparty/assimp/code/DXFLoader.cpp @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -54,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "DXFHelper.h" #include <assimp/IOSystem.hpp> #include <assimp/scene.h> +#include <assimp/importerdesc.h> + #include <numeric> using namespace Assimp; @@ -223,8 +226,8 @@ void DXFImporter::ConvertMeshes(aiScene* pScene, DXF::FileData& output) unsigned int vcount = 0, icount = 0; for (const DXF::Block& bl : output.blocks) { for (std::shared_ptr<const DXF::PolyLine> pl : bl.lines) { - vcount += pl->positions.size(); - icount += pl->counts.size(); + vcount += static_cast<unsigned int>(pl->positions.size()); + icount += static_cast<unsigned int>(pl->counts.size()); } } @@ -296,7 +299,7 @@ void DXFImporter::ConvertMeshes(aiScene* pScene, DXF::FileData& output) for(const DXF::PolyLine* pl : corr[elem.second]){ // sum over all faces since we need to 'verbosify' them. cvert += std::accumulate(pl->counts.begin(),pl->counts.end(),0); - cface += pl->counts.size(); + cface += static_cast<unsigned int>(pl->counts.size()); } aiVector3D* verts = mesh->mVertices = new aiVector3D[cvert]; @@ -705,7 +708,7 @@ void DXFImporter::ParsePolyLine(DXF::LineReader& reader, DXF::FileData& output) // closed polyline? if (line.flags & DXF_POLYLINE_FLAG_CLOSED) { - line.indices.push_back(line.positions.size()-1); + line.indices.push_back(static_cast<unsigned int>(line.positions.size()-1)); line.indices.push_back(0); line.counts.push_back(2); } @@ -906,7 +909,7 @@ void DXFImporter::Parse3DFace(DXF::LineReader& reader, DXF::FileData& output) line.counts.push_back(cnt); for (unsigned int i = 0; i < cnt; ++i) { - line.indices.push_back(line.positions.size()); + line.indices.push_back(static_cast<unsigned int>(line.positions.size())); line.positions.push_back(vip[i]); line.colors.push_back(clr); } |