X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Ffftw%2Fsci_gateway%2Fcpp%2Fsci_fftw.cpp;h=9f41fa168c0904a3ede37b048a7c9d6084872ef1;hp=c72a1d47beb67080f5206e28b70406e61b90daaf;hb=8117750983951c73bc68b0995fdb8476e7ce1081;hpb=66cf9f0aa2e8d103e4a7898af780e9b97abffafe

diff --git a/scilab/modules/fftw/sci_gateway/cpp/sci_fftw.cpp b/scilab/modules/fftw/sci_gateway/cpp/sci_fftw.cpp
index c72a1d4..9f41fa1 100644
--- a/scilab/modules/fftw/sci_gateway/cpp/sci_fftw.cpp
+++ b/scilab/modules/fftw/sci_gateway/cpp/sci_fftw.cpp
@@ -248,11 +248,8 @@ int sci_fft_gen(const char *fname, types::Double* A, types::Double** O, int isn,
                 Scierror(999, _("%s: Creation of requested fftw plan failed.\n"), fname);
             }
 
-            if (*O)
-            {
-                delete (*O);
-                (*O) = NULL;
-            }
+            delete (*O);
+            (*O) = NULL;
 
             if (tmp)
             {
@@ -300,11 +297,8 @@ int sci_fft_gen(const char *fname, types::Double* A, types::Double** O, int isn,
             FREE(dims1);
             FREE(incr1);
 
-            if (*O)
-            {
-                delete (*O);
-                (*O) = NULL;
-            }
+            delete (*O);
+            (*O) = NULL;
 
             if (tmp)
             {
@@ -327,11 +321,8 @@ int sci_fft_gen(const char *fname, types::Double* A, types::Double** O, int isn,
             FREE(dims1);
             FREE(incr1);
 
-            if (*O)
-            {
-                delete (*O);
-                (*O) = NULL;
-            }
+            delete (*O);
+            (*O) = NULL;
 
             if (tmp)
             {
@@ -358,11 +349,8 @@ int sci_fft_gen(const char *fname, types::Double* A, types::Double** O, int isn,
             FREE(dims1);
             FREE(incr1);
 
-            if (*O)
-            {
-                delete (*O);
-                (*O) = NULL;
-            }
+            delete (*O);
+            (*O) = NULL;
 
             if (tmp)
             {
@@ -463,13 +451,9 @@ int sci_fft_gen(const char *fname, types::Double* A, types::Double** O, int isn,
 
     if (iErr == -1)
     {
-        if (*O)
-        {
-            delete (*O);
-            (*O) = NULL;
-        }
-
         Scierror(999, _("%s: Cannot allocate more memory.\n"), fname);
+        delete (*O);
+        (*O) = NULL;
         return 0;
     }