From 766257109e7f3d85d85104d5a451403b629e4398 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Fri, 11 Apr 2008 07:23:53 +1000
Subject: [PATCH] fixed a few warnings, no real change
---
TODO | 3 ++-
libcelt/cwrs.c | 4 ++--
libcelt/kiss_fft.c | 4 ++++
tests/cwrs32-test.c | 2 +-
tests/cwrs64-test.c | 2 ++
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/TODO b/TODO
index 5e815f7f0..54411e77a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
-- Fix channel order in intra prediction and folding
+- Check minimum width of bands
+- Adjust the energy resolution based on the bit-rate
- Dynamic adjustment of energy quantisation
- Psychacoustics
* Error shaping within each band
diff --git a/libcelt/cwrs.c b/libcelt/cwrs.c
index 60880c611..9ed3d7336 100644
--- a/libcelt/cwrs.c
+++ b/libcelt/cwrs.c
@@ -138,7 +138,7 @@ celt_uint64_t ncwrs_unext64(int _n,celt_uint64_t *_ui){
On exit, _u will be initialized to column _m of U(n,m).*/
celt_uint32_t ncwrs_u32(int _n,int _m,celt_uint32_t *_u){
int k;
- memset(_u,0,_n*sizeof(*_u));
+ CELT_MEMSET(_u,0,_n);
if(_m<=0)return 1;
if(_n<=0)return 0;
for(k=1;k<_m;k++)unext32(_u,_n,2);
@@ -147,7 +147,7 @@ celt_uint32_t ncwrs_u32(int _n,int _m,celt_uint32_t *_u){
celt_uint64_t ncwrs_u64(int _n,int _m,celt_uint64_t *_u){
int k;
- memset(_u,0,_n*sizeof(*_u));
+ CELT_MEMSET(_u,0,_n);
if(_m<=0)return 1;
if(_n<=0)return 0;
for(k=1;k<_m;k++)unext64(_u,_n,2);
diff --git a/libcelt/kiss_fft.c b/libcelt/kiss_fft.c
index 2dd9519c9..8cd95d908 100644
--- a/libcelt/kiss_fft.c
+++ b/libcelt/kiss_fft.c
@@ -526,8 +526,10 @@ void kf_work(
int m2
)
{
+#ifndef RADIX_TWO_ONLY
int i;
kiss_fft_cpx * Fout_beg=Fout;
+#endif
const int p=*factors++; /* the radix */
const int m=*factors++; /* stage's fft length/p */
/*printf ("fft %d %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N, m2);*/
@@ -560,8 +562,10 @@ void ki_work(
int m2
)
{
+#ifndef RADIX_TWO_ONLY
int i;
kiss_fft_cpx * Fout_beg=Fout;
+#endif
const int p=*factors++; /* the radix */
const int m=*factors++; /* stage's fft length/p */
/*printf ("fft %d %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N, m2);*/
diff --git a/tests/cwrs32-test.c b/tests/cwrs32-test.c
index 0e37c6968..1f10ed485 100644
--- a/tests/cwrs32-test.c
+++ b/tests/cwrs32-test.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include "cwrs.h"
-
+#include <string.h>
#define NMAX (10)
#define MMAX (9)
diff --git a/tests/cwrs64-test.c b/tests/cwrs64-test.c
index cc76374cd..2878f28b1 100644
--- a/tests/cwrs64-test.c
+++ b/tests/cwrs64-test.c
@@ -4,6 +4,8 @@
#include <stdio.h>
#include "cwrs.h"
+#include <string.h>
+
#define NMAX (32)
#define MMAX (16)
--
GitLab