Index: trunk/psLib/src/dataManip/Makefile
===================================================================
--- trunk/psLib/src/dataManip/Makefile	(revision 1246)
+++ 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 1246)
+++ 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 1246)
+++ 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 1246)
+++ 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 1246)
+++ 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 1246)
+++ 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 1246)
+++ 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