Changeset 3697

Timestamp:

Apr 13, 2005, 2:16:39 PM (21 years ago)

Author:

gusciora

Message:

Fixed problem with the pmSource deallocator. The image data was not being
freed, and the test for it was wrong.

Location:

trunk/psModules

Files:

• src/pmObjects.c (modified) (2 diffs)
• test/tst_pmObjects01.c (modified) (5 diffs)

trunk/psModules/src/pmObjects.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-12 21:51:00 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-14 00:16:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -123 +123 @@
 {
     psFree(tmp->peak);
-    //    psFree(tmp->pixels);
-    //    psFree(tmp->mask);
+    psFree(tmp->pixels);
+    psFree(tmp->mask);
     psFree(tmp->moments);
     psFree(tmp->models);

trunk/psModules/test/tst_pmObjects01.c

@@ -19 +19 @@
  * abd never deallocate, no error is generated.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-01 21:39:06 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-14 00:16:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
 {
     return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv);
-    test02();
 }
 
@@ -1025 +1024 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    psFree(imgData);
-    psFree(imgDataF64);
+    //    psFree(imgData);
+    //    psFree(imgDataF64);
     psFree(tmpSource);
     return(testStatus);
@@ -1075 +1074 @@
     if (tmpSource == NULL) {
         printf("TEST ERROR: pmSourceLocalSky() returned a NULL psSource.\n");
-        psFree(imgData);
         psFree(tmpSource);
         testStatus = false;
@@ -1101 +1099 @@
 
     printf("----------------------------------------------------------------------------------\n");
-    psFree(imgData);
     psFree(tmpSource);
     return(testStatus);