Index: /trunk/psLib/configure.ac
===================================================================
--- /trunk/psLib/configure.ac	(revision 3683)
+++ /trunk/psLib/configure.ac	(revision 3684)
@@ -223,5 +223,5 @@
 AC_CONFIG_FILES([ src/collections/Makefile ])
 AC_CONFIG_FILES([ src/dataManip/Makefile ])
-AC_CONFIG_FILES([ src/fileUtils/Makefile ])
+AC_CONFIG_FILES([ src/dataIO/Makefile ])
 AC_CONFIG_FILES([ src/image/Makefile ])
 AC_CONFIG_FILES([ src/sysUtils/Makefile ])
@@ -236,5 +236,5 @@
 AC_CONFIG_FILES([ test/collections/Makefile ])
 AC_CONFIG_FILES([ test/dataManip/Makefile ])
-AC_CONFIG_FILES([ test/fileUtils/Makefile ])
+AC_CONFIG_FILES([ test/dataIO/Makefile ])
 AC_CONFIG_FILES([ test/image/Makefile ])
 AC_CONFIG_FILES([ test/sysUtils/Makefile ])
Index: /trunk/psLib/src/Makefile.am
===================================================================
--- /trunk/psLib/src/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/Makefile.am	(revision 3684)
@@ -1,3 +1,3 @@
-SUBDIRS = astronomy collections dataManip fileUtils image sysUtils
+SUBDIRS = astronomy collections dataManip dataIO image sysUtils
 
 INCLUDES = \
@@ -5,5 +5,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
@@ -16,5 +16,5 @@
 	$(top_builddir)/src/collections/libpslibcollections.la \
 	$(top_builddir)/src/dataManip/libpslibdataManip.la \
-	$(top_builddir)/src/fileUtils/libpslibfileUtils.la \
+	$(top_builddir)/src/dataIO/libpslibdataIO.la \
 	$(top_builddir)/src/image/libpslibimage.la \
 	$(top_builddir)/src/sysUtils/libpslibsysUtils.la 
Index: /trunk/psLib/src/astronomy/Makefile.am
===================================================================
--- /trunk/psLib/src/astronomy/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/astronomy/Makefile.am	(revision 3684)
@@ -6,5 +6,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/src/astronomy/psMetadata.h
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.h	(revision 3683)
+++ /trunk/psLib/src/astronomy/psMetadata.h	(revision 3684)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -317,5 +317,4 @@
                             const char* comment, psPtr value);
 
