Changeset 15972

Timestamp:

Jan 2, 2008, 10:33:14 AM (18 years ago)

Author:

gusciora

Message:

Added pmMemCheck functions and some PS_ASSERTS.

Location:

trunk/psModules/src/camera

Files:

• pmFPAview.c (modified) (4 diffs)
• pmFPAview.h (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAview.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-29 01:26:55 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-02 20:33:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     pmFPAviewReset(view);
     return view;
+}
+
+bool psMemCheckFPAview(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) pmFPAviewFree);
 }
 
@@ -146 +152 @@
     PS_ASSERT_PTR_NON_NULL(view, NULL);
     PS_ASSERT_PTR_NON_NULL(fpa, NULL);
-
     if (view->cell < 0) {
         return NULL;
     }
+    PS_ASSERT_PTR_NON_NULL(fpa->chips, NULL);
 
     pmChip *chip = pmFPAviewThisChip (view, fpa);
@@ -209 +215 @@
     pmCell *cell = pmFPAviewThisCell (view, fpa);
     PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->readouts, NULL);
 
     if (view->readout >= cell->readouts->n) {

trunk/psModules/src/camera/pmFPAview.h

@@ -4 +4 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-09-29 01:19:47 $
+ * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-01-02 20:33:14 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -35 +35 @@
 
 /// Allocator for pmFPAview
-pmFPAview *pmFPAviewAlloc(int nRows     ///< Maximum number of rows per readout segment read, or 0 for all
-                         );
+pmFPAview *pmFPAviewAlloc(int nRows);   ///< Maximum number of rows per readout segment read, or 0 for all
+bool psMemCheckFPAview(psPtr ptr);
 
 /// Reset a view to select all components