Index: trunk/psLib/test/image/tst_psImage.c
===================================================================
--- trunk/psLib/test/image/tst_psImage.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImage.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:25 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18,5 +18,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psType.h"
 
@@ -51,9 +51,8 @@
                           0,1,100,1,150,100
                       };
-    psU32 types = 13;
+    psU32 types = 12;
     psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64,
                           PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64,
-                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64,
-                          PS_TYPE_PTR };
+                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64};
 
     psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure");
@@ -193,28 +192,4 @@
                         }
                     }
-                }
-                break;
-            case PS_TYPE_PTR: {
-                    psU32 rows = numRows[i];
-                    psU32 cols = numCols[i];
-                    psImage* temp = psImageAlloc(1,1,PS_TYPE_F32);
-
-                    for (psS32 r=0;r<rows;r++) {
-                        for (psS32 c=0;c<cols;c++) {
-                            image->data.PTR[r][c] = psMemIncrRefCounter(temp);
-                        }
-                    }
-                    for (psS32 r=0;r<rows;r++) {
-                        for (psS32 c=0;c<cols;c++) {
-                            if (image->data.PTR[r][c] != temp) {
-                                psError(PS_ERR_UNKNOWN, true, "Could not set pixel in pointer image at (%d,%d): %x %x",
-                                        c,r,image->data.PTR[r][c],temp);
-                                psFree(image);
-                                psFree(temp);
-                                return 8;
-                            }
-                        }
-                    }
-                    psFree(temp);
                 }
                 break;
Index: trunk/psLib/test/image/tst_psImageConvolve.c
===================================================================
--- trunk/psLib/test/image/tst_psImageConvolve.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageConvolve.c	(revision 3682)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 21:16:15 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17,5 +17,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psType.h"
 
Index: trunk/psLib/test/image/tst_psImageExtraction.c
===================================================================
--- trunk/psLib/test/image/tst_psImageExtraction.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageExtraction.c	(revision 3682)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-23 21:36:57 $
+*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -15,5 +15,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psType.h"
 
Index: trunk/psLib/test/image/tst_psImageFFT.c
===================================================================
--- trunk/psLib/test/image/tst_psImageFFT.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageFFT.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:25 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 
 #define GENIMAGE(img,c,r,TYP, valueFcn) \
Index: trunk/psLib/test/image/tst_psImageIO.c
===================================================================
--- trunk/psLib/test/image/tst_psImageIO.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageIO.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:25 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 
 #define GENIMAGE(img,c,r,TYP, valueFcn) \
Index: trunk/psLib/test/image/tst_psImageInterpolate.c
===================================================================
--- trunk/psLib/test/image/tst_psImageInterpolate.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageInterpolate.c	(revision 3682)
@@ -5,7 +5,7 @@
  * @author Eric Van Alst, MHPCC
  *
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  *          $Name: not supported by cvs2svn $
- * @date $Date: 2005-03-18 02:35:15 $
+ * @date $Date: 2005-04-07 20:27:42 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -14,5 +14,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 
 #define GENIMAGE(img,c,r,TYP,valueFcn) \
@@ -100,5 +100,5 @@
 
     // Perform interpolation with invalid input image type
-    img1 = psImageAlloc(10,10,PS_TYPE_PTR);
+    img1 = psImageAlloc(10,10,PS_TYPE_BOOL);
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
     val = psImagePixelInterpolate(img1,1.2,1.2,NULL,0,10.0,PS_INTERPOLATE_FLAT);
Index: trunk/psLib/test/image/tst_psImageManip.c
===================================================================
--- trunk/psLib/test/image/tst_psImageManip.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageManip.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-18 02:35:15 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22,5 +22,5 @@
 
 #include "psTest.h"
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psType.h"
 
@@ -1788,6 +1788,6 @@
     // Verify that that an invalid image type is handled properly
     psErrorClear();
-    psImage* invImage = psImageAlloc(cols,rows,PS_TYPE_PTR);
-    memset(invImage->rawDataBuffer,0,cols*rows*sizeof(psPtr)); // make sure the image is of all NULLs
+    psImage* invImage = psImageAlloc(cols,rows,PS_TYPE_BOOL);
+    memset(invImage->rawDataBuffer,0,cols*rows*sizeof(psBool)); // make sure the image is of all NULLs
     result = psImageResample(result,invImage,2,PS_INTERPOLATE_FLAT);
     if (result != NULL) {
Index: trunk/psLib/test/image/tst_psImageStats.c
===================================================================
--- trunk/psLib/test/image/tst_psImageStats.c	(revision 3638)
+++ trunk/psLib/test/image/tst_psImageStats.c	(revision 3682)
@@ -15,5 +15,5 @@
 #include <math.h>
 
-#include "pslib.h"
+#include "pslib_strict.h"
 #include "psTest.h"
 
Index: trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3638)
+++ trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3682)
@@ -79,10 +79,4 @@
 <DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
-<DATE><TIME>|<HOST>|I|testImageAlloc
-    Testing psImage with type 0h
-<DATE><TIME>|<HOST>|I|testImageAlloc
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
-    Specified number of rows (0) or columns (0) is invalid.
 
 ---> TESTPOINT PASSED (psImage{psImageAlloc} | tst_psImage.c)
Index: trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3638)
+++ trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3682)
@@ -21,9 +21,9 @@
     Following should generate an error message
 <DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
-    Specified psImage type, psPtr, is not supported.
+    Specified psImage type, psBool, is not supported.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
 <DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
-    Specified psImage type, psPtr, is not supported.
+    Specified psImage type, psBool, is not supported.
 
 ---> TESTPOINT PASSED (psImagePixelInterpolate{psImagePixelInterpolate} | tst_psImageInterpolate.c)
Index: trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3638)
+++ trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3682)
@@ -424,5 +424,5 @@
     Specified interpolation mode, -1, is unsupported.
 <DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
-    Specified psImage type, psPtr, is not supported.
+    Specified psImage type, psBool, is not supported.
 
 ---> TESTPOINT PASSED (psImage{psImageResample} | tst_psImageManip.c)