Commit 8552d861 authored by David Cole's avatar David Cole
Browse files

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.114...

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.114 -j1.115 Common/vtkMath.cxx)
parent 5fd77779
......@@ -16,7 +16,7 @@
#include "vtkObjectFactory.h"
#include "vtkDataArray.h"
vtkCxxRevisionMacro(vtkMath, "1.97");
vtkCxxRevisionMacro(vtkMath, "1.97.4.1");
vtkStandardNewMacro(vtkMath);
long vtkMath::Seed = 1177; // One authors home address
......@@ -850,7 +850,7 @@ int vtkMath::SolveCubic( double c0, double c1, double c2, double c3,
}
else //single real and complex conjugate pair
{
A = -VTK_SIGN(R) * pow(fabs(R) + sqrt(R_squared - Q_cubed),0.33333333);
A = -VTK_SIGN(R) * pow(fabs(R) + sqrt(R_squared - Q_cubed), 1.0/3);
if( A == 0.0 )
{
......
Supports Markdown
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