Index: /trunk/psLib/src/Makefile
===================================================================
--- /trunk/psLib/src/Makefile	(revision 1263)
+++ /trunk/psLib/src/Makefile	(revision 1264)
@@ -3,6 +3,6 @@
 ##  Makefile:  psLib
 ##
-##  $Revision: 1.15 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-15 22:43:53 $
+##  $Revision: 1.16 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-22 20:42:54 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,10 +27,13 @@
    VERSION:= ": Project Version: Unknown "
 else
-   VERSION:= ": Project Version: $(NAME) "
+   VERSION:= ": Project VersidistcleanSysUtils:
+	$(MAKE) --directory=sysUtils distclean
+        
+on: $(NAME) "
 endif
 
 # Define the target to build
 
-ALLTARGETS = sysUtils collections dataManip astronomy
+ALLTARGETS = sysUtils collections image dataManip astronomy
 
 TARGET_DYNAMIC = libpslib.$(DLL)
@@ -39,13 +42,13 @@
 # Define the installation targets
 
-INSTALLTARGETS = installSysUtils installCollections installDataManip installAstronomy
+INSTALLTARGETS = installSysUtils installCollections installImage installDataManip installAstronomy
 
 # Define the clean up targets
 
-CLEANTARGETS = cleanSysUtils cleanCollections cleanDataManip cleanAstronomy
+CLEANTARGETS = cleanSysUtils cleanCollections cleanImage cleanDataManip cleanAstronomy
 
 # Define the distribution clean up targets
 
-DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanDataManip distcleanAstronomy
+DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanImage distcleanDataManip distcleanAstronomy
 
 # Define PHONY target "all" which will make all necessary items
@@ -62,4 +65,7 @@
 sysUtils:
 	$(MAKE) --directory=sysUtils all
+
+image:
+	$(MAKE) --directory=image all
 
 collections:
@@ -80,4 +86,7 @@
 	$(MAKE) --directory=sysUtils install
 
+installImage:
+	$(MAKE) --directory=image install
+
 installCollections:
 	$(MAKE) --directory=collections install
@@ -95,4 +104,7 @@
 	$(MAKE) --directory=sysUtils clean
 
+cleanImage:
+	$(MAKE) --directory=image clean
+
 cleanCollections:
 	$(MAKE) --directory=collections clean
@@ -109,4 +121,7 @@
 distcleanSysUtils:
 	$(MAKE) --directory=sysUtils distclean
+        
+distcleanImage:
+	$(MAKE) --directory=image distclean
         
 distcleanCollections:
@@ -180,3 +195,3 @@
 
 # List of PHONY targets with make file
-.PHONY:  sysUtils collections dataManip astronomy
+.PHONY:  sysUtils collections image dataManip astronomy
Index: /trunk/psLib/src/astronomy/Makefile
===================================================================
--- /trunk/psLib/src/astronomy/Makefile	(revision 1263)
+++ /trunk/psLib/src/astronomy/Makefile	(revision 1264)
@@ -5,5 +5,5 @@
 TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
-CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I..
+CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I.. -I../image
 
 SRC_OBJS = psTime.o \
Index: /trunk/psLib/src/astronomy/psCCD.d
===================================================================
--- /trunk/psLib/src/astronomy/psCCD.d	(revision 1263)
+++ /trunk/psLib/src/astronomy/psCCD.d	(revision 1264)
@@ -1,3 +1,3 @@
-psCCD.o psCCD.d : psCCD.c psCCD.h ../collections/psType.h ../collections/psImage.h \
+psCCD.o psCCD.d : psCCD.c psCCD.h ../collections/psType.h ../image/psImage.h \
   ../collections/psArray.h ../collections/psCompare.h \
   ../collections/psList.h ../sysUtils/psMemory.h
Index: /trunk/psLib/src/collections/Makefile
===================================================================
--- /trunk/psLib/src/collections/Makefile	(revision 1263)
+++ /trunk/psLib/src/collections/Makefile	(revision 1264)
@@ -3,6 +3,6 @@
 ##  Makefile:   collections
 ##
-##  $Revision: 1.25 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-15 23:52:33 $
+##  $Revision: 1.26 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-22 20:42:54 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32,5 +32,4 @@
 SRC_OBJS = psBitSet.o \
            psVector.o \
