Index: trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 1749)
+++ trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 1761)
@@ -5,44 +5,84 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I| testImageAlloc|#546 - psImageAlloc shall allocate memory for a psImage structure
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 101h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 102h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 104h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 108h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 301h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 302h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 304h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 308h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 404h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 408h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 808h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 810h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 0h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    #546 - psImageAlloc shall allocate memory for a psImage structure
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 101h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 102h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 104h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 108h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 301h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 302h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 304h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 308h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 404h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 408h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 808h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 810h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 0h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
 
 ---> TESTPOINT PASSED (psImage{psImageAlloc} | tst_psImage.c)
@@ -54,37 +94,70 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure contains expected values in the row member, if the input psImage structure image contains known values.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure members nrow and ncol are equal to the input parameter nrow and ncol respectively.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member type is equal to the input psImage structure member type.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure members row0 and col0 are equal to the input parameters row0 and col0 respectively.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member parent is equal to the input psImage structure pointer image.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member Nchildren is equal to zero.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member children is null.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the input psImage structure image only has the following members changed: 1) Nchildren is increased by one. 2) parent contains pointer psImage structure out at parent[Nchildren-1].
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameter image is null. Also verified the input psImage structure is not modified.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because input image or its pixel buffer is NULL.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program  execution doesn't stop, if the input parameters nrow and/or ncol are zero. Also verify input psImage structure is not modified.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because number of rows or columns are zero (64x0).
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because number of rows or columns are zero (0x128).
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (128,0) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (0,256) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (-1,0) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (0,-1) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,0:<LINENO>]).
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image outside of image boundaries (size=128x256, subset=[0:<LINENO>,128:<LINENO>]).
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,128:<LINENO>]).
-<DATE><TIME>|<HOST>|I|testImageSubset|psImageFreeChildren shall deallocate any children images of a psImage structure
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure contains expected values in the row member, if the input psImage structure image contains known values.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure members nrow and ncol are equal to the input parameter nrow and ncol respectively.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member type is equal to the input psImage structure member type.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure members row0 and col0 are equal to the input parameters row0 and col0 respectively.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member parent is equal to the input psImage structure pointer image.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member Nchildren is equal to zero.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member children is null.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the input psImage structure image only has the following members changed: 1) Nchildren is increased by one. 2) parent contains pointer psImage structure out at parent[Nchildren-1].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameter image is null. Also verified the input psImage structure is not modified.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because input image or its pixel buffer is NULL.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program  execution doesn't stop, if the input parameters nrow and/or ncol are zero. Also verify input psImage structure is not modified.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because number of rows or columns are zero (64x0).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because number of rows or columns are zero (0x128).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (128,0) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (0,256) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (-1,0) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (0,-1) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,0:<LINENO>]).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image outside of image boundaries (size=128x256, subset=[0:<LINENO>,128:<LINENO>]).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,128:<LINENO>]).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    psImageFreeChildren shall deallocate any children images of a psImage structure
 
 ---> TESTPOINT PASSED (psImage{psImageSubset} | tst_psImage.c)
@@ -96,14 +169,24 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psU8
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psU16
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psU32
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psS8
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psS16
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psS32
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psF32
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psF64
-<DATE><TIME>|<HOST>|I|  testImageCopy|An error should follow...
-<DATE><TIME>|<HOST>|E|    psImageCopy|Can not copy image because input image or its pixel buffer is NULL.
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psU8
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psU16
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psU32
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psS8
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psS16
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psS32
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psF32
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psF64
+<DATE><TIME>|<HOST>|I|testImageCopy
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageCopy
+    Can not copy image because input image or its pixel buffer is NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageCopy} | tst_psImage.c)
Index: trunk/psLib/test/image/verified/tst_psImageExtraction.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 1749)
+++ trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 1761)
@@ -5,22 +5,40 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|Input image can not be NULL.
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The stat options didn't specify a single supported statistic type.
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|Invalid direction flag (5)
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified region contains no data (0x0)
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (2001,100 to 2001,100) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (200,1001 to 200,1001) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (200,100 to 2199,100) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (200,100 to 200,1099) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    Input image can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    Invalid direction flag (5)
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified region contains no data (0x0)
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (2001,100 to 2001,100) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (200,1001 to 200,1001) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (200,100 to 2199,100) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (200,100 to 200,1099) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The stat options didn't specify a single supported statistic type.
 
 ---> TESTPOINT PASSED (psImage{psImageSlice} | tst_psImageExtraction.c)
Index: trunk/psLib/test/image/verified/tst_psImageFFT.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 1749)
+++ trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 1761)
@@ -23,8 +23,12 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stImageComplex|Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same type.
-<DATE><TIME>|<HOST>|I|+stImageComplex|Following should be an error (size mismatch).
-<DATE><TIME>|<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same dimensions.
+<DATE><TIME>|<HOST>|I|testImageComplex
+    Following should be an error (type mismatch).
+<DATE><TIME>|<HOST>|E|psImageComplex
+    The inputs to psImageComplex must be the same type.
+<DATE><TIME>|<HOST>|I|testImageComplex
+    Following should be an error (size mismatch).
+<DATE><TIME>|<HOST>|E|psImageComplex
+    The inputs to psImageComplex must be the same dimensions.
 
 ---> TESTPOINT PASSED (psFFT{psImageComplex} | tst_psImageFFT.c)
