mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-25 07:34:03 -06:00
Merge branch 'tm_warnings'
This commit is contained in:
commit
4b0f1b276c
2 changed files with 2 additions and 10 deletions
|
@ -147,16 +147,8 @@ public:
|
||||||
, m_renderer(m_raw_renderer)
|
, m_renderer(m_raw_renderer)
|
||||||
, m_trafo(trafo)
|
, m_trafo(trafo)
|
||||||
{
|
{
|
||||||
#ifdef _MSC_VER
|
|
||||||
// suppress false MSVC warning C4723: possible division by zero
|
|
||||||
#pragma warning(push)
|
|
||||||
#pragma warning(disable : 4723)
|
|
||||||
#endif // _MSC_VER
|
|
||||||
m_pxdim_scaled.w_mm /= pd.w_mm;
|
m_pxdim_scaled.w_mm /= pd.w_mm;
|
||||||
m_pxdim_scaled.h_mm /= pd.h_mm;
|
m_pxdim_scaled.h_mm /= pd.h_mm;
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif // _MSC_VER
|
|
||||||
m_renderer.color(foreground);
|
m_renderer.color(foreground);
|
||||||
clear(background);
|
clear(background);
|
||||||
|
|
||||||
|
|
|
@ -80,8 +80,8 @@ public:
|
||||||
|
|
||||||
/// Types that represents the dimension of a pixel in millimeters.
|
/// Types that represents the dimension of a pixel in millimeters.
|
||||||
struct PixelDim {
|
struct PixelDim {
|
||||||
double w_mm = 0.;
|
double w_mm = 1.;
|
||||||
double h_mm = 0.;
|
double h_mm = 1.;
|
||||||
|
|
||||||
PixelDim(double px_width_mm = 0.0, double px_height_mm = 0.0)
|
PixelDim(double px_width_mm = 0.0, double px_height_mm = 0.0)
|
||||||
: w_mm(px_width_mm), h_mm(px_height_mm)
|
: w_mm(px_width_mm), h_mm(px_height_mm)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue