Changeset 7311 for trunk/psModules/src/objects/pmSource.h

Timestamp:

Jun 2, 2006, 3:02:08 PM (20 years ago)

Author:

Paul Price

Message:

Applying RHL patch. Generally improves the error handling and traceback. pmConcepts.c and pmConceptsRead.c done by PAP (RHL did this also, but I had already done them). Resolved conflicts, except for pmFPAfile.c, which uses psAbort in some instances where RHL's patch had psError; leave this for Gene to decide.

File:

• trunk/psModules/src/objects/pmSource.h (modified) (3 diffs)

trunk/psModules/src/objects/pmSource.h

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-19 20:29:57 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-03 01:02:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
 typedef struct
 {
+    const int id;   ///< Unique ID for object
     pmPeak *peak;   ///< Description of peak pixel.
     psImage *pixels;   ///< Rectangular region including object pixels.
@@ -114 +115 @@
 pmSource  *pmSourceAlloc();
 
+bool pmIsSource(const psPtr ptr);
 
 /** pmSourceDefinePixels()