Index: trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 1749)
+++ trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 1761)
@@ -5,17 +5,30 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testImageClip|psImageClip shall limit the minimum and maximum data value within a psImage structure
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of F64 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of F32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of S32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of S16 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of S8 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of U32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of U16 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of U8 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of C32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of C64 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Following should be an error (max<min)
-<DATE><TIME>|<HOST>|E|    psImageClip|psImageClip can not be invoked with max < min.
+<DATE><TIME>|<HOST>|I|testImageClip
+    psImageClip shall limit the minimum and maximum data value within a psImage structure
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of F64 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of F32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of S32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of S16 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of S8 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of U32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of U16 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of U8 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of C32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of C64 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Following should be an error (max<min)
+<DATE><TIME>|<HOST>|E|psImageClip
+    psImageClip can not be invoked with max < min.
 
 ---> TESTPOINT PASSED (psImage{psImageClip} | tst_psImageManip.c)
@@ -27,5 +40,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stImageClipNAN|psImageClipNaN shall modified pixel values of NaN with a specified value
+<DATE><TIME>|<HOST>|I|testImageClipNAN
+    psImageClipNaN shall modified pixel values of NaN with a specified value
 
 ---> TESTPOINT PASSED (psImage{psImageClipNAN} | tst_psImageManip.c)
@@ -37,31 +51,58 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+pComplexRegion|psImageClipNaN shall modified pixel values of NaN with a specified value
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Testing clipping at 409.6+256i to 682.667+512i for psC32
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Testing clipping at 409.6+256i to 682.667+512i for psC64
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Can not perform clip on NULL image
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the real image space.
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the imaginary image space.
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the real image space.
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (-6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (-0-6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (0+6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (-6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (-0-6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (0+6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    psImageClipNaN shall modified pixel values of NaN with a specified value
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Testing clipping at 409.6+256i to 682.667+512i for psC32
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Testing clipping at 409.6+256i to 682.667+512i for psC64
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Can not perform clip on NULL image
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    psImageClipComplexRegion can not be invoked with max < min in the real image space.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    psImageClipComplexRegion can not be invoked with max < min in the imaginary image space.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    psImageClipComplexRegion can not be invoked with max < min in the real image space.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (-6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (-0-6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (0+6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (-6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (-0-6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (0+6.80565e+38i) is outside of image's psC32 pixel range
 
 ---> TESTPOINT PASSED (psImage{psImageClipComplexRegion} | tst_psImageManip.c)
@@ -73,10 +114,16 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as overlay isn't within image boundaries
-<DATE><TIME>|<HOST>|E|+OverlaySection|Overlay image (32,64 -> 159,319) is partially outside of the input image (128 x 256).
-<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|+OverlaySection|one of the input images was NULL.
-<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as image input is NULL
-<DATE><TIME>|<HOST>|E|+OverlaySection|one of the input images was NULL.
+<DATE><TIME>|<HOST>|I|testImageOverlay
+    Following should error as overlay isn't within image boundaries
+<DATE><TIME>|<HOST>|E|psImageOverlaySection
+    Overlay image (32,64 -> 159,319) is partially outside of the input image (128 x 256).
+<DATE><TIME>|<HOST>|I|testImageOverlay
+    Following should error as overlay is NULL
+<DATE><TIME>|<HOST>|E|psImageOverlaySection
+    one of the input images was NULL.
+<DATE><TIME>|<HOST>|I|testImageOverlay
+    Following should error as image input is NULL
+<DATE><TIME>|<HOST>|E|psImageOverlaySection
+    one of the input images was NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageOverlay} | tst_psImageManip.c)
@@ -88,15 +135,26 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|   psImageRebin|Input image is NULL.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The scale must be positive.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stats input can not be NULL.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    Input image is NULL.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The scale must be positive.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stats input can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stat options didn't specify a single supported statistic type.
 
 ---> TESTPOINT PASSED (psImage{psImageRebin} | tst_psImageManip.c)
@@ -108,6 +166,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testImageRoll|Following should generate an error.
-<DATE><TIME>|<HOST>|E|    psImageRoll|Input image can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageRoll
+    Following should generate an error.
+<DATE><TIME>|<HOST>|E|psImageRoll
+    Input image can not be NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageRoll} | tst_psImageManip.c)
@@ -119,6 +179,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageRotate|Following should be an error
-<DATE><TIME>|<HOST>|E|  psImageRotate|The input image was NULL.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error
+<DATE><TIME>|<HOST>|E|psImageRotate
+    The input image was NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageRotate} | tst_psImageManip.c)
@@ -130,23 +192,42 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,-16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,-16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,-16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,16.4.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,-16.4.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.7,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.7,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.6,16.2.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.6,-16.2.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.6,16.2.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.6,-16.2.
-<DATE><TIME>|<HOST>|I| testImageShift|Following should be an error...
-<DATE><TIME>|<HOST>|E|   psImageShift|Input image can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,-16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32,16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32,-16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32,16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32,-16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,16.4.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,-16.4.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32.7,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32.7,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32.6,16.2.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32.6,-16.2.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32.6,16.2.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32.6,-16.2.
+<DATE><TIME>|<HOST>|I|testImageShift
+    Following should be an error...
+<DATE><TIME>|<HOST>|E|psImageShift
+    Input image can not be NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageShift} | tst_psImageManip.c)
Index: trunk/psLib/test/image/verified/tst_psImageStats01.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 1749)
+++ trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 1761)
@@ -1,3 +1,6 @@
-<DATE><TIME>|<HOST>|E|   psImageStats|The input image can not be NULL.
-<DATE><TIME>|<HOST>|E|   psImageStats|The input psStats struct can not be NULL.
-<DATE><TIME>|<HOST>|E|   psImageStats|No statistic option/operation was specified.
+<DATE><TIME>|<HOST>|E|psImageStats
+    The input image can not be NULL.
+<DATE><TIME>|<HOST>|E|psImageStats
+    The input psStats struct can not be NULL.
+<DATE><TIME>|<HOST>|E|psImageStats
+    No statistic option/operation was specified.