hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

linearToLogScale and logToLinearScale return 0 rather than nan

Browse Source
This commit is contained in:
Dave French
2015-02-20 16:56:28 +00:00
parent 603965fcf4
commit a6e37316f1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/lmms_math.h
View File

@@ -217,9 +217,11 @@ static inline float logToLinearScale( float min, float max, float value )
{
const float mmax = qMax( qAbs( min ), qAbs( max ) );
const float val = value * ( max - min ) + min;
return signedPowf( val / mmax, F_E ) * mmax;
float result = signedPowf( val / mmax, F_E ) * mmax;
return isnan( result ) ? 0 : result;
}
return powf( value, F_E ) * ( max - min ) + min;
float result = powf( value, F_E ) * ( max - min ) + min;
return isnan( result ) ? 0 : result;
}
@@ -231,9 +233,11 @@ static inline float linearToLogScale( float min, float max, float value )
if( min < 0 )
{
const float mmax = qMax( qAbs( min ), qAbs( max ) );
return signedPowf( value / mmax, EXP ) * mmax;
float result = signedPowf( value / mmax, EXP ) * mmax;
return isnan( result ) ? 0 : result;
}
return powf( val, EXP ) * ( max - min ) + min;
float result = powf( val, EXP ) * ( max - min ) + min;
return isnan( result ) ? 0 : result;
}