Index: trunk/archive/pslib/include/psObjects.h
===================================================================
--- trunk/archive/pslib/include/psObjects.h	(revision 160)
+++ trunk/archive/pslib/include/psObjects.h	(revision 198)
@@ -17,5 +17,4 @@
 #include "psImages.h"
 
-
 /***********************************************************************************************************/
 
@@ -31,5 +30,5 @@
     float sky, skyErr;			//!< Local sky level, and associated error
     float colour, colourErr;		//!< Colour and associated error, if known
-    enum psColourRef colourRef;		//!< Colour reference
+    psColourRef colourRef;		//!< Colour reference
     psBitMask *quality;			//!< Bit mask for quality information
 } psObject;
@@ -53,5 +52,5 @@
 /** Associates objects on an image with the image */
 typedef struct {
-    const psImage *image;		//!< Image that produced the objects, which has metadata we need
+    const struct psImage *image;	//!< Image that produced the objects, which has metadata we need
     psObjectArray *objects;		//!< The objects
 } psImageObjects;
@@ -59,7 +58,7 @@
 /** Constructor */
 psImageObjects *
-psImageObjectsAlloc(const psImage *image,	//!< Image that produced the objects, which has metadata we need
-		  psObjectArray *objects //!< The objects
-		  );
+psImageObjectsAlloc(const struct psImage *image, //!< Image that produced the objects, with needed metadata
+		    psObjectArray *objects //!< The objects
+    );
 
 /** Destructor */
@@ -72,5 +71,5 @@
 /** Objects from a catalogue */
 typedef struct {
-    enum psCatalogue catalogue;		//!< Source catalogue from which objects come
+    psCatalogue catalogue;		//!< Source catalogue from which objects come
     psObjectArray *object;		//!< The objects
 } psCatalogueObjects;
@@ -79,10 +78,10 @@
 psCatalogueObjects *
 psCatalogueObjectsAlloc(enum psCatalogue *catalogue, //!< Source catalogue
-		      psObjectArray *objects //!< The objects
-		      );
+			psObjectArray *objects //!< The objects
+    );
 
 /** Destructor */
 void
-psCatalogueObjectsFree(psCatalogeObjects *restrict myCatalogueObjects //!< Object to destroy
+psCatalogueObjectsFree(psCatalogueObjects *restrict myCatalogueObjects //!< Object to destroy
 		      );
 
@@ -91,5 +90,5 @@
 /** A "super" object --- an object with multiple detections in different images */
 typedef struct {
-    const psImageArray *images;		//!< Images that provided the different measurements
+    const struct  psImageArray *images;	//!< Images that provided the different measurements
     const psObjectArray *objects;	//!< Individual object measurements
 
@@ -103,7 +102,7 @@
 /** Constructor */
 psSuperObject *
-psSuperObjectAlloc(const psImageArray *images, //!< The images with the measurements
-		 const psObjectArray *objects //!< Object measurements
-		 );
+psSuperObjectAlloc(const struct psImageArray *images, //!< The images with the measurements
+		   const psObjectArray *objects //!< Object measurements
+    );
 
 /** Destructor */
@@ -167,5 +166,5 @@
 		     float magLower,	//!< Lower bound for colour
 		     float magUpper,	//!< Upper bound for colour
-		     enum psColourRef colourRef	//!< Only select those with this colour reference
+		     psColourRef colourRef //!< Only select those with this colour reference
 		     );