Index: trunk/psLib/test/imageops/tst_psImagePixelExtract.c
===================================================================
--- trunk/psLib/test/imageops/tst_psImagePixelExtract.c	(revision 6631)
+++ trunk/psLib/test/imageops/tst_psImagePixelExtract.c	(revision 6750)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-24 23:43:15 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-01 02:43:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,5 @@
 static psS32 testImageCut(void);
 static psS32 testImageRadialCut(void);
+static psS32 testImageRowColError(void);
 static psS32 testImageRowColF32(void);
 static psS32 testImageRowColF64(void);
@@ -37,5 +38,6 @@
                               {testImageSlice, 552, "psImageSlice", 0, false},
                               {testImageCut, 555, "psImageCut", 0, false},
-                              {testImageRadialCut, 557, "psImageRadialCut", 0, false},
+                              {testImageRadialCut, 556, "psImageRadialCut", 0, false},
+                              {testImageRowColError, 557, "testImageRowColError", 0, false},
                               {testImageRowColF32, 558, "psImageRowColF32", 0, false},
                               {testImageRowColF64, 559, "psImageRowColF64", 0, false},
@@ -765,14 +767,20 @@
 }
 
-psS32 testImageRowColF64(void)
-{
-    psVector *rowcol = NULL;
-    psVector *empty = NULL;
+psS32 testImageRowColError(void)
+{
     psImage *image = NULL;
-    psImage *emptyImage = NULL;
+    psVector *out = NULL;
+    int num = 0;
+
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    out = psImageRow(NULL, image, num);
+    if (out != NULL) {
+        return 1;
+    }
+
 
     image = psImageAlloc(3, 3, PS_TYPE_F64);
-    rowcol = psVectorAlloc(3, PS_TYPE_F64);
-
+    *(psS32*)&(image->row0) = 5;
+    *(psS32*)&(image->col0) = 10;
     image->data.F64[0][0] = 666.666;
     image->data.F64[1][0] = 66.6;
@@ -785,4 +793,31 @@
     image->data.F64[2][2] = 66.66;
 
+
+
+    psFree(out);
+    psFree(image);
+    return 0;
+}
+
+psS32 testImageRowColF64(void)
+{
+    psVector *rowcol = NULL;
+    psVector *empty = NULL;
+    psImage *image = NULL;
+    psImage *emptyImage = NULL;
+
+    image = psImageAlloc(3, 3, PS_TYPE_F64);
+    rowcol = psVectorAlloc(3, PS_TYPE_F64);
+
+    image->data.F64[0][0] = 666.666;
+    image->data.F64[1][0] = 66.6;
+    image->data.F64[2][0] = 6.66;
+    image->data.F64[0][1] = 6.6;
+    image->data.F64[1][1] = 6.666;
+    image->data.F64[2][1] = 66.666;
+    image->data.F64[0][2] = 666.6;
+    image->data.F64[1][2] = 666.66;
+    image->data.F64[2][2] = 66.66;
+
     //Test for error with NULL image
     empty = psImageCol(empty, emptyImage, 0);
Index: trunk/psLib/test/imageops/tst_psImageStats.c
===================================================================
--- trunk/psLib/test/imageops/tst_psImageStats.c	(revision 6631)
+++ trunk/psLib/test/imageops/tst_psImageStats.c	(revision 6750)
@@ -543,9 +543,10 @@
     psRegion reg;
     reg.x0 = 0;
-    reg.x1 = 1;
+    reg.x1 = 0;
     reg.y0 = 0;
-    reg.y1 = 5;
+    reg.y1 = 4;
+
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     numPix = psImageCountPixelMask(in, reg, 1);
-
     if (numPix != -1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -587,5 +588,5 @@
     if (numPix2 != 2) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psImageCountPixelMask returned incorrect pixel count %ld\n", numPix2);
+                "psImageCountPixelMask returned incorrect pixel count %ld (!=2)\n", numPix2);
         return 4;
     }
@@ -613,4 +614,5 @@
     reg.x1 = 1;
     reg.y1 = 1;
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     numPix2 = psImageCountPixelMask(in2, reg, 1);
     if (numPix2 != -1) {
Index: trunk/psLib/test/imageops/verified/tst_psImageInterpolate.stderr
===================================================================
--- trunk/psLib/test/imageops/verified/tst_psImageInterpolate.stderr	(revision 6631)
+++ trunk/psLib/test/imageops/verified/tst_psImageInterpolate.stderr	(revision 6750)
@@ -17,5 +17,5 @@
     Following should generate an error message
 <DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
-    Can not operate on a NULL psImage.
+    Unallowable operation: psImage input or its data is NULL.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
Index: trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr
===================================================================
--- trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr	(revision 6631)
+++ trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr	(revision 6750)
@@ -24,17 +24,17 @@
     Following should be an error.
 <DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
-    Specified psRegion parameter, x0=301.000000, is out of range [0,300].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
-    Specified psRegion parameter, y0=201.000000, is out of range [0,200].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
-    Specified psRegion parameter, x1=301.000000=301, is out of range [0,300].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
-    Specified psRegion parameter, y1=201.000000=201, is out of range [0,200].
+    Specified psRegion parameter, x0=301.000000, is out of range [0,299].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified psRegion parameter, y0=201.000000, is out of range [0,199].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified psRegion parameter, x1=301.000000=301, is out of range [0,299].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified psRegion parameter, y1=201.000000=201, is out of range [0,199].
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
@@ -61,33 +61,25 @@
     The following should be an error.
 <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].
+    Specified psRegion parameter, x0=-1.000000, is out of range [0,300].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified psRegion parameter, x0=300.000000, is out of range [0,300].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified psRegion parameter, y0=-1.000000, is out of range [0,200].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified psRegion parameter, y0=200.000000, is out of range [0,200].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (NULL image).
@@ -148,4 +140,17 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psImagePixelExtract.c                                  *
+*            TestPoint: psImage{testImageRowColError}                              *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|I|testImageRowColError
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psImageRow (FILE:LINENO)
+    Can not operate on a NULL psImage.
+
+---> TESTPOINT PASSED (psImage{testImageRowColError} | tst_psImagePixelExtract.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psImagePixelExtract.c                                  *
 *            TestPoint: psImage{psImageRowColF32}                                  *
 *             TestType: Positive                                                   *
Index: trunk/psLib/test/imageops/verified/tst_psImageStats.stderr
===================================================================
--- trunk/psLib/test/imageops/verified/tst_psImageStats.stderr	(revision 6631)
+++ trunk/psLib/test/imageops/verified/tst_psImageStats.stderr	(revision 6750)
@@ -622,8 +622,12 @@
 \**********************************************************************************/
 
+<HOST>|I|testImageCountPixel
+    Following should generate error message
 <HOST>|E|psImageCountPixelMask (FILE:LINENO)
-    Can not operate on a NULL psImage.
+    Unallowable operation: psImage mask or its data is NULL.
+<HOST>|I|testImageCountPixel
+    Following should generate error message
 <HOST>|E|psImageCountPixelMask (FILE:LINENO)
-    psRegion input contains 0 pixels
+    Specified psRegion parameter, x0=1.000000, is out of range [0,0].
 
 ---> TESTPOINT PASSED (psImage{psImageCountPixel} | tst_psImageStats.c)