Index: trunk/psLib/test/image/Makefile.am
===================================================================
--- trunk/psLib/test/image/Makefile.am	(revision 3125)
+++ trunk/psLib/test/image/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for image functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -27,5 +29,5 @@
 	tst_psImageInterpolate
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psImage \
Index: trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3127)
@@ -11,5 +11,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE: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|psImageCopy (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCopy (FILE:LINENO)
     Can not operate on a NULL psImage.
 
@@ -123,6 +123,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psRegionFromString (psImage.c:<LINENO>)
-    Specified subsection string, '[1:<LINENO>,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psRegionFromString (FILE:LINENO)
+    Specified subsection string, '[1:2,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 
 ---> TESTPOINT PASSED (psImage{psRegionAlloc} | tst_psImage.c)
Index: trunk/psLib/test/image/verified/tst_psImageConvolve.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 3127)
@@ -24,17 +24,17 @@
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Shift vectors can not be of different sizes.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (time vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE: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|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE: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|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE: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 3125)
+++ trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 3127)
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -29,42 +29,42 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<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|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>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,128:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [64:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <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|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|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>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,0:511], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:255,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [-1:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,-1:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <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|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>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:128,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:128,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     psImageFreeChildren shall deallocate any children images of a psImage structure
@@ -79,46 +79,46 @@
 
 <DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [32:<LINENO>,32:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [64:<LINENO>,32:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [32:<LINENO>,128:<LINENO>].
+    Testing subsection [0:32,0:32].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [32:64,32:64].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [64:127,32:64].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [32:64,128:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x1>x2)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid.  Ranges must be incremental.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subset range, [64:32,32:64], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y1>y2)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid.  Ranges must be incremental.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subset range, [32:64,64:32], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x2>nCols)
-<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>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [64:256,32:64], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y2>=nRows)
-<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>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [32:64,64:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no brackets)
-<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>|E|psImageSubsection (FILE: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 - no colons)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE: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|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>|E|psImageSubsection (FILE:LINENO)
+    Specified subsection string, '[32:64,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|imageSubset (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|imageSubset (FILE: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|psImageSubsection (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE: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|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>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified slice direction, 5, is invalid.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<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|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|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|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|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|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:30,20:20], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [301:302,20:30], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:31,201:205], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:301,20:21], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:31,20:201], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE: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|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE: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|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE: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|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified psImage type, psU8, is not supported.
 
@@ -188,18 +188,18 @@
 \**********************************************************************************/
 
-<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|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|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|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:-1], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [-1:299,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,-1:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:300,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,0:200], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:-1,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,0:-1], is invalid or outside input psImage's boundaries, [0:299,0:199].
 
 ---> TESTPOINT PASSED (psImage{psImageTrim} | tst_psImageExtraction.c)
@@ -213,41 +213,41 @@
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<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|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|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|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|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|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|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|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>|E|psImageCut (FILE:LINENO)
+    Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (NULL image).
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (length=0).
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCut (FILE: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|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>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified radii vector can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<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|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|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Specified center, (301,100), is outside of the psImage boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Specified center, (150,201), is outside of the psImage boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE: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|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE: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|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE: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|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE: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 3125)
+++ trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 3127)
@@ -7,13 +7,13 @@
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE: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|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE: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|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option.
 
@@ -37,13 +37,13 @@
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE: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|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Real psImage size (128x64) and imaginary psImage size (64x64) must be the same.
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Input psImage type, psS16, is required to be either psF32 or psF64.
 
@@ -67,5 +67,5 @@
 <DATE><TIME>|<HOST>|I|testImagePowerSpectrum
     Following should generate error message.
-<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (FILE:LINENO)
     Input psImage type, psF32, is required to be either psC32 or psC64.
 
Index: trunk/psLib/test/image/verified/tst_psImageIO.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 3127)
@@ -329,5 +329,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not open file,'foobar.fits'.
     CFITSIO Error: could not open the named file
@@ -336,5 +336,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Specified filename can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRead
@@ -342,5 +342,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not find HDU #4 in file tmpImages/MxN_F32.fits.
     CFITSIO Error: tried to move past end of file
@@ -349,5 +349,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not find HDU with extension name 'bogus' in file tmpImages/MxN_F32.fits.
     CFITSIO Error: illegal HDU number
@@ -371,5 +371,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageWrite
@@ -377,5 +377,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not create file,'panstarrs/writeFits.fits'.
     CFITSIO Error: couldn't create the named file
@@ -384,5 +384,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not open file,'tmpImages/writeInvalidFile.fits'.
     CFITSIO Error: tried to move past end of file
@@ -391,5 +391,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not find HDU with extension name 'ext2' in file tmpImages/writeTest.fits.
     CFITSIO Error: illegal HDU number
@@ -398,5 +398,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Specified extension number, 99, must not exceed number of HDUs, 1, by more than one.
 
Index: trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3127)
@@ -16,13 +16,13 @@
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 
Index: trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3127)
@@ -27,5 +27,5 @@
 <DATE><TIME>|<HOST>|I|testImageClip
     Following should be an error (max<min)
-<DATE><TIME>|<HOST>|E|psImageClip (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClip (FILE:LINENO)
     Specified min value, 256, can not be greater than the specified max value, 128.
 
@@ -42,5 +42,5 @@
 <DATE><TIME>|<HOST>|I|testImageClipNAN
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psImageClipNaN (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipNaN (FILE:LINENO)
     Specified psImage type, psS32, is not supported.
 
@@ -61,53 +61,53 @@
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<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>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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|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|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|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|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|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|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|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|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>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE: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:3.40282e+38].
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified psImage type, psS32, is not supported.
 
@@ -122,25 +122,25 @@
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay isn't within image boundaries
-<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>|E|psImageOverlaySection (FILE:LINENO)
+    Specified subset range, [32:160,64:320], is invalid or outside input psImage's boundaries, [0:128,0:256].
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE: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|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Specified operation, '$', is not supported.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Operation can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is a different type
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Input overlay psImage type, psS64, must match input psImage type, psF32.
 
@@ -155,31 +155,31 @@
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for unsupported type.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE: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|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE: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|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE: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|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE: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|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE: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|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE: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|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 2049, is not valid.  Must specify one and only one statistic type.
 
@@ -194,5 +194,5 @@
 <DATE><TIME>|<HOST>|I|testImageRoll
     Following should generate an error.
-<DATE><TIME>|<HOST>|E|psImageRoll (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRoll (FILE:LINENO)
     Can not operate on a NULL psImage.
 
@@ -351,9 +351,9 @@
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error
-<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRotate (FILE: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|psImageRotate (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
     Specified interpolation mode, -1, is unsupported.
 
@@ -402,9 +402,9 @@
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error...
-<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageShift (FILE: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|psImageShift (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
     Specified interpolation mode, -1, is unsupported.
 
@@ -417,11 +417,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified scale value, 0, must be a positive value.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified interpolation mode, 0, is unsupported.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 
Index: trunk/psLib/test/image/verified/tst_psImageStats00.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 3127)
@@ -1,10 +1,10 @@
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: in is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error for invalid mask type.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: psImage mask has incorrect type.
Index: trunk/psLib/test/image/verified/tst_psImageStats01.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 3127)
@@ -1,8 +1,8 @@
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Error: stats->options is 0.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Unallowable operation: stats is NULL.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Error: stats->options is 0.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Unallowable operation: psImage mask has incorrect type.
Index: trunk/psLib/test/image/verified/tst_psImageStats02.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 3127)
@@ -1,16 +1,16 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE: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|psImageFitPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE: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|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE: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|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
     Unallowable operation: psImage input or its data is NULL.