Index: trunk/archive/pslib/include/psImages.h
===================================================================
--- trunk/archive/pslib/include/psImages.h	(revision 148)
+++ trunk/archive/pslib/include/psImages.h	(revision 150)
@@ -7,10 +7,73 @@
 // image data type names 
 typedef enum { 
-    psU8  = 1, 
-    psU16 = 2, 
-    psU32 = 3, 
-    psF32 = 4, 
-    psF64 = 5, 
-} psIMAGE_DEPTH;
+    PS_U8  = 1, 
+    PS_U16 = 2, 
+    PS_U32 = 3, 
+    PS_F32 = 4, 
+    PS_F64 = 5, 
+} PS_IMAGE_DEPTH;
+
+// overlay operations 
+typedef enum { 
+    PS_OVERLAY_EQUALS   = '=', 
+    PS_OVERLAY_ADD      = '+', 
+    PS_OVERLAY_SUBTRACT = '-', 
+    PS_OVERLAY_MULTIPLY = '*', 
+    PS_OVERLAY_DIVIDE   = '/', 
+} PS_OVERLAY_OP;
+
+// binary operations (image / vector?) 
+typedef enum { 
+    PS_BINARY_ADD        = '+', 
+    PS_BINARY_SUBTRACT   = '-', 
+    PS_BINARY_MULTIPLY   = '*', 
+    PS_BINARY_DIVIDE     = '/', 
+    PS_BINARY_POWER      = '^', 
+    PS_BINARY_MIN, 
+    PS_BINARY_MAX, 
+    PS_BINARY_LESSTHAN   = '<', 
+    PS_BINARY_MORETHAN   = '>', 
+    PS_BINARY_ISEQUAL    = '==', 
+    PS_BINARY_NOTEQUAL   = '!=', 
+    PS_BINARY_LESSOREQ   = '<=', 
+    PS_BINARY_MOREOREQ   = '>=', 
+    PS_BINARY_AND        = '&&', 
+    PS_BINARY_OR         = '||', 
+    PS_BINARY_BITAND     = '&', 
+    PS_BINARY_BITOR      = '|', 
+    PS_BINARY_XOR        = '~', 
+    PS_BINARY_ATAN2      = 'atan2', 
+} PS_BINARY_OP;
+
+// unary image operations 
+typedef enum { 
+    PS_UNARY_IS     = '=', 
+    PS_UNARY_ABS,
+    PS_UNARY_INT,
+    PS_UNARY_EXP,
+    PS_UNARY_TEN,
+    PS_UNARY_LOG,
+    PS_UNARY_LN,
+    PS_UNARY_SQRT,
+    PS_UNARY_SIN,
+    PS_UNARY_COS,
+    PS_UNARY_TAN,
+    PS_UNARY_DSIN,
+    PS_UNARY_DCOS,
+    PS_UNARY_DTAN,
+    PS_UNARY_ASIN,
+    PS_UNARY_ACOS,
+    PS_UNARY_ATAN,
+    PS_UNARY_DASIN,
+    PS_UNARY_DACOS,
+    PS_UNARY_DATAN,
+    PS_UNARY_RND,
+    PS_UNARY_NOT,
+    PS_UNARY_NEGATE = '-',
+    PS_UNARY_INCR,
+    PS_UNARY_DECR,
+    PS_UNARY_ISINF,
+    PS_UNARY_ISNAN
+} PS_UNARY_OP;
 
 // An array of real vectors 
@@ -25,72 +88,9 @@
 typedef double         psF64;
 
-// overlay operations 
-typedef enum { 
-    psOVERLAY_EQUALS   = '=', 
-    psOVERLAY_ADD      = '+', 
-    psOVERLAY_SUBTRACT = '-', 
-    psOVERLAY_MULTIPLY = '*', 
-    psOVERLAY_DIVIDE   = '/', 
-} psOVERLAY_OP;
-
-// binary operations (image / vector?) 
-typedef enum { 
-    psBINARY_ADD        = '+', 
-    psBINARY_SUBTRACT   = '-', 
-    psBINARY_MULTIPLY   = '*', 
-    psBINARY_DIVIDE     = '/', 
-    psBINARY_POWER      = '^', 
-    psBINARY_MIN, 
-    psBINARY_MAX, 
-    psBINARY_LESSTHAN   = '<', 
-    psBINARY_MORETHAN   = '>', 
-    psBINARY_ISEQUAL    = '==', 
-    psBINARY_NOTEQUAL   = '!=', 
-    psBINARY_LESSOREQ   = '<=', 
-    psBINARY_MOREOREQ   = '>=', 
-    psBINARY_AND        = '&&', 
-    psBINARY_OR         = '||', 
-    psBINARY_BITAND     = '&', 
-    psBINARY_BITOR      = '|', 
-    psBINARY_XOR        = '~', 
-    psBINARY_ATAN2      = 'atan2', 
-} psBINARY_OP;
-
-// unary image operations 
-typedef enum { 
-    psUNARY_IS     = '=', 
-    psUNARY_ABS,
-    psUNARY_INT,
-    psUNARY_EXP,
-    psUNARY_TEN,
-    psUNARY_LOG,
-    psUNARY_LN,
-    psUNARY_SQRT,
-    psUNARY_SIN,
-    psUNARY_COS,
-    psUNARY_TAN,
-    psUNARY_DSIN,
-    psUNARY_DCOS,
-    psUNARY_DTAN,
-    psUNARY_ASIN,
-    psUNARY_ACOS,
-    psUNARY_ATAN,
-    psUNARY_DASIN,
-    psUNARY_DACOS,
-    psUNARY_DATAN,
-    psUNARY_RND,
-    psUNARY_NOT,
-    psUNARY_NEGATE = '-',
-    psUNARY_INCR,
-    psUNARY_DECR,
-    psUNARY_ISINF,
-    psUNARY_ISNAN
-} psUNARY_OP;
-
 // basic image data structure 
 typedef struct psImage {
     int nx, ny;				// size of image 
     int x0, y0;				// data region relative to parent 
-    psIMAGE_DEPTH depth;		// type of image 
+    PS_IMAGE_DEPTH depth;		// type of image 
     psF32 **rows;		        // == rows_f32 
     psU8  **rows_u8;			// pointers to psU8 data 
@@ -111,5 +111,5 @@
 psAllocImage (int nx,			// image width 
 	      int ny,			// image height 
-	      psIMAGE_DEPTH depth	// image depth 
+	      PS_IMAGE_DEPTH depth	// image depth 
     );
 
@@ -321,6 +321,6 @@
 psImageBinaryOp (psImage *out,		// destination image (may be NULL) 
 		 psImage *in1,		// first input image 
-		 psImage *in2,		// second input image 
-		 psBINARY_OP OP		// operator 
+		 PS_BINARY_OP OP,	// operator 
+		 psImage *in2		// second input image 
     );
 
@@ -329,5 +329,5 @@
 psImageUnaryOp (psImage *out,		// destination image (may be NULL) 
 		psImage *in1,		// input image 
-		psUNARY_OP OP		// operator 
+		PS_UNARY_OP OP		// operator 
     );
 
@@ -338,5 +338,5 @@
 		int x0,			// x offset of overlay subimage 
 		int y0,			// y offset of overlay subimage 
-		psOVERLAY_OP op		// overlay operation 
+		PS_OVERLAY_OP op	// overlay operation 
     );