Index: /trunk/psLib/test/mathtypes/tap_psImage.c
===================================================================
--- /trunk/psLib/test/mathtypes/tap_psImage.c	(revision 13042)
+++ /trunk/psLib/test/mathtypes/tap_psImage.c	(revision 13043)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-10 21:09:30 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-26 22:18:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -275,6 +275,6 @@
 
         //Set the position of the subimage relative to the parent.
-        image->col0 = 10;
-        image->row0 = 10;
+        P_PSIMAGE_SET_COL0(image, 10);
+        P_PSIMAGE_SET_ROW0(image, 10);
         for (int i = 0; i < 4; i++) {
             for (int j = 0; j < 5; j++) {
@@ -301,10 +301,10 @@
         //Attempt to set a position in a psImage* with negative col0, row0
         *(int*)&none->numRows = 2;
-        none->row0 = -1;
+        P_PSIMAGE_SET_ROW0(none, -1);
         ok(!psImageSet(none, 1, 1, 1),
              "psImageSet failed to return false when passed an image with negative col0");
 
-        none->row0 = 0;
-        none->col0 = -1;
+        P_PSIMAGE_SET_COL0(none, -1);
+        P_PSIMAGE_SET_ROW0(none, 0);
         ok(!psImageSet(none, 1, 1, 1),
              "psImageSet failed to return false when passed an image with negative col0");
@@ -351,6 +351,6 @@
 
         //Set the position of the subimage relative to the parent.
-        image->col0 = 10;
-        image->row0 = 10;
+        P_PSIMAGE_SET_COL0(image, 10);
+        P_PSIMAGE_SET_ROW0(image, 10);
         for (int i = 0; i < 3; i++) {
             for (int j = 0; j < 5; j++) {
@@ -377,10 +377,10 @@
         //Attempt to get a position in a psImage* with negative col0, row0
         *(int*)&none->numRows = 2;
-        none->row0 = -1;
+        P_PSIMAGE_SET_ROW0(none, -1);
         ok(isnan( psImageGet(none, 1, 1) ),
              "psImageGet return false when passed an image with negative col0");
     
-        none->row0 = 0;
-        none->col0 = -1;
+        P_PSIMAGE_SET_COL0(none, -1);
+        P_PSIMAGE_SET_ROW0(none, 0);
         ok(isnan( psImageGet(none, 1, 1) ),
              "psImageGet return false when passed an image with negative col0");