-
 /** Remove an item from metadata collection.
  *
Index: /trunk/psLib/src/collections/Makefile.am
===================================================================
--- /trunk/psLib/src/collections/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/collections/Makefile.am	(revision 3684)
@@ -4,5 +4,5 @@
 	-I$(top_srcdir)/src/astronomy \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/src/collections/psMetadata.h
===================================================================
--- /trunk/psLib/src/collections/psMetadata.h	(revision 3683)
+++ /trunk/psLib/src/collections/psMetadata.h	(revision 3684)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -317,5 +317,4 @@
                             const char* comment, psPtr value);
 
-
 /** Remove an item from metadata collection.
  *
Index: /trunk/psLib/src/collections/psVector.c
===================================================================
--- /trunk/psLib/src/collections/psVector.c	(revision 3683)
+++ /trunk/psLib/src/collections/psVector.c	(revision 3684)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     psVec->type.dimen = PS_DIMEN_VECTOR;
     psVec->type.type = elemType;
-    psVec->nalloc = nalloc;
+    *(int*)&psVec->nalloc = nalloc;
     psVec->n = nalloc;
 
@@ -81,5 +81,5 @@
         // Realloc after decrementation to avoid accessing freed array elements
         in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize);
-        in->nalloc = nalloc;
+        *(int*)&in->nalloc = nalloc;
     }
 
@@ -108,5 +108,5 @@
     if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) {
         in->data.U8 = psRealloc(in->data.U8, byteSize);
-        in->nalloc = n;
+        *(int*)&in->nalloc = n;
     }
 
Index: /trunk/psLib/src/collections/psVector.h
===================================================================
--- /trunk/psLib/src/collections/psVector.h	(revision 3683)
+++ /trunk/psLib/src/collections/psVector.h	(revision 3684)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33,6 +33,6 @@
 {
     psType type;                ///< Type of data.
-    psU32 nalloc;        ///< Total number of elements available.
-    psU32 n;             ///< Number of elements in use.
+    int n;                      ///< Number of elements in use.
+    const int nalloc;           ///< Total number of elements available.
 
     union {
Index: /trunk/psLib/src/dataIO/Makefile.am
===================================================================
--- /trunk/psLib/src/dataIO/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/dataIO/Makefile.am	(revision 3684)
@@ -1,3 +1,3 @@
-#Makefile for fileUtils functions of psLib
+#Makefile for dataIO functions of psLib
 #
 INCLUDES = \
@@ -9,12 +9,12 @@
 	$(all_includes)
 
-noinst_LTLIBRARIES = libpslibfileUtils.la
+noinst_LTLIBRARIES = libpslibdataIO.la
 
-libpslibfileUtils_la_SOURCES = \
+libpslibdataIO_la_SOURCES = \
 	psLookupTable.c \
 	psFits.c
 
 BUILT_SOURCES = psFileUtilsErrors.h
-EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
+EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h dataIO.i
 
 psFileUtilsErrors.h: psFileUtilsErrors.dat
Index: /trunk/psLib/src/dataIO/dataIO.i
===================================================================
--- /trunk/psLib/src/dataIO/dataIO.i	(revision 3683)
+++ /trunk/psLib/src/dataIO/dataIO.i	(revision 3684)
@@ -1,3 +1,3 @@
-/* fileUtils headers */
+/* dataIO headers */
 %include "psFileUtilsErrors.h"
 %include "psFits.h"
Index: /trunk/psLib/src/dataIO/psFileUtilsErrors.h
===================================================================
--- /trunk/psLib/src/dataIO/psFileUtilsErrors.h	(revision 3683)
+++ /trunk/psLib/src/dataIO/psFileUtilsErrors.h	(revision 3684)
@@ -1,5 +1,5 @@
 /** @file  psFileUtilsErrors.h
  *
- *  @brief Contains the error text for the fileUtils functions
+ *  @brief Contains the error text for the dataIO functions
  *
  *  @ingroup ErrorHandling
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 21:54:09 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/dataIO/psLookupTable.c
===================================================================
--- /trunk/psLib/src/dataIO/psLookupTable.c	(revision 3683)
+++ /trunk/psLib/src/dataIO/psLookupTable.c	(revision 3684)
@@ -3,10 +3,10 @@
 *  @brief This file defines the structure and functions for table lookups.
 *
-*  @ingroup fileUtils
+*  @ingroup dataIO
 *
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/dataIO/psLookupTable.h
===================================================================
--- /trunk/psLib/src/dataIO/psLookupTable.h	(revision 3683)
+++ /trunk/psLib/src/dataIO/psLookupTable.h	(revision 3684)
@@ -3,10 +3,10 @@
 *  @brief This file defines the structure and functions for table lookups.
 *
-*  @ingroup fileUtils
+*  @ingroup dataIO
 *
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 21:54:09 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/dataManip/Makefile.am
===================================================================
--- /trunk/psLib/src/dataManip/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/dataManip/Makefile.am	(revision 3684)
@@ -4,5 +4,5 @@
 	-I$(top_srcdir)/src/astronomy \
 	-I$(top_srcdir)/src/collections \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/src/fileUtils/Makefile.am
===================================================================
--- /trunk/psLib/src/fileUtils/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/fileUtils/Makefile.am	(revision 3684)
@@ -1,3 +1,3 @@
-#Makefile for fileUtils functions of psLib
+#Makefile for dataIO functions of psLib
 #
 INCLUDES = \
@@ -9,12 +9,12 @@
 	$(all_includes)
 
-noinst_LTLIBRARIES = libpslibfileUtils.la
+noinst_LTLIBRARIES = libpslibdataIO.la
 
-libpslibfileUtils_la_SOURCES = \
+libpslibdataIO_la_SOURCES = \
 	psLookupTable.c \
 	psFits.c
 
 BUILT_SOURCES = psFileUtilsErrors.h
-EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
+EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h dataIO.i
 
 psFileUtilsErrors.h: psFileUtilsErrors.dat
Index: /trunk/psLib/src/fileUtils/fileUtils.i
===================================================================
--- /trunk/psLib/src/fileUtils/fileUtils.i	(revision 3683)
+++ /trunk/psLib/src/fileUtils/fileUtils.i	(revision 3684)
@@ -1,3 +1,3 @@
-/* fileUtils headers */
+/* dataIO headers */
 %include "psFileUtilsErrors.h"
 %include "psFits.h"
