fix readability-redundant-declaration

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/gpl/src/fftsg.cpp

@@ -288,11 +288,44 @@ Appendix :
 
 namespace gpl {
 
+int cfttree(int n, int j, int k, float* a, int nw, float* w);
+void bitrv2(int n, const int* ip, float* a);
+void bitrv208(float* a);
+void bitrv208neg(float* a);
+void bitrv216(float* a);
+void bitrv216neg(float* a);
+void bitrv2conj(int n, const int* ip, float* a);
+void cftb040(float* a);
+void cftb1st(int n, float* a, const float* w);
+void cftbsub(int n, float* a, int* ip, int nw, float* w);
+void cftf040(float* a);
+void cftf081(float* a, const float* w);
+void cftf082(float* a, const float* w);
+void cftf161(float* a, const float* w);
+void cftf162(float* a, const float* w);
+void cftf1st(int n, float* a, const float* w);
+void cftfsub(int n, float* a, int* ip, int nw, float* w);
+void cftfx41(int n, float* a, int nw, float* w);
+void cftleaf(int n, int isplt, float* a, int nw, float* w);
+void cftmdl1(int n, float* a, const float* w);
+void cftmdl2(int n, float* a, const float* w);
+void cftrec4(int n, float* a, int nw, float* w);
+void cftx020(float* a);
+void dctsub(int n, float* a, int nc, const float* c);
+void dstsub(int n, float* a, int nc, const float* c);
+void makect(int nc, int* ip, float* c);
+void makeipt(int nw, int* ip);
+void makewt(int nw, int* ip, float* w);
+void rftbsub(int n, float* a, int nc, const float* c);
+void rftfsub(int n, float* a, int nc, const float* c);
+void* cftrec1_th(void* p);
+void* cftrec2_th(void* p);
+#ifdef USE_CDFT_THREADS
+void cftrec4_th(int n, float* a, int nw, float* w);
+#endif /* USE_CDFT_THREADS */
+
 void cdft(int n, int isgn, float* a, int* ip, float* w)
 {
-  void makewt(int nw, int* ip, float* w);
-  void cftfsub(int n, float* a, int* ip, int nw, float* w);
-  void cftbsub(int n, float* a, int* ip, int nw, float* w);
   int nw;
 
   nw = ip[0];
@@ -309,12 +342,6 @@ void cdft(int n, int isgn, float* a, int* ip, float* w)
 
 void rdft(int n, int isgn, float* a, int* ip, float* w)
 {
-  void makewt(int nw, int* ip, float* w);
-  void makect(int nc, int* ip, float* c);
-  void cftfsub(int n, float* a, int* ip, int nw, float* w);
-  void cftbsub(int n, float* a, int* ip, int nw, float* w);
-  void rftfsub(int n, float* a, int nc, const float* c);
-  void rftbsub(int n, float* a, int nc, const float* c);
   int nw, nc;
   float xi;
 
@@ -352,13 +379,6 @@ void rdft(int n, int isgn, float* a, int* ip, float* w)
 
 void ddct(int n, int isgn, float* a, int* ip, float* w)
 {
-  void makewt(int nw, int* ip, float* w);
-  void makect(int nc, int* ip, float* c);
-  void cftfsub(int n, float* a, int* ip, int nw, float* w);
-  void cftbsub(int n, float* a, int* ip, int nw, float* w);
-  void rftfsub(int n, float* a, int nc, const float* c);
-  void rftbsub(int n, float* a, int nc, const float* c);
-  void dctsub(int n, float* a, int nc, const float* c);
   int j, nw, nc;
   float xr;
 
@@ -408,13 +428,6 @@ void ddct(int n, int isgn, float* a, int* ip, float* w)
 
 void ddst(int n, int isgn, float* a, int* ip, float* w)
 {
-  void makewt(int nw, int* ip, float* w);
-  void makect(int nc, int* ip, float* c);
-  void cftfsub(int n, float* a, int* ip, int nw, float* w);
-  void cftbsub(int n, float* a, int* ip, int nw, float* w);
-  void rftfsub(int n, float* a, int nc, const float* c);
-  void rftbsub(int n, float* a, int nc, const float* c);
-  void dstsub(int n, float* a, int nc, const float* c);
   int j, nw, nc;
   float xr;
 
@@ -463,11 +476,6 @@ void ddst(int n, int isgn, float* a, int* ip, float* w)
 
 void dfct(int n, float* a, float* t, int* ip, float* w)
 {
-  void makewt(int nw, int* ip, float* w);
-  void makect(int nc, int* ip, float* c);
-  void cftfsub(int n, float* a, int* ip, int nw, float* w);
-  void rftfsub(int n, float* a, int nc, const float* c);
-  void dctsub(int n, float* a, int nc, const float* c);
   int j, k, l, m, mh, nw, nc;
   float xr, xi, yr, yi;
 
@@ -555,11 +563,6 @@ void dfct(int n, float* a, float* t, int* ip, float* w)
 
 void dfst(int n, float* a, float* t, int* ip, float* w)
 {
-  void makewt(int nw, int* ip, float* w);
-  void makect(int nc, int* ip, float* c);
-  void cftfsub(int n, float* a, int* ip, int nw, float* w);
-  void rftfsub(int n, float* a, int nc, const float* c);
-  void dstsub(int n, float* a, int nc, const float* c);
   int j, k, l, m, mh, nw, nc;
   float xr, xi, yr, yi;
 
@@ -640,7 +643,6 @@ void dfst(int n, float* a, float* t, int* ip, float* w)
 
 void makewt(int nw, int* ip, float* w)
 {
-  void makeipt(int nw, int* ip);
   int j, nwh, nw0, nw1;
   float delta, wn4r, wk1r, wk1i, wk3r, wk3i;
 
@@ -798,21 +800,6 @@ void makect(int nc, int* ip, float* c)
 
 void cftfsub(int n, float* a, int* ip, int nw, float* w)
 {
-  void bitrv2(int n, const int* ip, float* a);
-  void bitrv216(float* a);
-  void bitrv208(float* a);
-  void cftf1st(int n, float* a, const float* w);
-  void cftrec4(int n, float* a, int nw, float* w);
-  void cftleaf(int n, int isplt, float* a, int nw, float* w);
-  void cftfx41(int n, float* a, int nw, float* w);
-  void cftf161(float* a, const float* w);
-  void cftf081(float* a, const float* w);
-  void cftf040(float* a);
-  void cftx020(float* a);
-#ifdef USE_CDFT_THREADS
-  void cftrec4_th(int n, float* a, int nw, float* w);
-#endif /* USE_CDFT_THREADS */
-
   if (n > 8) {
     if (n > 32) {
       cftf1st(n, a, &w[nw - (n >> 2)]);
@@ -845,21 +832,6 @@ void cftfsub(int n, float* a, int* ip, int nw, float* w)
 
 void cftbsub(int n, float* a, int* ip, int nw, float* w)
 {
-  void bitrv2conj(int n, const int* ip, float* a);
-  void bitrv216neg(float* a);
-  void bitrv208neg(float* a);
-  void cftb1st(int n, float* a, const float* w);
-  void cftrec4(int n, float* a, int nw, float* w);
-  void cftleaf(int n, int isplt, float* a, int nw, float* w);
-  void cftfx41(int n, float* a, int nw, float* w);
-  void cftf161(float* a, const float* w);
-  void cftf081(float* a, const float* w);
-  void cftb040(float* a);
-  void cftx020(float* a);
-#ifdef USE_CDFT_THREADS
-  void cftrec4_th(int n, float* a, int nw, float* w);
-#endif /* USE_CDFT_THREADS */
-
   if (n > 8) {
     if (n > 32) {
       cftb1st(n, a, &w[nw - (n >> 2)]);
@@ -2190,8 +2162,6 @@ using cdft_arg_t = cdft_arg_st;
 
 void cftrec4_th(int n, float* a, int nw, float* w)
 {
-  void* cftrec1_th(void* p);
-  void* cftrec2_th(void* p);
   int i, idiv4, m, nthread;
   cdft_thread_t th[4];
   cdft_arg_t ag[4];
@@ -2223,9 +2193,6 @@ void cftrec4_th(int n, float* a, int nw, float* w)
 
 void* cftrec1_th(void* p)
 {
-  int cfttree(int n, int j, int k, float* a, int nw, float* w);
-  void cftleaf(int n, int isplt, float* a, int nw, float* w);
-  void cftmdl1(int n, float* a, const float* w);
   int isplt, j, k, m, n, n0, nw;
   float *a, *w;
 
@@ -2251,9 +2218,6 @@ void* cftrec1_th(void* p)
 
 void* cftrec2_th(void* p)
 {
-  int cfttree(int n, int j, int k, float* a, int nw, float* w);
-  void cftleaf(int n, int isplt, float* a, int nw, float* w);
-  void cftmdl2(int n, float* a, const float* w);
   int isplt, j, k, m, n, n0, nw;
   float *a, *w;
 
@@ -2282,9 +2246,6 @@ void* cftrec2_th(void* p)
 
 void cftrec4(int n, float* a, int nw, float* w)
 {
-  int cfttree(int n, int j, int k, float* a, int nw, float* w);
-  void cftleaf(int n, int isplt, float* a, int nw, float* w);
-  void cftmdl1(int n, float* a, const float* w);
   int isplt, j, k, m;
 
   m = n;
@@ -2303,8 +2264,6 @@ void cftrec4(int n, float* a, int nw, float* w)
 
 int cfttree(int n, int j, int k, float* a, int nw, float* w)
 {
-  void cftmdl1(int n, float* a, const float* w);
-  void cftmdl2(int n, float* a, const float* w);
   int i, isplt, m;
 
   if ((k & 3) != 0) {
@@ -2337,13 +2296,6 @@ int cfttree(int n, int j, int k, float* a, int nw, float* w)
 
 void cftleaf(int n, int isplt, float* a, int nw, float* w)
 {
-  void cftmdl1(int n, float* a, const float* w);
-  void cftmdl2(int n, float* a, const float* w);
-  void cftf161(float* a, const float* w);
-  void cftf162(float* a, const float* w);
-  void cftf081(float* a, const float* w);
-  void cftf082(float* a, const float* w);
-
   if (n == 512) {
     cftmdl1(128, a, &w[nw - 64]);
     cftf161(a, &w[nw - 8]);
@@ -2643,11 +2595,6 @@ void cftmdl2(int n, float* a, const float* w)
 
 void cftfx41(int n, float* a, int nw, float* w)
 {
-  void cftf161(float* a, const float* w);
-  void cftf162(float* a, const float* w);
-  void cftf081(float* a, const float* w);
-  void cftf082(float* a, const float* w);
-
   if (n == 128) {
     cftf161(a, &w[nw - 8]);
     cftf162(&a[32], &w[nw - 32]);