Merge branch 'develop' of https://git.rwth-aachen.de/ita/ITACTC into develop

CMakeLists.txt

@@ -67,6 +67,10 @@ else( )
 	add_definitions( -DITA_CTC_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
 endif( )
 
+if( NOT WIN32 )
+        add_definitions( -std=gnu++11)
+endif( )
+
 
 # linker
 add_library( ITACTC ${ITACTCHeader} ${ITACTCSources} )

include/ITANCTC.h

@@ -28,7 +28,7 @@
 #include <ITAAtomicPrimitives.h>
 #include <ITAFFT.h>
 #include <ITASampleFrame.h>
-#include <ITAStopwatch.h>
+#include <ITAStopWatch.h>
 #include <ITAHDFTSpectra.h>
 
 #include <VistaBase/VistaVector3D.h>

src/ITANCTC.cpp

@@ -264,12 +264,12 @@ bool ITANCTC::CalculateFilter( std::vector< ITAHDFTSpectra* >& vpCTCFilter )
 		for( int i = 0; i < ( *pHRTF )[ 0 ]->getSize(); i++ )
 		{
 			float fMag = ( *pHRTF )[ 0 ]->calcMagnitude( i );
-			( *pHRTF )[ 0 ]->setMagnitudePreservePhase( i, std::powf( fMag, m_fWaveIncidenceAngleCompensationFactor ) );
+			( *pHRTF )[ 0 ]->setMagnitudePreservePhase( i, std::pow( fMag, m_fWaveIncidenceAngleCompensationFactor ) );
 		}
 
 		// Compensate initial HRTF energy when WICK is used (left channel)
 		assert( fEnergy > 0 );
-		float fEnergyCompensation = std::powf( fEnergy, ( 1 - m_fWaveIncidenceAngleCompensationFactor ) );
+		float fEnergyCompensation = std::pow( fEnergy, ( 1 - m_fWaveIncidenceAngleCompensationFactor ) );
 		( *pHRTF )[ 0 ]->mul( fEnergyCompensation );
 
 
@@ -280,12 +280,12 @@ bool ITANCTC::CalculateFilter( std::vector< ITAHDFTSpectra* >& vpCTCFilter )
 		for( int i = 0; i < ( *pHRTF )[ 1 ]->getSize(); i++ )
 		{
 			float fMag = ( *pHRTF )[ 1 ]->calcMagnitude( i );
-			( *pHRTF )[ 1 ]->setMagnitudePreservePhase( i, std::powf( fMag, m_fWaveIncidenceAngleCompensationFactor ) );
+			( *pHRTF )[ 1 ]->setMagnitudePreservePhase( i, std::pow( fMag, m_fWaveIncidenceAngleCompensationFactor ) );
 		}
 
 		// Compensate initial HRTF energy when WICK is used (right channel)
 		assert( fEnergy > 0 );
-		fEnergyCompensation = std::powf( fEnergy, ( 1 - m_fWaveIncidenceAngleCompensationFactor ) );
+		fEnergyCompensation = std::pow( fEnergy, ( 1 - m_fWaveIncidenceAngleCompensationFactor ) );
 		( *pHRTF )[ 1 ]->mul( fEnergyCompensation );
 
 

tests/NCTC_CTCFilterTest.cpp

 #include <ITANCTC.h>
 
-#include <ITAFilesystemUtils.h>
-#include <ITAStopwatch.h>
+#include <ITAFileSystemUtils.h>
+#include <ITAStopWatch.h>
 #include <ITAStringUtils.h>
 #include <ITAFFTUtils.h>
 

tests/set_path_for_NCTC_CTCFilterTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/home/jst/dev/ITACoreLibs/build/lib:/usr/bin:/home/jst/dev/ExternalLibs/tbb/src/tbb44_20160526oss/build/linux_armv7_gcc_cc4.9.2_libc2.19_kernel4.4.34_release/lib:/home/jst/dev/ExternalLibs/OpenDAFF/opendaff-1.7/LINUX.X86/lib:/home/jst/dev/ExternalLibs/OpenDAFF/opendaff-1.7/LINUX.X86/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+