diff --git a/common.pri b/common.pri index 6a3de2591..109e75f86 100644 --- a/common.pri +++ b/common.pri @@ -741,5 +741,6 @@ MSVC_DEBUG_CXXFLAGS += \ -wd4265 \ -wd4599 \ -wd4371 \ - -wd4718 + -wd4718 \ + -wd4946 } diff --git a/src/libs/vdxf/dxflib/dl_dxf.cpp b/src/libs/vdxf/dxflib/dl_dxf.cpp index cc5eff4d4..ecc1b7416 100644 --- a/src/libs/vdxf/dxflib/dl_dxf.cpp +++ b/src/libs/vdxf/dxflib/dl_dxf.cpp @@ -38,6 +38,8 @@ #include "iostream" +#include "../vmisc/diagnostic.h" + /** * Default constructor. */ @@ -109,7 +111,11 @@ bool DL_Dxf::in(const std::string& file, DL_CreationInterface* creationInterface firstCall = true; currentObjectType = DL_UNKNOWN; +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4996) fp = fopen(file.c_str(), "rt"); +QT_WARNING_POP + if (fp) { while (readDxfGroups(fp, creationInterface)) {} @@ -2538,7 +2544,10 @@ void DL_Dxf::endSequence(DL_CreationInterface* creationInterface) DL_WriterA* DL_Dxf::out(const char* file, DL_Codes::version version) { char* f = new char[strlen(file)+1]; +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4996) strcpy(f, file); +QT_WARNING_POP this->version = version; DL_WriterA* dw = new DL_WriterA(f, version); @@ -3121,11 +3130,17 @@ void DL_Dxf::writeMText(DL_WriterA& dw, int i; for (i=250; i