Index: /trunk/psLib/src/fileUtils/psFileUtilsErrors.h
===================================================================
--- /trunk/psLib/src/fileUtils/psFileUtilsErrors.h	(revision 3683)
+++ /trunk/psLib/src/fileUtils/psFileUtilsErrors.h	(revision 3684)
@@ -1,5 +1,5 @@
 /** @file  psFileUtilsErrors.h
  *
- *  @brief Contains the error text for the fileUtils functions
+ *  @brief Contains the error text for the dataIO functions
  *
  *  @ingroup ErrorHandling
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 21:54:09 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/fileUtils/psLookupTable.c
===================================================================
--- /trunk/psLib/src/fileUtils/psLookupTable.c	(revision 3683)
+++ /trunk/psLib/src/fileUtils/psLookupTable.c	(revision 3684)
@@ -3,10 +3,10 @@
 *  @brief This file defines the structure and functions for table lookups.
 *
-*  @ingroup fileUtils
+*  @ingroup dataIO
 *
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/fileUtils/psLookupTable.h
===================================================================
--- /trunk/psLib/src/fileUtils/psLookupTable.h	(revision 3683)
+++ /trunk/psLib/src/fileUtils/psLookupTable.h	(revision 3684)
@@ -3,10 +3,10 @@
 *  @brief This file defines the structure and functions for table lookups.
 *
-*  @ingroup fileUtils
+*  @ingroup dataIO
 *
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 21:54:09 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/image/Makefile.am
===================================================================
--- /trunk/psLib/src/image/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/image/Makefile.am	(revision 3684)
@@ -5,5 +5,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/sysUtils \
 	$(all_includes)
Index: /trunk/psLib/src/image/psImageExtraction.c
===================================================================
--- /trunk/psLib/src/image/psImageExtraction.c	(revision 3683)
+++ /trunk/psLib/src/image/psImageExtraction.c	(revision 3684)
@@ -9,6 +9,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -428,9 +428,9 @@
         imgVec = psAlloc(sizeof(psVector));
         imgVec->type = in->type;
-        imgVec->n = imgVec->nalloc = numCols;
+        imgVec->n = *(int*)&imgVec->nalloc = numCols;
         if (mask != NULL) {
             maskVec = psAlloc(sizeof(psVector));
             maskVec->type = mask->type;
-            maskVec->n = maskVec->nalloc = numCols;
+            maskVec->n = *(int*)&maskVec->nalloc = numCols;
         }
         // recycle output to make a proper sized/type output structure
Index: /trunk/psLib/src/image/psImageStats.c
===================================================================
--- /trunk/psLib/src/image/psImageStats.c	(revision 3683)
+++ /trunk/psLib/src/image/psImageStats.c	(revision 3684)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-24 19:39:53 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -61,5 +61,5 @@
         junkData = (psVector *) psAlloc(sizeof(psVector));
         junkData->type = in->type;
-        junkData->nalloc = in->numRows * in->numCols;
+        *(int*)&junkData->nalloc = in->numRows * in->numCols;
         junkData->n = junkData->nalloc;
         junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
@@ -85,5 +85,5 @@
             junkMask = psAlloc(sizeof(psVector));
             junkMask->type = mask->type;
-            junkMask->nalloc = mask->numRows * mask->numCols;
+            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
             junkMask->n = junkMask->nalloc;
             junkMask->data.U8 = mask->data.V[0];
@@ -134,5 +134,5 @@
         junkData = (psVector *) psAlloc(sizeof(psVector));
         junkData->type = in->type;
-        junkData->nalloc = in->numRows * in->numCols;
+        *(int*)&junkData->nalloc = in->numRows * in->numCols;
         junkData->n = junkData->nalloc;
         junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
@@ -158,5 +158,5 @@
             junkMask = psAlloc(sizeof(psVector));
             junkMask->type = mask->type;
-            junkMask->nalloc = mask->numRows * mask->numCols;
+            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
             junkMask->n = junkMask->nalloc;
             junkMask->data.U8 = mask->data.V[0];
Index: /trunk/psLib/src/imageops/psImageStats.c
===================================================================
--- /trunk/psLib/src/imageops/psImageStats.c	(revision 3683)
+++ /trunk/psLib/src/imageops/psImageStats.c	(revision 3684)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-24 19:39:53 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -61,5 +61,5 @@
         junkData = (psVector *) psAlloc(sizeof(psVector));
         junkData->type = in->type;
-        junkData->nalloc = in->numRows * in->numCols;
+        *(int*)&junkData->nalloc = in->numRows * in->numCols;
         junkData->n = junkData->nalloc;
         junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
@@ -85,5 +85,5 @@
             junkMask = psAlloc(sizeof(psVector));
             junkMask->type = mask->type;
-            junkMask->nalloc = mask->numRows * mask->numCols;
+            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
             junkMask->n = junkMask->nalloc;
             junkMask->data.U8 = mask->data.V[0];
@@ -134,5 +134,5 @@
         junkData = (psVector *) psAlloc(sizeof(psVector));
         junkData->type = in->type;
-        junkData->nalloc = in->numRows * in->numCols;
+        *(int*)&junkData->nalloc = in->numRows * in->numCols;
         junkData->n = junkData->nalloc;
         junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
@@ -158,5 +158,5 @@
             junkMask = psAlloc(sizeof(psVector));
             junkMask->type = mask->type;
-            junkMask->nalloc = mask->numRows * mask->numCols;
+            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
             junkMask->n = junkMask->nalloc;
             junkMask->data.U8 = mask->data.V[0];
Index: /trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.c	(revision 3683)
+++ /trunk/psLib/src/mathtypes/psVector.c	(revision 3684)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     psVec->type.dimen = PS_DIMEN_VECTOR;
     psVec->type.type = elemType;
-    psVec->nalloc = nalloc;
+    *(int*)&psVec->nalloc = nalloc;
     psVec->n = nalloc;
 
@@ -81,5 +81,5 @@
         // Realloc after decrementation to avoid accessing freed array elements
         in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize);
-        in->nalloc = nalloc;
+        *(int*)&in->nalloc = nalloc;
     }
 
@@ -108,5 +108,5 @@
     if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) {
         in->data.U8 = psRealloc(in->data.U8, byteSize);
-        in->nalloc = n;
+        *(int*)&in->nalloc = n;
     }
 
Index: /trunk/psLib/src/mathtypes/psVector.h
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.h	(revision 3683)
+++ /trunk/psLib/src/mathtypes/psVector.h	(revision 3684)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33,6 +33,6 @@
 {
     psType type;                ///< Type of data.
-    psU32 nalloc;        ///< Total number of elements available.
-    psU32 n;             ///< Number of elements in use.
+    int n;                      ///< Number of elements in use.
+    const int nalloc;           ///< Total number of elements available.
 
     union {
Index: /trunk/psLib/src/sysUtils/Makefile.am
===================================================================
--- /trunk/psLib/src/sysUtils/Makefile.am	(revision 3683)
+++ /trunk/psLib/src/sysUtils/Makefile.am	(revision 3684)
@@ -5,5 +5,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	$(all_includes)
Index: /trunk/psLib/src/types/psLookupTable.c
===================================================================
--- /trunk/psLib/src/types/psLookupTable.c	(revision 3683)
+++ /trunk/psLib/src/types/psLookupTable.c	(revision 3684)
@@ -3,10 +3,10 @@
 *  @brief This file defines the structure and functions for table lookups.
 *
-*  @ingroup fileUtils
+*  @ingroup dataIO
 *
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/types/psLookupTable.h
===================================================================
--- /trunk/psLib/src/types/psLookupTable.h	(revision 3683)
+++ /trunk/psLib/src/types/psLookupTable.h	(revision 3684)
@@ -3,10 +3,10 @@
 *  @brief This file defines the structure and functions for table lookups.
 *
-*  @ingroup fileUtils
+*  @ingroup dataIO
 *
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 21:54:09 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/types/psMetadata.h
===================================================================
--- /trunk/psLib/src/types/psMetadata.h	(revision 3683)
+++ /trunk/psLib/src/types/psMetadata.h	(revision 3684)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-06 01:12:58 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-08 17:58:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -317,5 +317,4 @@
                             const char* comment, psPtr value);
 
-
 /** Remove an item from metadata collection.
  *
Index: /trunk/psLib/swig/Makefile.am
===================================================================
--- /trunk/psLib/swig/Makefile.am	(revision 3683)
+++ /trunk/psLib/swig/Makefile.am	(revision 3684)
@@ -10,5 +10,5 @@
 	-I$(SRCDIR)/src/collections \
 	-I$(SRCDIR)/src/dataManip \
-	-I$(SRCDIR)/src/fileUtils \
+	-I$(SRCDIR)/src/dataIO \
 	-I$(SRCDIR)/src/image \
 	-I$(SRCDIR)/src/sysUtils \
Index: /trunk/psLib/swig/pslib.i
===================================================================
--- /trunk/psLib/swig/pslib.i	(revision 3683)
+++ /trunk/psLib/swig/pslib.i	(revision 3684)
@@ -60,5 +60,5 @@
 %include "sysUtils.i"
 %include "image.i"
-%include "fileUtils.i"
+%include "dataIO.i"
 %include "dataManip.i"
 %include "collections.i"
Index: /trunk/psLib/test/Makefile.am
===================================================================
--- /trunk/psLib/test/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/Makefile.am	(revision 3684)
@@ -3,5 +3,5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = astronomy collections dataManip fileUtils image sysUtils
+SUBDIRS = astronomy collections dataManip dataIO image sysUtils
 
 EXTRA_DIST = runTest FullUnitTest
Index: /trunk/psLib/test/astronomy/Makefile.am
===================================================================
--- /trunk/psLib/test/astronomy/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/astronomy/Makefile.am	(revision 3684)
@@ -6,5 +6,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/test/collections/Makefile.am
===================================================================
--- /trunk/psLib/test/collections/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/collections/Makefile.am	(revision 3684)
@@ -8,5 +8,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/test/dataIO/Makefile.am
===================================================================
--- /trunk/psLib/test/dataIO/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/dataIO/Makefile.am	(revision 3684)
@@ -1,3 +1,3 @@
-#Makefile for fileUtils functions of psLib
+#Makefile for dataIO functions of psLib
 #
 EXTRA_DIST = verified
@@ -8,5 +8,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/test/dataManip/Makefile.am
===================================================================
--- /trunk/psLib/test/dataManip/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/dataManip/Makefile.am	(revision 3684)
@@ -8,5 +8,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/test/fileUtils/Makefile.am
===================================================================
--- /trunk/psLib/test/fileUtils/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/fileUtils/Makefile.am	(revision 3684)
@@ -1,3 +1,3 @@
-#Makefile for fileUtils functions of psLib
+#Makefile for dataIO functions of psLib
 #
 EXTRA_DIST = verified
@@ -8,5 +8,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/test/image/Makefile.am
===================================================================
--- /trunk/psLib/test/image/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/image/Makefile.am	(revision 3684)
@@ -8,5 +8,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \
Index: /trunk/psLib/test/sysUtils/Makefile.am
===================================================================
--- /trunk/psLib/test/sysUtils/Makefile.am	(revision 3683)
+++ /trunk/psLib/test/sysUtils/Makefile.am	(revision 3684)
@@ -8,5 +8,5 @@
 	-I$(top_srcdir)/src/collections \
 	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/dataIO \
 	-I$(top_srcdir)/src/image \
 	-I$(top_srcdir)/src/sysUtils \