Browse Source

Fix initialization of COLOR4D statics

Just declaring as static const would give an initialization order
fiasco since they were being used to initialize other statics.
pull/15/head
Ian McInerney 6 years ago
committed by Seth Hillbrand
parent
commit
920120864f
  1. 6
      common/gal/color4d.cpp
  2. 4
      include/gal/color4d.h

6
common/gal/color4d.cpp

@ -362,6 +362,6 @@ COLOR4D& COLOR4D::Saturate( double aFactor )
return *this;
}
const COLOR4D COLOR4D::UNSPECIFIED( 0, 0, 0, 0 );
const COLOR4D COLOR4D::WHITE( 1, 1, 1, 1 );
const COLOR4D COLOR4D::BLACK( 0, 0, 0, 1 );
constexpr COLOR4D COLOR4D::UNSPECIFIED( 0, 0, 0, 0 );
constexpr COLOR4D COLOR4D::WHITE( 1, 1, 1, 1 );
constexpr COLOR4D COLOR4D::BLACK( 0, 0, 0, 1 );

4
include/gal/color4d.h

@ -2,7 +2,7 @@
* This program source code file is part of KICAD, a free EDA CAD application.
*
* Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
* Copyright (C) 2017 Kicad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2017-2019 Kicad Developers, see AUTHORS.txt for contributors.
*
* Color class
*
@ -53,7 +53,7 @@ public:
* @param aBlue is the blue component [0.0 .. 1.0].
* @param aAlpha is the alpha value [0.0 .. 1.0].
*/
COLOR4D( double aRed, double aGreen, double aBlue, double aAlpha ) :
constexpr COLOR4D( double aRed, double aGreen, double aBlue, double aAlpha ) :
r( aRed ), g( aGreen ), b( aBlue ), a( aAlpha )
{
assert( r >= 0.0 && r <= 1.0 );

Loading…
Cancel
Save