Commit efc3a4e9 authored by Sean McBride's avatar Sean McBride

Fix possible null deref warnings

Removed other checks which are making it think
other things could be null.  Looking elsewhere in
these files, many other places assume these things
aren’t null.

Also fix a call to GetMaximum that should have been
GetMTime.

Change-Id: Ie880a0992b64ce4389ab9b40d48aa32692595362
parent 53c1f9fb
......@@ -597,11 +597,11 @@ void vtkPlotBar::Update()
vtkDebugMacro(<< "Updating cached values.");
this->UpdateTableCache(table);
}
else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis && this->YAxis->GetMaximum() > this->BuildTime))
else if ((this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis->GetMTime() > this->BuildTime))
{
if (this->LogX != this->XAxis->GetLogScale() ||
this->LogY != this->YAxis->GetLogScale())
if ((this->LogX != this->XAxis->GetLogScale()) ||
(this->LogY != this->YAxis->GetLogScale()))
{
this->LogX = this->XAxis->GetLogScale();
this->LogY = this->YAxis->GetLogScale();
......
......@@ -75,11 +75,11 @@ void vtkPlotFunctionalBag::Update()
vtkDebugMacro(<< "Updating cached values.");
this->UpdateTableCache(table);
}
else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis && this->YAxis->GetMaximum() > this->BuildTime))
else if ((this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis->GetMTime() > this->BuildTime))
{
if (this->LogX != this->XAxis->GetLogScale() ||
this->LogY != this->YAxis->GetLogScale())
if ((this->LogX != this->XAxis->GetLogScale()) ||
(this->LogY != this->YAxis->GetLogScale()))
{
this->UpdateTableCache(table);
}
......
......@@ -142,11 +142,11 @@ void vtkPlotPoints::Update()
vtkDebugMacro(<< "Updating cached values.");
this->UpdateTableCache(table);
}
else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis && this->YAxis->GetMaximum() > this->BuildTime))
else if ((this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis->GetMTime() > this->BuildTime))
{
if (this->LogX != this->XAxis->GetLogScale() ||
this->LogY != this->YAxis->GetLogScale())
if ((this->LogX != this->XAxis->GetLogScale()) ||
(this->LogY != this->YAxis->GetLogScale()))
{
this->UpdateTableCache(table);
}
......
......@@ -631,8 +631,8 @@ void vtkPlotStacked::Update()
vtkDebugMacro(<< "Updating cached values.");
this->UpdateTableCache(table);
}
else if ((this->XAxis && this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis && this->YAxis->GetMTime() > this->BuildTime))
else if ((this->XAxis->GetMTime() > this->BuildTime) ||
(this->YAxis->GetMTime() > this->BuildTime))
{
if (this->LogX != this->XAxis->GetLogScaleActive() ||
this->LogY != this->YAxis->GetLogScaleActive())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment