Fixing some include-related bugs and namespace problems with math.h

parent 21965b75
...@@ -45,6 +45,7 @@ ITA_BASE_API bool isPow2( unsigned int x ); ...@@ -45,6 +45,7 @@ ITA_BASE_API bool isPow2( unsigned int x );
ITA_BASE_API unsigned int nextPow2( unsigned int x ); ITA_BASE_API unsigned int nextPow2( unsigned int x );
// Rundung auf Compilern definieren die dies nicht standardmäßig mitliefern // Rundung auf Compilern definieren die dies nicht standardmäßig mitliefern
// not so nice!! consider namespacing this very typical function names
#ifndef HAVE_ROUND #ifndef HAVE_ROUND
ITA_BASE_API inline double round( double x ) ITA_BASE_API inline double round( double x )
......
#include <ITAHDFTSpectrum.h> #include <ITAHDFTSpectrum.h>
#include <ITAFastMath.h> #include <ITAFastMath.h>
#include <stdio.h>
#include <ITAException.h> #include <ITAException.h>
#include <ITAStringUtils.h> #include <ITAStringUtils.h>
#include <cmath>
#include <complex>
#include <math.h>
#include <ITANumericUtils.h> #include <ITANumericUtils.h>
#include "ITASampleBuffer.h" #include <ITASampleBuffer.h>
#include <cmath>
#include <cmath>
#include <stdio.h>
ITAHDFTSpectrum::ITAHDFTSpectrum() ITAHDFTSpectrum::ITAHDFTSpectrum()
: m_iSize( 0 ) : m_iSize( 0 )
......
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
#include <ITAConstants.h> #include <ITAConstants.h>
#include <ITASampleBuffer.h> #include <ITASampleBuffer.h>
#include <ITANumericUtils.h>
#include <cassert> #include <cassert>
// Calculate cubic spline set (second derivatives, ypp) for equidistant data // Calculate cubic spline set (second derivatives, ypp) for equidistant data
void spline_cubic_set_equidistant( const int n, const float* y, float* ypp ); void spline_cubic_set_equidistant( const int n, const float* y, float* ypp );
...@@ -98,7 +100,7 @@ bool CITASampleLinearInterpolation::Interpolate( const ITASampleBuffer* pInput, ...@@ -98,7 +100,7 @@ bool CITASampleLinearInterpolation::Interpolate( const ITASampleBuffer* pInput,
if( i == iOutputLength - 1 ) if( i == iOutputLength - 1 )
{ {
assert( x_input == ( float ) iInputLength - iInputStartOffset ); assert( std::lroundf( x_input ) == iInputLength - iInputStartOffset );
} }
// Linkes/rechtes Nachbarsample in der Eingabe // Linkes/rechtes Nachbarsample in der Eingabe
......
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