Changeset 791 in Sophya for trunk/SophyaLib/NTools

Timestamp:

Mar 22, 2000, 11:17:10 AM (26 years ago)

Author:

ansari

Message:

Grave: des lignes du style
int toto= new int_4[blabla]

Incoherences avec fftpack.h
corrigees, j'espere

Dominique Yvon

Location:

trunk/SophyaLib/NTools

Files:

• fftpserver.cc (modified) (12 diffs)
• fftpserver.h (modified) (2 diffs)

trunk/SophyaLib/NTools/fftpserver.cc

@@ -152 +152 @@
  
 
-void FFTPackServer::checkint_rfft(int l)
+void FFTPackServer::checkint_rfft(int_4 l)
 {
   if (sz_rfft == l) return;       //checkint functions check and reallocate
@@ -162 +162 @@
 }
 
-void FFTPackServer::checkint_cfft(int l)
+void FFTPackServer::checkint_cfft(int_4 l)
 {
   if (sz_cfft == l) return;
@@ -172 +172 @@
 }
 
-void FFTPackServer::checkint_dfft(int l)
+void FFTPackServer::checkint_dfft(int_4 l)
 {
   if (sz_dfft == l) return;
@@ -182 +182 @@
 }
 
-void FFTPackServer::checkint_cdfft(int l)
+void FFTPackServer::checkint_cdfft(int_4 l)
 {
   if (sz_cdfft == l) return;
@@ -195 +195 @@
    return inverse transformations */
 
-void FFTPackServer::fftf(int l, r_4* inout)
+void FFTPackServer::fftf(int_4 l, r_4* inout)
 {
   checkint_rfft(l);
@@ -202 +202 @@
 }
 
-void FFTPackServer::fftf(int l, r_8* inout)
+void FFTPackServer::fftf(int_4 l, r_8* inout)
 {
   checkint_dfft(l);
@@ -209 +209 @@
 }
 
-void FFTPackServer::fftf(int l, complex<r_4>* inout)
+void FFTPackServer::fftf(int_4 l, complex<r_4>* inout)
 {
   checkint_cfft(l);
@@ -215 +215 @@
 }
 
-void FFTPackServer::fftf(int l, complex<r_8>* inout)
+void FFTPackServer::fftf(int_4 l, complex<r_8>* inout)
 {
   checkint_cdfft(l);
@@ -221 +221 @@
 }
 
-void FFTPackServer::fftb(int l, r_4* inout)
+void FFTPackServer::fftb(int_4 l, r_4* inout)
 {
   checkint_rfft(l);
@@ -227 +227 @@
 }
 
-void FFTPackServer::fftb(int l, r_8* inout)
+void FFTPackServer::fftb(int_4 l, r_8* inout)
 {
   checkint_dfft(l);
@@ -233 +233 @@
 }
 
-void FFTPackServer::fftb(int l, complex<r_4>* inout)
+void FFTPackServer::fftb(int_4 l, complex<r_4>* inout)
 {
   checkint_cfft(l);
@@ -239 +239 @@
 }
 
-void FFTPackServer::fftb(int l, complex<r_8>* inout)
+void FFTPackServer::fftb(int_4 l, complex<r_8>* inout)
 {
   checkint_cdfft(l);

trunk/SophyaLib/NTools/fftpserver.h

@@ -30 +30 @@
 
   //  Methodes propres a cette classe
-  virtual void fftf(int l, float* inout);
-  virtual void fftb(int l, float* inout);
-  virtual void fftf(int l, double* inout);
-  virtual void fftb(int l, double* inout);
-  virtual void fftf(int l, complex<float>* inout);
-  virtual void fftb(int l, complex<float>* inout);
-  virtual void fftf(int l, complex<double>* inout);
-  virtual void fftb(int l, complex<double>* inout);
+  virtual void fftf(int_4 l, float* inout);
+  virtual void fftb(int_4 l, float* inout);
+  virtual void fftf(int_4 l, double* inout);
+  virtual void fftb(int_4 l, double* inout);
+  virtual void fftf(int_4 l, complex<float>* inout);
+  virtual void fftb(int_4 l, complex<float>* inout);
+  virtual void fftf(int_4 l, complex<double>* inout);
+  virtual void fftb(int_4 l, complex<double>* inout);
 
 // Methodes statiques pour reordonner les donnees 
@@ -47 +47 @@
 
  protected:
-  virtual void checkint_rfft(int l);
-  virtual void checkint_dfft(int l);
-  virtual void checkint_cfft(int l);
-  virtual void checkint_cdfft(int l);
+  virtual void checkint_rfft(int_4 l);
+  virtual void checkint_dfft(int_4 l);
+  virtual void checkint_cfft(int_4 l);
+  virtual void checkint_cdfft(int_4 l);
 
   int sz_rfft;
-  float* ws_rfft;
+  r_4* ws_rfft;
 
   int sz_cfft;
-  float* ws_cfft;
+  r_4* ws_cfft;
 
   int sz_dfft;
-  double* ws_dfft;
+  r_8* ws_dfft;
 
   int sz_cdfft;
-  double* ws_cdfft;
+  r_8* ws_cdfft;
 };