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

fix compiler warning

Browse Source
This commit is contained in:
wmayer 2016-10-31 21:31:35 +01:00
parent 6c58963ba5
commit e75fe0d6e3
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@ -143,7 +143,7 @@ ELSE(UNIX)
######### Windows ########### ######### Windows ###########
#MESSAGE("-- Windows system detected") #MESSAGE("-- Windows system detected")
IF(MSVC) IF(MSVC)
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4267 /wd4390 /wd4503 /wd4436) ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4805 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4146 /wd4267 /wd4390 /wd4503 /wd4436)
ELSE(MSVC) ELSE(MSVC)
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB) ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB)
ENDIF(MSVC) ENDIF(MSVC)

6
src/Mod/MeshPart/App/AppMeshPartPy.cpp
View File

@ -202,9 +202,9 @@ private:
Py::Float r(t[0]); Py::Float r(t[0]);
Py::Float g(t[1]); Py::Float g(t[1]);
Py::Float b(t[2]); Py::Float b(t[2]);
App::Color c(static_cast<double>(r), App::Color c(static_cast<float>(r),
static_cast<double>(g), static_cast<float>(g),
static_cast<double>(b)); static_cast<float>(b));
colors.push_back(c.getPackedValue()); colors.push_back(c.getPackedValue());
} }
mesher.setColors(colors); mesher.setColors(colors);

5
src/Mod/Points/App/Points.cpp
View File

@ -119,7 +119,10 @@ std::vector<PointKernel::value_type> PointKernel::getValidPoints() const
if (!(boost::math::isnan(it->x) || if (!(boost::math::isnan(it->x) ||
boost::math::isnan(it->y) || boost::math::isnan(it->y) ||
boost::math::isnan(it->z))) boost::math::isnan(it->z)))
valid.push_back(value_type(it->x, it->y, it->z)); valid.push_back(value_type(
static_cast<float_type>(it->x),
static_cast<float_type>(it->y),
static_cast<float_type>(it->z)));
} }
return valid; return valid;
} }

3
src/Mod/Points/App/Points.h
View File

@ -46,7 +46,8 @@ class PointsExport PointKernel : public Data::ComplexGeoData
TYPESYSTEM_HEADER(); TYPESYSTEM_HEADER();
public: public:
typedef Base::Vector3f value_type; typedef float float_type;
typedef Base::Vector3<float_type> value_type;
typedef std::vector<value_type>::difference_type difference_type; typedef std::vector<value_type>::difference_type difference_type;
typedef std::vector<value_type>::size_type size_type; typedef std::vector<value_type>::size_type size_type;