Changeset 29314

Timestamp:

Oct 4, 2010, 3:01:32 PM (16 years ago)

Author:

eugene

Message:

replace free for images with FreeImages (does the right thing if the images are cached)

Location:

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo

Files:

• LoadImages.c (modified) (1 diff)
• badimages.c (modified) (1 diff)
• imdata.c (modified) (1 diff)
• imlist.c (modified) (1 diff)
• imphot.c (modified) (1 diff)
• imstats.c (modified) (1 diff)
• skycoverage.c (modified) (2 diffs)
• subpix.c (modified) (1 diff)

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/LoadImages.c

@@ -75 +75 @@
     lastModified = getLastModified(filename);
   }
+
   return (image);
 }

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/badimages.c

@@ -70 +70 @@
   }
   
+  FreeImages(image);
   return (TRUE);
-
 }

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/imdata.c

@@ -222 +222 @@
   vec[0].Nelements = N;
   REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,N));
+  FreeImages(image);
   return (TRUE);
 }

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/imlist.c

@@ -108 +108 @@
   }
 
+  FreeImages(image);
   free (subset);
-  free (image);
   return (TRUE);
 }

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/imphot.c

@@ -92 +92 @@
   }
 
-  free (image);
+  FreeImages(image);
   free (subset);
   return (TRUE);

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/imstats.c

@@ -58 +58 @@
   free (Xvec.elements.Flt);
   free (Yvec.elements.Flt);
+  FreeImages (image);
   return (TRUE);
 }

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/skycoverage.c

@@ -179 +179 @@
   PutCoords (&coords, &buf[0].header);
 
-  if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
+  image = LoadImages(&Nimage);
+  if (image == NULL) {
+      return (FALSE);
+  }
   BuildChipMatch (image, Nimage);
 
@@ -251 +254 @@
     }
   }
-
-  free (image);
+  FreeImages(images);
   return (TRUE);
 }

branches/eam_branches/ipp-20100823/Ohana/src/opihi/dvo/subpix.c

@@ -147 +147 @@
 
   dvo_catalog_free (&catalog);
-  free (image);
   free (index);
   SkyListFree (skylist);
 
+  FreeImages(image);
   return (TRUE);
 }