Index: trunk/psLib/test/imageops/tst_psImagePixelManip.c
===================================================================
--- trunk/psLib/test/imageops/tst_psImagePixelManip.c	(revision 5224)
+++ trunk/psLib/test/imageops/tst_psImagePixelManip.c	(revision 5227)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-05 03:51:43 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-06 02:41:07 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29,5 +29,4 @@
 static psS32 testImageClipComplexRegion(void);
 static psS32 testImageOverlay(void);
-static psS32 testImageKeepMask(void);
 
 testDescription tests[] = {
@@ -36,5 +35,4 @@
                               {testImageClipComplexRegion,673,"psImageClipComplexRegion",0,false},
                               {testImageOverlay,573,"psImageOverlay",0,false},
-                              {testImageKeepMask,574,"psImageKeep and Mask",0,false},
                               {NULL}
                           };
@@ -798,99 +796,2 @@
     return 0;
 }
-
-psS32 testImageKeepMask(void)
-{
-    //psImageMaskRegion
-    //psImageKeepRegion
-    //psImageMaskCircle
-    //psImageKeepCircle
-    psImage *in = psImageAlloc(3,3,PS_TYPE_MASK);
-    psRegion reg;
-    reg.x0 = 0;
-    reg.x1 = 1;
-    reg.y0 = 0;
-    reg.y1 = 1;
-    psMaskType mask = 2;
-    in->data.PS_TYPE_MASK_DATA[0][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[0][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[0][2] = 1;
-    in->data.PS_TYPE_MASK_DATA[1][0] = 4;
-    in->data.PS_TYPE_MASK_DATA[1][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[1][2] = 3;
-    in->data.PS_TYPE_MASK_DATA[2][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[2][1] = 1;
-    in->data.PS_TYPE_MASK_DATA[2][2] = 2;
-
-    printf("\n Mask Region------");
-    psImageMaskRegion(in, reg, "|", mask);
-    for(int i = 0; i < 3; i++) {
-        for (int j = 0; j < 3; j++) {
-            printf("\nin->data.u8 [i][j] i=%d, j=%d = %u", i, j, in->data.PS_TYPE_MASK_DATA[i][j]);
-        }
-    }
-
-    in->data.PS_TYPE_MASK_DATA[0][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[0][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[0][2] = 1;
-    in->data.PS_TYPE_MASK_DATA[1][0] = 4;
-    in->data.PS_TYPE_MASK_DATA[1][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[1][2] = 3;
-    in->data.PS_TYPE_MASK_DATA[2][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[2][1] = 1;
-    in->data.PS_TYPE_MASK_DATA[2][2] = 2;
-    psImageKeepRegion(in, reg, "AND", mask);
-    printf("\n Keep Region------");
-    for(int i = 0; i < 3; i++) {
-        for (int j = 0; j < 3; j++) {
-            printf("\nin->data.u8 [i][j] i=%d, j=%d = %u", i, j, in->data.PS_TYPE_MASK_DATA[i][j]);
-        }
-    }
-
-    //Mask Circle and Keep Circle Functions
-    in->data.PS_TYPE_MASK_DATA[0][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[0][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[0][2] = 1;
-    in->data.PS_TYPE_MASK_DATA[1][0] = 4;
-    in->data.PS_TYPE_MASK_DATA[1][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[1][2] = 3;
-    in->data.PS_TYPE_MASK_DATA[2][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[2][1] = 1;
-    in->data.PS_TYPE_MASK_DATA[2][2] = 2;
-    psImageMaskCircle(in, 1, 1, 1, "XOR", mask);
-    printf("\n Mask Circle------");
-    for(int i = 0; i < 3; i++) {
-        for (int j = 0; j < 3; j++) {
-            printf("\nin->data.u8 [i][j] i=%d, j=%d = %u", i, j, in->data.PS_TYPE_MASK_DATA[i][j]);
-        }
-    }
-
-    in->data.PS_TYPE_MASK_DATA[0][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[0][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[0][2] = 1;
-    in->data.PS_TYPE_MASK_DATA[1][0] = 4;
-    in->data.PS_TYPE_MASK_DATA[1][1] = 0;
-    in->data.PS_TYPE_MASK_DATA[1][2] = 3;
-    in->data.PS_TYPE_MASK_DATA[2][0] = 2;
-    in->data.PS_TYPE_MASK_DATA[2][1] = 1;
-    in->data.PS_TYPE_MASK_DATA[2][2] = 2;
-    psImageKeepCircle(in, 1, 1, 1, "=", mask);
-    printf("\n Keep Circle------");
-    for(int i = 0; i < 3; i++) {
-        for (int j = 0; j < 3; j++) {
-            printf("\nin->data.u8 [i][j] i=%d, j=%d = %u", i, j, in->data.PS_TYPE_MASK_DATA[i][j]);
-        }
-    }
-    fflush(stdout);
-
-    //Error Checks
-    //incorrect logical operation
-    printf("\n");
-    psImageKeepRegion(in, reg, "+", mask);
-    //null image
-    psImage *none = NULL;
-    psImageMaskCircle(none, 1, 1, 1, "&", mask);
-
-    psFree(in);
-    return 0;
-}
-