Changeset 1384 for trunk/src

Timestamp:

07/13/07 12:08:18 (17 years ago)

Author:

mar637

Message:

use CountedPtr to prevent potential leaks

File:

• trunk/src/STMath.cpp (modified) (3 diffs)

trunk/src/STMath.cpp

@@ -1175 +1175 @@
   cols[3] = String("CYCLENO");
   TableIterator iter(tout, cols);
-  STPol* stpol = STPol::getPolClass(out->factories_, out->getPolType() );
+  CountedPtr<STPol> stpol = STPol::getPolClass(out->factories_, 
+                                               out->getPolType() );
   while (!iter.pastEnd()) {
     Table t = iter.table();
@@ -1181 +1182 @@
     ScalarColumn<uInt> focidcol(t, "FOCUS_ID");
     ScalarColumn<Float> parancol(t, "PARANGLE");
-    Matrix<Float> pols = speccol.getColumn();
+    Matrix<Float> pols(speccol.getColumn());
     try {
       stpol->setSpectra(pols);
@@ -1191 +1192 @@
       // disable total feed angle to support paralactifying Caswell style
       stpol->setPhaseCorrections(parang, -parang, fhand);
-      (stpol->*fptr)(phase);
+      // use a member function pointer in STPol.  This only works on
+      // the STPol pointer itself, not the Counted Pointer so
+      // derefernce it.
+      (&(*(stpol))->*fptr)(phase);
       speccol.putColumn(stpol->getSpectra());
-      Matrix<Float> tmp = stpol->getSpectra();
     } catch (AipsError& e) {
-      delete stpol;stpol=0;
+      //delete stpol;stpol=0;
       throw(e);
     }
     ++iter;
   }
-  delete stpol;stpol=0;
+  //delete stpol;stpol=0;
   return out;
 }