Index: /trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 2279)
@@ -11,5 +11,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -17,5 +17,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -29,5 +29,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -35,5 +35,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -41,5 +41,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -47,5 +47,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -53,5 +53,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -59,5 +59,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -65,5 +65,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -71,5 +71,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -77,5 +77,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -83,5 +83,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageAlloc
+<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
     Specified number of rows (0) or columns (0) is invalid.
 
@@ -112,5 +112,5 @@
 <DATE><TIME>|<HOST>|I|testImageCopy
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCopy
+<DATE><TIME>|<HOST>|E|psImageCopy (psImage.c:<LINENO>)
     Can not operate on a NULL psImage.
 
Index: /trunk/psLib/test/image/verified/tst_psImageConvolve.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 2279)
@@ -28,13 +28,13 @@
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (time vector NULL).
-<DATE><TIME>|<HOST>|E|psLib.image.psKernelGenerate
+<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     Specified shift vectors can not be NULL.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (x vector NULL).
-<DATE><TIME>|<HOST>|E|psLib.image.psKernelGenerate
+<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     Specified shift vectors can not be NULL.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (y vector NULL).
-<DATE><TIME>|<HOST>|E|psLib.image.psKernelGenerate
+<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
     Specified shift vectors can not be NULL.
 
Index: /trunk/psLib/test/image/verified/tst_psImageExtraction.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 2279)
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -29,9 +29,9 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [0:<LINENO>,128:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [64:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -39,17 +39,17 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -57,13 +57,13 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -88,37 +88,37 @@
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x1>x2)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubsection
+<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y1>y2)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubsection
+<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x2>nCols)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y2>=nRows)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no brackets)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubsection
+<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     Specified subsection string, '32:<LINENO>,32:<LINENO>', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no colons)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubsection
+<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     Specified subsection string, '[32-64,32-64]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - not four numbers)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubsection
+<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     Specified subsection string, '[32:<LINENO>,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (image is NULL)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubset
+<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (subsection string is NULL)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSubsection
+<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
     Specified subsection string can not be NULL.
 
@@ -133,49 +133,49 @@
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified slice direction, 5, is invalid.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified subset range, [301:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified subset range, [30:<LINENO>,201:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error mask size != image size.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Input psImage mask size, 200x300, does not match psImage input size, 300x200.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error invalid mask type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Input psImage mask type, psS8, is not the supported mask datatype of psU8.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error invalid image type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageSlice
+<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
     Specified psImage type, psU8, is not supported.
 
@@ -188,17 +188,17 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
     Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
     Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
+    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
+    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
     Specified subset range, [0:-1,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psLib.image.psImageTrim
+<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
     Specified subset range, [0:<LINENO>,0:-1], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 
@@ -213,41 +213,41 @@
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (NULL image).
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (length=0).
-<DATE><TIME>|<HOST>|E|psLib.image.psImageCut
+<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
     Specified number of samples, 0, must be greater than 1 to make a line.
 
@@ -262,37 +262,37 @@
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Specified radii vector can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Specified center, (301,100), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Specified center, (150,201), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Input psImage mask size, 150x100, does not match psImage input size, 300x200.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Input radii vector size, 1, can not be less than 2.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRadialCut
+<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 
Index: /trunk/psLib/test/image/verified/tst_psImageFFT.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 2279)
@@ -7,13 +7,13 @@
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageFFT
+<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
     Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options.
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageFFT
+<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
     The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported.
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should generate error for invalid direction.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageFFT
+<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
     Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option.
 
@@ -37,9 +37,9 @@
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psLib.image.psImageComplex
+<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
     Real psImage type (psF32) and imaginary psImage type (psF64) must be the same.
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (size mismatch).
-<DATE><TIME>|<HOST>|E|psLib.image.psImageComplex
+<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
     Real psImage size (128x64) and imaginary psImage size (64x64) must be the same.
 
Index: /trunk/psLib/test/image/verified/tst_psImageIO.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 2279)
@@ -7,19 +7,19 @@
 <DATE><TIME>|<HOST>|I|testImageRead
     Following should be an error as file doesn't exist.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageReadSection
+<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     Could not open file,'foobar.fits'.
     CFITSIO Error: could not open the named file
 <DATE><TIME>|<HOST>|I|testImageRead
     Following should be an error as filename is NULL.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageReadSection
+<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     Specified filename can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRead
     Following should be an error as extnum is invalid.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageReadSection
+<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     Could not find HDU #4 in file tmpImages/MxN_F32.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|testImageRead
     Following should be an error as extname is invalid.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageReadSection
+<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
     Could not find HDU with extension name 'bogus' in file tmpImages/MxN_F32.fits.
     CFITSIO Error: illegal HDU number
@@ -35,28 +35,28 @@
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should generate an error message because input image is null.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageWriteSection
+<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should be an error for passing invalid image type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageWriteSection
+<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     Input psImage type, psS8, is not supported.
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should be an error for passing invalid image type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageWriteSection
+<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     Could not create file,'panstarrs/writeFits.fits'.
     CFITSIO Error: couldn't create the named file
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should be an error for passing invalid FITS file.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageWriteSection
+<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     Could not open file,'tmpImages/writeInvalidFile.fits'.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should be an error for invalid extension name.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageWriteSection
+<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     Could not find HDU with extension name 'ext2' in file tmpImages/writeTest.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should be an error for invalid extension number.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageWriteSection
+<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
     Specified extension number, 99, must not exceed number of HDUs, 1, by more than one.
 
Index: /trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 2279)
@@ -27,9 +27,9 @@
 <DATE><TIME>|<HOST>|I|testImageClip
     Following should be an error (max<min)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClip
