From 1f345052cd607ed15333742e84a825be1bfcb018 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 23 Feb 2017 14:30:43 +0100 Subject: [PATCH] Fix erroneous conversion between wxColor and COLOR4D --- common/gal/color4d.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/gal/color4d.cpp b/common/gal/color4d.cpp index 0b717364a2..f91c4d7f87 100644 --- a/common/gal/color4d.cpp +++ b/common/gal/color4d.cpp @@ -96,6 +96,7 @@ COLOR4D::COLOR4D( EDA_COLOR_T aColor ) auto search = mix_cache.find( std::pair< uint32_t, uint32_t >( myPackedColor, aPackedColor ) ); COLOR4D candidate = COLOR4D::BLACK; + if( search != mix_cache.end() ) candidate.FromU32( search->second ); @@ -164,10 +165,10 @@ COLOR4D::COLOR4D( EDA_COLOR_T aColor ) { wxColour c; c.SetRGB( aPackedColor ); - r = c.Red(); - g = c.Green(); - b = c.Blue(); - a = c.Alpha(); + r = c.Red() / 255.0; + g = c.Green() / 255.0; + b = c.Blue() / 255.0; + a = c.Alpha() / 255.0; }