david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some (benign) shadowing warnings

Browse Source
This commit is contained in:
Chris Cannam
2022-09-20 09:30:48 +01:00
parent e90f377600
commit a5e2bfa444
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/Window.h
View File

@@ -121,22 +121,25 @@ void Window<T>::encache()
const int n = m_size;
v_set(m_cache, T(1.0), n);
int i;
switch (m_type) {
case RectangularWindow:
for (i = 0; i < n; ++i) {
{
for (int i = 0; i < n; ++i) {
m_cache[i] *= 0.5;
}
break;
}
case BartlettWindow:
for (i = 0; i < n/2; ++i) {
{
for (int i = 0; i < n/2; ++i) {
m_cache[i] *= (i / T(n/2));
m_cache[i + n/2] *= (1.0 - (i / T(n/2)));
}
break;
}
case HammingWindow:
cosinewin(m_cache, 0.54, 0.46, 0.0, 0.0);
@@ -151,20 +154,22 @@ void Window<T>::encache()
break;
case GaussianWindow:
for (i = 0; i < n; ++i) {
{
for (int i = 0; i < n; ++i) {
m_cache[i] *= pow(2, - pow((i - (n-1)/2.0) / ((n-1)/2.0 / 3), 2));
}
break;
}
case ParzenWindow:
{
int N = n-1;
for (i = 0; i < N/4; ++i) {
for (int i = 0; i < N/4; ++i) {
T m = 2 * pow(1.0 - (T(N)/2 - i) / (T(N)/2), 3);
m_cache[i] *= m;
m_cache[N-i] *= m;
}
for (i = N/4; i <= N/2; ++i) {
for (int i = N/4; i <= N/2; ++i) {
int wn = i - N/2;
T m = 1.0 - 6 * pow(wn / (T(N)/2), 2) * (1.0 - abs(wn) / (T(N)/2));
m_cache[i] *= m;
@@ -241,7 +246,7 @@ void Window<T>::encache()
}
m_area = 0;
for (i = 0; i < n; ++i) {
for (int i = 0; i < n; ++i) {
m_area += m_cache[i];
}
m_area /= n;

6
src/common/sysutils.h
View File

@@ -108,9 +108,9 @@ void gettimeofday(struct timeval *p, void *tz);
#ifdef _WIN32
#define MLOCK(a,b) 1
#define MUNLOCK(a,b) 1
#define MUNLOCK_SAMPLEBLOCK(a) 1
#define MLOCK(a,b) (void)1
#define MUNLOCK(a,b) (void)1
#define MUNLOCK_SAMPLEBLOCK(a) (void)1
namespace RubberBand {
extern void system_memorybarrier();