Index: trunk/psLib/test/imageops/tst_psImagePixelExtract.c
===================================================================
--- trunk/psLib/test/imageops/tst_psImagePixelExtract.c	(revision 5137)
+++ trunk/psLib/test/imageops/tst_psImagePixelExtract.c	(revision 5174)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-13 02:47:00 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-29 01:15:38 $
 *
 *  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 testImageRowCol(void);
 
 
@@ -27,4 +28,5 @@
                               {testImageCut, 555, "psImageCut", 0, false},
                               {testImageRadialCut, 557, "psImageRadialCut", 0, false},
+                              {testImageRowCol, 559, "psImageRowCol", 0, false},
                               {NULL}
                           };
@@ -742,2 +744,52 @@
     return 0;
 }
+
+psS32 testImageRowCol(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);
+    if (empty != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageCol failed to return NULL for NULL image input.\n");
+        return 1;
+    }
+    //Test for error with Out of Range Row
+    empty = psImageRow(empty, image, 5);
+    if (empty != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageRow failed to return NULL for out of range row input.\n");
+        return 2;
+    }
+    rowcol->data.F64[0] = 1.1;
+    rowcol->data.F64[2] = 2.2;
+    //Test recycling of non-NULL vector & correct output
+    rowcol = psImageCol(rowcol, image, 1);
+    if (rowcol->data.F64[0] != 66.6 && rowcol->data.F64[2] != 666.66) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageCol failed to return correct values.\n");
+        return 3;
+    }
+
+    psFree(rowcol);
+    psFree(image);
+    return 0;
+}
+
Index: trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr
===================================================================
--- trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr	(revision 5137)
+++ trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr	(revision 5174)
@@ -146,2 +146,15 @@
 ---> TESTPOINT PASSED (psImage{psImageRadialCut} | tst_psImagePixelExtract.c)
 
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psImagePixelExtract.c                                  *
+*            TestPoint: psImage{psImageRowCol}                                     *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|E|psImageCol (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageRow (FILE:LINENO)
+    Specified row number is out of range for specified image.
+
+---> TESTPOINT PASSED (psImage{psImageRowCol} | tst_psImagePixelExtract.c)
+