+<DATE><TIME>|<HOST>|E|psImageClip (psImageManip.c:<LINENO>)
     Specified min value, 256, can not be greater than the specified max value, 128.
 <DATE><TIME>|<HOST>|I|testImageClip
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClip
+<DATE><TIME>|<HOST>|E|psImageClip (psImageManip.c:<LINENO>)
     Specified psImage type, psU32, is not supported.
 
@@ -46,5 +46,5 @@
 <DATE><TIME>|<HOST>|I|testImageClipNAN
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipNaN
+<DATE><TIME>|<HOST>|E|psImageClipNaN (psImageManip.c:<LINENO>)
     Specified psImage type, psS32, is not supported.
 
@@ -65,53 +65,53 @@
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified imaginary-portion of min value, 10, can not be greater than the imaginary-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].  
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psLib.image.psImageClipComplexRegion
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
     Specified psImage type, psS32, is not supported.
 
@@ -126,29 +126,29 @@
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay isn't within image boundaries
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as image input is NULL
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Specified operation, '$', is not supported.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Operation can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is a different type
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Input overlay psImage type, psS64, must match input psImage type, psF32.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay and image are not valid for the psImageOverlaySection function.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageOverlaySection
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
     Specified psImage type, psS64, is not supported.
 
@@ -163,31 +163,31 @@
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for unsupported type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Specified psImage type, psU8, is not supported.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for invallid mask type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for scale < 0.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Specified scale value, 0, must be a positive value.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats null.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats options 0.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stat options use range.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Specified statistic option, 8192, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats with multiple options.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRebin
+<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
     Specified statistic option, 2049, is not valid.  Must specify one and only one statistic type.
 
@@ -202,5 +202,5 @@
 <DATE><TIME>|<HOST>|I|testImageRoll
     Following should generate an error.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRoll
+<DATE><TIME>|<HOST>|E|psImageRoll (psImageManip.c:<LINENO>)
     Can not operate on a NULL psImage.
 
@@ -215,41 +215,41 @@
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
-    Specified psImage type, psS32, is not supported.
-<DATE><TIME>|<HOST>|I|testImageRotate
-    Following should be an error invalid type for rotate.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+    Specified psImage type, psS32, is not supported.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error invalid type for rotate.
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
     Specified psImage type, psS32, is not supported.
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error for invalid interpolation type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageRotate
+<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
     Specified interpolation mode, -1, is unsupported.
 
@@ -298,9 +298,9 @@
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error...
-<DATE><TIME>|<HOST>|E|psLib.image.psImageShift
+<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error for invalid interpolation mode.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageShift
+<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
     Specified interpolation mode, -1, is unsupported.
 
@@ -313,9 +313,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psLib.image.psImageResample
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageResample
+<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
     Specified scale value, 0, must be a positive value.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageResample
+<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
     Specified interpolation mode, 0, is unsupported.
 
Index: /trunk/psLib/test/image/verified/tst_psImageStats00.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 2279)
@@ -1,10 +1,10 @@
-<DATE><TIME>|<HOST>|E|psImageHistogram
+<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     Unallowable operation: out is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram
+<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     Unallowable operation: in is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram
+<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     Unallowable operation: out is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error for invalid mask type.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageHistogram
+<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
     Input psImage mask type, psS8, is not the supported mask datatype of psU8.
Index: /trunk/psLib/test/image/verified/tst_psImageStats01.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 2279)
@@ -1,8 +1,8 @@
-<DATE><TIME>|<HOST>|E|psLib.image.psImageStats
+<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageStats
+<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     Specified statistic can not be NULL.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageStats
+<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     Specified statistic option did not indicate any operation to perform.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageStats
+<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
     Input psImage mask type, psU32, is not the supported mask datatype of psU8.
Index: /trunk/psLib/test/image/verified/tst_psImageStats02.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 2278)
+++ /trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 2279)
@@ -1,16 +1,16 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageFitPolynomial
-    Polynomial coefficients cannot be NULL. 
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+    Unallowable operation: polynomial coeffs or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be a error message for NULL input argument.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageFitPolynomial
-    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+    Unallowable operation: psImage input or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageEvalPolynomial
-    Polynomial coefficients cannot be NULL. 
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+    Unallowable operation: polynomial coeffs or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be a error message for NULL input argument.
-<DATE><TIME>|<HOST>|E|psLib.image.psImageEvalPolynomial
-    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+    Unallowable operation: psImage input or its data is NULL.
