From c8d44b86e2be6cd1a745ea5e6fa07358e5988aed Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 15 Feb 2019 08:47:03 +0100 Subject: [PATCH] Fix a compil issue with some compilers. --- common/gal/gal_display_options.cpp | 2 +- pcbnew/pcb_parser.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/gal/gal_display_options.cpp b/common/gal/gal_display_options.cpp index 4aad4388d7..0557264127 100644 --- a/common/gal/gal_display_options.cpp +++ b/common/gal/gal_display_options.cpp @@ -71,7 +71,7 @@ void GAL_DISPLAY_OPTIONS::ReadConfig( wxConfigBase* aCfg, const wxString& aBaseN aCfg->Read( aBaseName + GalGridMaxDensityConfig, &m_gridMinSpacing, 10 ); aCfg->Read( aBaseName + GalGridAxesEnabledConfig, &m_axesEnabled, false ); aCfg->Read( aBaseName + GalFullscreenCursorConfig, &m_fullscreenCursor, false ); - aCfg->Read( aBaseName + GalForceDisplayCursorConfig, &m_forceDisplayCursor, false ); + aCfg->Read( aBaseName + GalForceDisplayCursorConfig, &m_forceDisplayCursor, true ); NotifyChanged(); } diff --git a/pcbnew/pcb_parser.h b/pcbnew/pcb_parser.h index 57b70a5daf..f7c1b43d07 100644 --- a/pcbnew/pcb_parser.h +++ b/pcbnew/pcb_parser.h @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * 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 * 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 // 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 - double int_limit = std::numeric_limits::max() * M_SQRT1_2f64; + double int_limit = std::numeric_limits::max() * 0.7071; // 0.7071 = roughly 1/sqrt(2) return KiROUND( Clamp( -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 // 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 - double int_limit = std::numeric_limits::max() * M_SQRT1_2f64; + double int_limit = std::numeric_limits::max() * 0.7071; // Use here KiROUND, not KIROUND (see comments about them) // when having a function as argument, because it will be called twice