Merge topic 'null-axis-guard'

3a62d26 Add guards for null XAxis and YAxis. Acked-by: Kitware Robot <[email protected]> Reviewed-by: Allison Vacanti <[email protected]> Acked-by: Shawn Waldon <[email protected]> Merge-request: !3589
leftwillow · Nov 17, 2017 · 3124db7 · 3124db7
2 parents d7e4612 + 3a62d26
commit 3124db7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Charts/Core/vtkControlPointsItem.cxx b/Charts/Core/vtkControlPointsItem.cxx
@@ -365,8 +365,8 @@ void vtkControlPointsItem::TransformScreenToData(const vtkVector2f& in, vtkVecto
   out.SetX(static_cast<float>((out.GetX() / ss[2]) - ss[0]));
   out.SetY(static_cast<float>((out.GetY() / ss[3]) - ss[1]));
 
-  const bool logX = this->GetXAxis()->GetLogScaleActive();
-  const bool logY = this->GetYAxis()->GetLogScaleActive();
+  const bool logX = this->GetXAxis() && this->GetXAxis()->GetLogScaleActive();
+  const bool logY = this->GetYAxis() && this->GetYAxis()->GetLogScaleActive();
 
   if (logX)
   {
@@ -383,8 +383,8 @@ void vtkControlPointsItem::TransformDataToScreen(const vtkVector2f& in, vtkVecto
 {
   out = in;
 
-  const bool logX = this->GetXAxis()->GetLogScaleActive();
-  const bool logY = this->GetYAxis()->GetLogScaleActive();
+  const bool logX = this->GetXAxis() && this->GetXAxis()->GetLogScaleActive();
+  const bool logY = this->GetYAxis() && this->GetYAxis()->GetLogScaleActive();
 
   if (logX)
   {