suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix various warnings with VC++

Browse Source
This commit is contained in:
wmayer 2015-09-01 12:50:10 +02:00
parent e19e7336cd
commit 86a7ed44e0
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Draft/App/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if(MSVC)
add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH -D_CRT_SECURE_NO_WARNINGS)
else(MSVC)
add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
endif(MSVC)

4
src/Mod/Draft/App/PreCompiled.h
View File

@ -37,6 +37,10 @@
# define BaseExport
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4275)
#endif
#ifdef _PreComp_
// standard

4
src/Mod/Draft/App/dxf.cpp
View File

@ -1419,10 +1419,10 @@ void CDxfRead::get_line()
m_ifs->getline(m_str, 1024);
char str[1024];
int len = strlen(m_str);
size_t len = strlen(m_str);
int j = 0;
bool non_white_found = false;
for(int i = 0; i<len; i++){
for(size_t i = 0; i<len; i++){
if(non_white_found || (m_str[i] != ' ' && m_str[i] != '\t')){
if(m_str[i] != '\r')
{

19
src/Mod/Path/libarea/AreaClipper.cpp
View File

@ -138,11 +138,14 @@ static bool IsPolygonClockwise(const TPolygon& p)
{
#if 1
double area = 0.0;
unsigned int s = p.size();
for(unsigned int i = 0; i<s; i++)
std::size_t s = p.size();
for(std::size_t i = 0; i<s; i++)
{
int im1 = i-1;
if(im1 < 0)im1 += s;
std::size_t im1;
if (i == 0)
im1 = s - 1;
else
im1 = i - 1;
DoubleAreaPoint pt0(p[im1]);
DoubleAreaPoint pt1(p[i]);
@ -216,7 +219,7 @@ static void OffsetWithLoops(const TPolyPolygon &pp, TPolyPolygon &pp_new, double
{
if(reverse)
{
for(unsigned int j = p.size()-1; j > 1; j--)MakeLoop(p[j], p[j-1], p[j-2], radius);
for(std::size_t j = p.size()-1; j > 1; j--)MakeLoop(p[j], p[j-1], p[j-2], radius);
MakeLoop(p[1], p[0], p[p.size()-1], radius);
MakeLoop(p[0], p[p.size()-1], p[p.size()-2], radius);
}
@ -260,7 +263,7 @@ static void OffsetWithLoops(const TPolyPolygon &pp, TPolyPolygon &pp_new, double
const TPolygon& p = copy[i];
TPolygon p_new;
p_new.resize(p.size());
int size_minus_one = p.size() - 1;
std::size_t size_minus_one = p.size() - 1;
for(unsigned int j = 0; j < p.size(); j++)p_new[j] = p[size_minus_one - j];
pp_new[i] = p_new;
}
@ -337,7 +340,7 @@ static void OffsetSpansWithObrounds(const CArea& area, TPolyPolygon &pp_new, dou
const TPolygon& p = copy[i];
TPolygon p_new;
p_new.resize(p.size());
int size_minus_one = p.size() - 1;
std::size_t size_minus_one = p.size() - 1;
for(unsigned int j = 0; j < p.size(); j++)p_new[j] = p[size_minus_one - j];
pp_new[i] = p_new;
}
@ -362,7 +365,7 @@ static void MakePolyPoly( const CArea& area, TPolyPolygon &pp, bool reverse = tr
p.resize(pts_for_AddVertex.size());
if(reverse)
{
unsigned int i = pts_for_AddVertex.size() - 1;// clipper wants them the opposite way to CArea
std::size_t i = pts_for_AddVertex.size() - 1;// clipper wants them the opposite way to CArea
for(std::list<DoubleAreaPoint>::iterator It = pts_for_AddVertex.begin(); It != pts_for_AddVertex.end(); It++, i--)
{
p[i] = It->int_point();

2
src/Mod/Sketcher/App/planegcs/Geo.cpp
View File

@ -55,7 +55,7 @@ DeriVector2 DeriVector2::getNormalized() const
{
double l=length();
if(l==0.0) {
return DeriVector2(0, 0, dx/0.0, dy/0.0);
return DeriVector2(0, 0, dx, dy);
} else {
DeriVector2 rtn;
rtn.x = x/l;