From 4f369801f2378028ac7b1b306e7256a004fa2139 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sat, 25 Apr 2020 08:49:16 +0200
Subject: [PATCH] Fix a few compil and Coverity warnings.

---
 common/base_units.cpp         | 6 +++++-
 common/eda_text.cpp           | 1 +
 eeschema/sch_field.cpp        | 2 +-
 pcbnew/pcb_draw_panel_gal.cpp | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/base_units.cpp b/common/base_units.cpp
index 4555702cf1..9fb3ab4764 100644
--- a/common/base_units.cpp
+++ b/common/base_units.cpp
@@ -492,6 +492,7 @@ wxString GetAbbreviatedUnitsLabel( EDA_UNITS aUnit, bool aUseMils, EDA_DATA_TYPE
                 return _( "cu. in" );
             }
         }
+        break;      // Make compil happy.
 
     case EDA_UNITS::MILLIMETRES:
         switch( aType )
@@ -503,6 +504,7 @@ wxString GetAbbreviatedUnitsLabel( EDA_UNITS aUnit, bool aUseMils, EDA_DATA_TYPE
         case EDA_DATA_TYPE::VOLUME:
             return _( "cu. mm" );
         }
+        break;      // Make compil happy.
 
     case EDA_UNITS::PERCENT:
         return _( "%" );
@@ -514,8 +516,10 @@ wxString GetAbbreviatedUnitsLabel( EDA_UNITS aUnit, bool aUseMils, EDA_DATA_TYPE
         return _( "deg" );
 
     default:
-        return wxT( "??" );
+        break;
     }
+
+    return wxT( "??" );
 }
 
 
diff --git a/common/eda_text.cpp b/common/eda_text.cpp
index 1de0589d44..4c406b7d90 100644
--- a/common/eda_text.cpp
+++ b/common/eda_text.cpp
@@ -89,6 +89,7 @@ EDA_TEXT::EDA_TEXT( const wxString& text ) :
 {
     int sz = Mils2iu( DEFAULT_SIZE_TEXT );
     SetTextSize( wxSize( sz, sz ) );
+    m_shown_text_has_text_var_refs = false;
 
     if( !text.IsEmpty() )
     {
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 8ce385cfa9..5a0964664d 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -568,7 +568,7 @@ const wxPoint SCH_FIELD::GetPosition() const
 
 wxPoint SCH_FIELD::GetParentPosition() const
 {
-    return m_Parent->GetPosition();
+    return m_Parent ? m_Parent->GetPosition() : wxPoint( 0, 0 );
 }
 
 
diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index 20da00cdb2..e9c05b1972 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -214,7 +214,7 @@ void PCB_DRAW_PANEL_GAL::UpdateColors()
     else
         cs = Pgm().GetSettingsManager().GetColorSettings();
 
-    wxASSERT( cs );
+    wxCHECK_RET( cs, "null COLOR_SETTINGS" );
 
     if( frame && frame->IsType( FRAME_FOOTPRINT_EDITOR ) )
         cs->SetColorContext( COLOR_CONTEXT::FOOTPRINT );