MSVC warnings.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-07 15:12:08 +03:00
parent 342bf9d124
commit 34a960fcd6
4 changed files with 30 additions and 5 deletions

View File

@ -741,5 +741,6 @@ MSVC_DEBUG_CXXFLAGS += \
-wd4265 \ -wd4265 \
-wd4599 \ -wd4599 \
-wd4371 \ -wd4371 \
-wd4718 -wd4718 \
-wd4946
} }

View File

@ -38,6 +38,8 @@
#include "iostream" #include "iostream"
#include "../vmisc/diagnostic.h"
/** /**
* Default constructor. * Default constructor.
*/ */
@ -109,7 +111,11 @@ bool DL_Dxf::in(const std::string& file, DL_CreationInterface* creationInterface
firstCall = true; firstCall = true;
currentObjectType = DL_UNKNOWN; currentObjectType = DL_UNKNOWN;
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
fp = fopen(file.c_str(), "rt"); fp = fopen(file.c_str(), "rt");
QT_WARNING_POP
if (fp) if (fp)
{ {
while (readDxfGroups(fp, creationInterface)) {} 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) DL_WriterA* DL_Dxf::out(const char* file, DL_Codes::version version)
{ {
char* f = new char[strlen(file)+1]; char* f = new char[strlen(file)+1];
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
strcpy(f, file); strcpy(f, file);
QT_WARNING_POP
this->version = version; this->version = version;
DL_WriterA* dw = new DL_WriterA(f, version); DL_WriterA* dw = new DL_WriterA(f, version);
@ -3121,11 +3130,17 @@ void DL_Dxf::writeMText(DL_WriterA& dw,
int i; int i;
for (i=250; i<length; i+=250) for (i=250; i<length; i+=250)
{ {
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
strncpy(chunk, &data.text.c_str()[i-250], 250); strncpy(chunk, &data.text.c_str()[i-250], 250);
QT_WARNING_POP
chunk[250]='\0'; chunk[250]='\0';
dw.dxfString(3, chunk); dw.dxfString(3, chunk);
} }
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
strncpy(chunk, &data.text.c_str()[i-250], 250); strncpy(chunk, &data.text.c_str()[i-250], 250);
QT_WARNING_POP
chunk[250]='\0'; chunk[250]='\0';
dw.dxfString(1, chunk); dw.dxfString(1, chunk);
@ -5864,12 +5879,15 @@ void DL_Dxf::test()
char* buf5 = new char[10]; char* buf5 = new char[10];
char* buf6 = new char[10]; char* buf6 = new char[10];
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
strcpy(buf1, " 10\n"); strcpy(buf1, " 10\n");
strcpy(buf2, "10"); strcpy(buf2, "10");
strcpy(buf3, "10\n"); strcpy(buf3, "10\n");
strcpy(buf4, " 10 \n"); strcpy(buf4, " 10 \n");
strcpy(buf5, " 10 \r"); strcpy(buf5, " 10 \r");
strcpy(buf6, "\t10 \n"); strcpy(buf6, "\t10 \n");
QT_WARNING_POP
// Try to avoid deleting array from an offset // Try to avoid deleting array from an offset
char* buf1Copy = buf1; char* buf1Copy = buf1;

View File

@ -64,6 +64,8 @@ bool DL_WriterA::openFailed() const
void DL_WriterA::dxfReal(int gc, double value) const void DL_WriterA::dxfReal(int gc, double value) const
{ {
char str[256]; char str[256];
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
if (version==DL_Codes::AC1009_MIN) if (version==DL_Codes::AC1009_MIN)
{ {
sprintf(str, "%.6lf", value); sprintf(str, "%.6lf", value);
@ -72,6 +74,7 @@ void DL_WriterA::dxfReal(int gc, double value) const
{ {
sprintf(str, "%.16lf", value); sprintf(str, "%.16lf", value);
} }
QT_WARNING_POP
// fix for german locale: // fix for german locale:
strReplace(str, ',', '.'); strReplace(str, ',', '.');
@ -125,7 +128,10 @@ void DL_WriterA::dxfInt(int gc, int value) const
void DL_WriterA::dxfHex(int gc, int value) const void DL_WriterA::dxfHex(int gc, int value) const
{ {
char str[12]; char str[12];
QT_WARNING_PUSH
QT_WARNING_DISABLE_MSVC(4996)
sprintf(str, "%0X", value); sprintf(str, "%0X", value);
QT_WARNING_POP
dxfString(gc, str); dxfString(gc, str);
} }

View File

@ -40,7 +40,7 @@ public:
~Vector3D() {} ~Vector3D() {}
float X, Y, Z; double X, Y, Z;
}; };
/* /*
} }