Index: /trunk/psLib/src/dataIO/psFits.c
===================================================================
--- /trunk/psLib/src/dataIO/psFits.c	(revision 3969)
+++ /trunk/psLib/src/dataIO/psFits.c	(revision 3970)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-05 21:25:47 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:09:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19,5 +19,5 @@
 #include "psError.h"
 #include "psFileUtilsErrors.h"
-#include "psImageExtraction.h"
+#include "psImageStructManip.h"
 #include "psMemory.h"
 #include "psString.h"
@@ -1005,5 +1005,8 @@
     if (dx != numCols || dy != numRows) {
         // the input image needs to be subsetted
-        subset = psImageSubset((psImage*)input,0,0,dx+1,dy+1);
+        subset = psImageSubset((psImage*)input,(psRegion) {
+                                   0,0,dx+1,dy+1
+                               }
+                              );
     } else {
         subset = psMemIncrRefCounter((psImage*)input);
Index: /trunk/psLib/src/dataManip/psVectorFFT.c
===================================================================
--- /trunk/psLib/src/dataManip/psVectorFFT.c	(revision 3969)
+++ /trunk/psLib/src/dataManip/psVectorFFT.c	(revision 3970)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:09:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,4 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
-#include "psImageExtraction.h"
 
 #include "psDataManipErrors.h"
Index: /trunk/psLib/src/fft/psVectorFFT.c
===================================================================
--- /trunk/psLib/src/fft/psVectorFFT.c	(revision 3969)
+++ /trunk/psLib/src/fft/psVectorFFT.c	(revision 3970)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-22 21:52:49 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:09:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,4 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
-#include "psImageExtraction.h"
 
 #include "psDataManipErrors.h"
Index: /trunk/psLib/src/fits/psFits.c
===================================================================
--- /trunk/psLib/src/fits/psFits.c	(revision 3969)
+++ /trunk/psLib/src/fits/psFits.c	(revision 3970)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-05 21:25:47 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:09:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19,5 +19,5 @@
 #include "psError.h"
 #include "psFileUtilsErrors.h"
-#include "psImageExtraction.h"
+#include "psImageStructManip.h"
 #include "psMemory.h"
 #include "psString.h"
@@ -1005,5 +1005,8 @@
     if (dx != numCols || dy != numRows) {
         // the input image needs to be subsetted
-        subset = psImageSubset((psImage*)input,0,0,dx+1,dy+1);
+        subset = psImageSubset((psImage*)input,(psRegion) {
+                                   0,0,dx+1,dy+1
+                               }
+                              );
     } else {
         subset = psMemIncrRefCounter((psImage*)input);
Index: /trunk/psLib/src/pslib_strict.h
===================================================================
--- /trunk/psLib/src/pslib_strict.h	(revision 3969)
+++ /trunk/psLib/src/pslib_strict.h	(revision 3970)
@@ -9,6 +9,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-19 02:09:39 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -92,6 +92,8 @@
 /// @{
 #include "psImage.h"
-#include "psImageExtraction.h"
-#include "psImageManip.h"
+#include "psImagePixelExtract.h"
+#include "psImageStructManip.h"
+#include "psImageGeomManip.h"
+#include "psImagePixelManip.h"
 #include "psImageConvolve.h"