X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverSTL%2FDriverSTL_W_SMDS_Mesh.cxx;h=78a068e578da1ef12631b8b4d319c05fe16a5131;hb=2a6e16b7faacf40cf3b91605690ce04f14141f1b;hp=5499183cb17440c3562d3873f4f9e19bee344133;hpb=e09cefb492091eed2987a366e9d607d0078e8cb9;p=modules%2Fsmesh.git diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx index 5499183cb..78a068e57 100644 --- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx +++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -22,6 +22,12 @@ #include "DriverSTL_W_SMDS_Mesh.h" +#ifdef WIN32 +#define NOMINMAX +#endif + +#include + #include "SMDS_FaceOfNodes.hxx" #include "SMDS_IteratorOnIterators.hxx" #include "SMDS_Mesh.hxx" @@ -32,8 +38,6 @@ #include "SMESH_File.hxx" #include "SMESH_TypeDefs.hxx" -#include - //#include "utilities.h" #include @@ -301,7 +305,7 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeAscii() const { const SMDS_MeshElement* aFace = itFaces->next(); int nbTria = getTriangles( aFace, triaNodes ); - + for ( int iT = 0, iN = 0; iT < nbTria; ++iT ) { gp_XYZ normale = getNormale( triaNodes[iN], @@ -311,7 +315,7 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeAscii() const " facet normal % 12e % 12e % 12e\n" " outer loop\n" , normale.X(), normale.Y(), normale.Z()); - aFile.writeRaw ( sval, 70 ); + aFile.writeRaw ( sval, 70 + strlen( sval + 70 )); // at least 70 but can be more (WIN) for ( int jN = 0; jN < 3; ++jN, ++iN ) { @@ -319,11 +323,11 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeAscii() const sprintf (sval, " vertex % 12e % 12e % 12e\n", node.X(), node.Y(), node.Z() ); - aFile.writeRaw ( sval, 54 ); + aFile.writeRaw ( sval, 54 + strlen( sval + 54 )); } aFile.writeRaw (" endloop\n" " endfacet\n", 21 ); - } + } } aFile.writeRaw ("endsolid\n" , 9 );