-           psImage.o \
            psList.o \
            psScalar.o \
Index: /trunk/psLib/src/dataManip/Makefile
===================================================================
--- /trunk/psLib/src/dataManip/Makefile	(revision 1263)
+++ /trunk/psLib/src/dataManip/Makefile	(revision 1264)
@@ -5,15 +5,12 @@
 TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
-CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I..
+CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I.. -I../image
 
 SRC_OBJS = psStats.o  \
            psFunctions.o \
-           psImageStats.o \
            psMatrix.o \
            psMatrixVectorArithmetic.o \
            psFFT.o \
-           psImageIO.o \
            psMinimize.o \
-           psImageManip.o
            
 all: $(TARGET_STATIC)
Index: /trunk/psLib/src/dataManip/psFFT.c
===================================================================
--- /trunk/psLib/src/dataManip/psFFT.c	(revision 1263)
+++ /trunk/psLib/src/dataManip/psFFT.c	(revision 1264)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 20:42:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,5 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE
Index: /trunk/psLib/src/dataManip/psFFT.d
===================================================================
--- /trunk/psLib/src/dataManip/psFFT.d	(revision 1263)
+++ /trunk/psLib/src/dataManip/psFFT.d	(revision 1264)
@@ -1,3 +1,3 @@
-psFFT.o psFFT.d : psFFT.c psFFT.h ../collections/psImage.h ../collections/psType.h \
+psFFT.o psFFT.d : psFFT.c psFFT.h ../image/psImage.h ../collections/psType.h \
   ../collections/psVector.h ../sysUtils/psError.h ../sysUtils/psMemory.h \
-  ../sysUtils/psLogMsg.h
+  ../sysUtils/psLogMsg.h ../image/psImageExtraction.h
Index: /trunk/psLib/src/dataManip/psMatrix.d
===================================================================
--- /trunk/psLib/src/dataManip/psMatrix.d	(revision 1263)
+++ /trunk/psLib/src/dataManip/psMatrix.d	(revision 1264)
@@ -1,3 +1,3 @@
 psMatrix.o psMatrix.d : psMatrix.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  ../collections/psImage.h ../collections/psType.h \
-  ../collections/psVector.h psMatrix.h
+  ../image/psImage.h ../collections/psType.h ../collections/psVector.h \
+  psMatrix.h
Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d
===================================================================
--- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d	(revision 1263)
+++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d	(revision 1264)
@@ -1,4 +1,4 @@
 psMatrixVectorArithmetic.o psMatrixVectorArithmetic.d : psMatrixVectorArithmetic.c \
-  ../sysUtils/psMemory.h ../sysUtils/psError.h ../collections/psImage.h \
+  ../sysUtils/psMemory.h ../sysUtils/psError.h ../image/psImage.h \
   ../collections/psType.h ../collections/psVector.h \
   ../collections/psScalar.h
Index: /trunk/psLib/src/dataManip/psMinimize.d
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.d	(revision 1263)
+++ /trunk/psLib/src/dataManip/psMinimize.d	(revision 1264)
@@ -1,4 +1,4 @@
 psMinimize.o psMinimize.d : psMinimize.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../collections/psType.h \
-  ../collections/psImage.h ../sysUtils/psTrace.h ../sysUtils/psError.h \
-  ../sysUtils/psAbort.h psFunctions.h psMinimize.h psMatrix.h
+  ../collections/psVector.h ../collections/psType.h ../image/psImage.h \
+  ../sysUtils/psTrace.h ../sysUtils/psError.h ../sysUtils/psAbort.h \
+  psFunctions.h psMinimize.h psMatrix.h
Index: /trunk/psLib/src/dataManip/psVectorFFT.c
===================================================================
--- /trunk/psLib/src/dataManip/psVectorFFT.c	(revision 1263)
+++ /trunk/psLib/src/dataManip/psVectorFFT.c	(revision 1264)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 20:42:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,5 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE
Index: /trunk/psLib/src/fft/psVectorFFT.c
===================================================================
--- /trunk/psLib/src/fft/psVectorFFT.c	(revision 1263)
+++ /trunk/psLib/src/fft/psVectorFFT.c	(revision 1264)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 20:42:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,5 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE