haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a compil issue with some compilers.

This commit is contained in:
jean-pierre charras 2019-02-15 08:47:03 +01:00
parent 5e5167f198
commit c8d44b86e2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/gal/gal_display_options.cpp
View File

@ -71,7 +71,7 @@ void GAL_DISPLAY_OPTIONS::ReadConfig( wxConfigBase* aCfg, const wxString& aBaseN
aCfg->Read( aBaseName + GalGridMaxDensityConfig, &m_gridMinSpacing, 10 ); aCfg->Read( aBaseName + GalGridMaxDensityConfig, &m_gridMinSpacing, 10 );
aCfg->Read( aBaseName + GalGridAxesEnabledConfig, &m_axesEnabled, false ); aCfg->Read( aBaseName + GalGridAxesEnabledConfig, &m_axesEnabled, false );
aCfg->Read( aBaseName + GalFullscreenCursorConfig, &m_fullscreenCursor, false ); aCfg->Read( aBaseName + GalFullscreenCursorConfig, &m_fullscreenCursor, false );
aCfg->Read( aBaseName + GalForceDisplayCursorConfig, &m_forceDisplayCursor, false ); aCfg->Read( aBaseName + GalForceDisplayCursorConfig, &m_forceDisplayCursor, true );
NotifyChanged(); NotifyChanged();
} }

6
pcbnew/pcb_parser.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2012 CERN * Copyright (C) 2012 CERN
* Copyright (C) 2012-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2012-2019 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -239,7 +239,7 @@ class PCB_PARSER : public PCB_LEXER
// larger or smaller than those board units represent undefined behavior for // larger or smaller than those board units represent undefined behavior for
// the system. We limit values to the largest that is visible on the screen // the system. We limit values to the largest that is visible on the screen
// This is the diagonal distance of the full screen ~1.5m // This is the diagonal distance of the full screen ~1.5m
double int_limit = std::numeric_limits<int>::max() * M_SQRT1_2f64; double int_limit = std::numeric_limits<int>::max() * 0.7071; // 0.7071 = roughly 1/sqrt(2)
return KiROUND( Clamp<double>( -int_limit, retval, int_limit ) ); return KiROUND( Clamp<double>( -int_limit, retval, int_limit ) );
} }
@ -250,7 +250,7 @@ class PCB_PARSER : public PCB_LEXER
// N.B. we currently represent board units as integers. Any values that are // N.B. we currently represent board units as integers. Any values that are
// larger or smaller than those board units represent undefined behavior for // larger or smaller than those board units represent undefined behavior for
// the system. We limit values to the largest that is visible on the screen // the system. We limit values to the largest that is visible on the screen
double int_limit = std::numeric_limits<int>::max() * M_SQRT1_2f64; double int_limit = std::numeric_limits<int>::max() * 0.7071;
// Use here KiROUND, not KIROUND (see comments about them) // Use here KiROUND, not KIROUND (see comments about them)
// when having a function as argument, because it will be called twice // when having a function as argument, because it will be called twice