Commit f1a166e1 authored by David Partyka's avatar David Partyka
Browse files

Merge branch 'math-remove-legacy' into release

parents d5c9e4d6 8ca0e2e7
......@@ -83,16 +83,6 @@ public:
static float DegreesFromRadians( float radians);
static double DegreesFromRadians( double radians);
// Description:
// @deprecated Replaced by vtkMath::RadiansFromDegrees() as of VTK 5.4.
VTK_LEGACY(static float DegreesToRadians());
VTK_LEGACY(static double DoubleDegreesToRadians());
// Description:
// @deprecated Replaced by vtkMath::DegreesFromRadians() as of VTK 5.4.
VTK_LEGACY(static float RadiansToDegrees());
VTK_LEGACY(static double DoubleRadiansToDegrees());
// Description:
// Rounds a float to the nearest integer.
static int Round(float f) {
......@@ -1002,45 +992,6 @@ inline double vtkMath::DegreesFromRadians( double x )
return x * 57.29577951308232;
}
#ifndef VTK_LEGACY_REMOVE
//----------------------------------------------------------------------------
inline float vtkMath::DegreesToRadians()
{
VTK_LEGACY_REPLACED_BODY(vtkMath::DegreesToRadians, "VTK 5.4",
vtkMath::RadiansFromDegrees);
return vtkMath::RadiansFromDegrees( 1.f );
}
//----------------------------------------------------------------------------
inline double vtkMath::DoubleDegreesToRadians()
{
VTK_LEGACY_REPLACED_BODY(vtkMath::DoubleDegreesToRadians, "VTK 5.4",
vtkMath::RadiansFromDegrees);
return vtkMath::RadiansFromDegrees( 1. );
}
//----------------------------------------------------------------------------
inline float vtkMath::RadiansToDegrees()
{
VTK_LEGACY_REPLACED_BODY(vtkMath::RadiansToDegrees, "VTK 5.4",
vtkMath::DegreesFromRadians);
return vtkMath::DegreesFromRadians( 1.f );
}
//----------------------------------------------------------------------------
inline double vtkMath::DoubleRadiansToDegrees()
{
VTK_LEGACY_REPLACED_BODY(vtkMath::DoubleRadiansToDegrees, "VTK 5.4",
vtkMath::DegreesFromRadians);
return vtkMath::DegreesFromRadians( 1. );
}
#endif // #ifndef VTK_LEGACY_REMOVE
//----------------------------------------------------------------------------
inline vtkTypeInt64 vtkMath::Factorial( int N )
{
......
......@@ -18,6 +18,7 @@
#include <stdio.h>
#include <ctype.h>
#include <stddef.h>
#include <sys/stat.h>
#include <fcntl.h>
......@@ -984,7 +985,7 @@ bool MET_InitReadField(MET_FieldRecordType * _mf,
//
bool MET_SkipToVal(METAIO_STREAM::istream &fp)
{
char c;
int c;
if( fp.eof() )
{
return false;
......@@ -992,12 +993,12 @@ bool MET_SkipToVal(METAIO_STREAM::istream &fp)
c = fp.get();
while( c != MET_SeperatorChar && c != ':' && !fp.eof() )
while( !fp.eof() && c != MET_SeperatorChar && c != ':' )
{
c = fp.get();
}
while( ( c == MET_SeperatorChar || c == ':' || isspace(c) ) && !fp.eof() )
while( !fp.eof() && ( c == MET_SeperatorChar || c == ':' || isspace(c) ) )
{
c = fp.get();
}
......
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