Commit 3f518595 authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

Merge branch 'ti_lab_build' into develop

# Conflicts:
#	include/ITAAtomicOps.h
#	include/ITAAtomicPrimitives.h
#	include/ITAAudioSample.h
#	include/ITAAudiofileCommon.h
#	include/ITAAudiofileReader.h
#	include/ITAAudiofileWriter.h
#	include/ITABase/UtilsJSON.h
#	include/ITABaseDefinitions.h
#	include/ITABlockMath.h
#	include/ITABufferedAudioFileWriter.h
#	include/ITAClock.h
#	include/ITAConfigUtils.h
#	include/ITAConstants.h
#	include/ITACriticalSection.h
#	include/ITADataLog.h
#	include/ITADebug.h
#	include/ITAEndianness.h
#	include/ITAException.h
#	include/ITAFade.h
#	include/ITAFastMath.h
#	include/ITAFileSystemUtils.h
#	include/ITAFiniteImpulseResponse.h
#	include/ITAFunctors.h
#	include/ITAHDFTSpectra.h
#	include/ITAHDFTSpectrum.h
#	include/ITAHPT.h
#	include/ITAISO9613.h
#	include/ITAInterpolation.h
#	include/ITALog.h
#	include/ITAMagnitudeSpectrum.h
#	include/ITAMultichannelFiniteImpulseResponse.h
#	include/ITAMutex.h
#	include/ITANumericUtils.h
#	include/ITAOps.h
#	include/ITASampleBuffer.h
#	include/ITASampleFrame.h
#	include/ITASampleTypeConversion.h
#	include/ITASimpleConvolution.h
#	include/ITASpectrum.h
#	include/ITAStopWatch.h
#	include/ITAStringUtils.h
#	include/ITAThirdOctaveMagnitudeSpectrum.h
#	include/ITATimeSeriesAnalyzer.h
#	include/ITATimer.h
#	include/ITATypes.h
#	include/ITAUncopyable.h
#	include/ITAWholeOctaveMagnitudeSpectrum.h
#	include/ITAWinPCClock.h
#	tests/ITABaseSampleBufferTest.cpp
parents 1b368888 94549be6
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University
Copyright 2015-2020 Institute of Technical Acoustics, RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
......
......@@ -6,7 +6,7 @@ ITABase is the fundamental component of [ITACoreLibs](https://git.rwth-aachen.de
### License
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University
Copyright 2015-2020 Institute of Technical Acoustics, RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
......
......@@ -3,6 +3,7 @@
#include <algorithm>
#include <assert.h>
#include <math.h>
#include <cmath>
#include <sstream>
#include <memory.h>
......@@ -556,9 +557,9 @@ float ITASampleBuffer::RootMeanSquare( bool bPower /* = true */ ) const
float fRMS = 0.0f;
for( int i = 0; i < m_iLength; i++ )
fRMS += std::powf( m_pfData[ i ], 2 );
fRMS += powf( m_pfData[ i ], 2 );
return std::sqrtf( fRMS ) / ( bPower ? ( float ) m_iLength : 1.0f );
return sqrtf( fRMS ) / ( bPower ? ( float ) m_iLength : 1.0f );
}
float& ITASampleBuffer::operator[]( int iSample )
......
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