Changeset 3968

Timestamp:

May 18, 2005, 4:08:21 PM (21 years ago)

Author:

desonia

Message:

reorganized the functions into more files.

Location:

trunk/psLib/src

Files:

• fft/psImageFFT.c (modified) (2 diffs)
• image/Makefile.am (modified) (2 diffs)
• image/image.i (modified) (1 diff)
• image/psImageConvolve.c (modified) (3 diffs)
• image/psImageExtraction.c (deleted)
• image/psImageExtraction.h (deleted)
• image/psImageFFT.c (modified) (2 diffs)
• image/psImageGeomManip.c (added)
• image/psImageGeomManip.h (added)
• image/psImageManip.c (deleted)
• image/psImageManip.h (deleted)
• image/psImagePixelExtract.c (added)
• image/psImagePixelExtract.h (added)
• image/psImagePixelManip.c (added)
• image/psImagePixelManip.h (added)
• image/psImageStructManip.c (added)
• image/psImageStructManip.h (added)
• imageops/psImageConvolve.c (modified) (3 diffs)
• imageops/psImageGeomManip.c (added)
• imageops/psImageGeomManip.h (added)
• imageops/psImagePixelExtract.c (added)
• imageops/psImagePixelExtract.h (added)
• imageops/psImagePixelManip.c (added)
• imageops/psImagePixelManip.h (added)
• imageops/psImageStructManip.c (added)
• imageops/psImageStructManip.h (added)

trunk/psLib/src/fft/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-15 00:12:08 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:08:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
-#include "psImageExtraction.h"
 #include "psImageIO.h"
 

trunk/psLib/src/image/Makefile.am

@@ -13 +13 @@
 libpslibimage_la_SOURCES = \
         psImage.c \
-        psImageExtraction.c \
+        psImagePixelExtract.c \
+        psImageStructManip.c \
         psImageIO.c \
-        psImageManip.c \
+        psImageGeomManip.c \
+        psImagePixelManip.c \
         psImageStats.c \
         psImageFFT.c \
@@ -29 +31 @@
 pslibinclude_HEADERS = \
         psImage.h \
-        psImageExtraction.h \
+        psImagePixelExtract.h \
+        psImageStructManip.h \
         psImageIO.h \
-        psImageManip.h \
+        psImageGeomManip.h \
+        psImagePixelManip.h \
         psImageStats.h \
         psImageFFT.h \

trunk/psLib/src/image/image.i

@@ -2 +2 @@
 %include "psImageConvolve.h"
 %include "psImageErrors.h"
-%include "psImageExtraction.h"
+%include "psImageStructManip.h"
+%include "psImagePixelExtract.h"
 %include "psImageFFT.h"
 %include "psImage.h"
 %include "psImageIO.h"
-%include "psImageManip.h"
+%include "psImageGeomManip.h"
+%include "psImagePixelManip.h"
 %include "psImageStats.h"
 

trunk/psLib/src/image/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-15 00:12:08 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:08:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 #include "psImageConvolve.h"
 #include "psImageFFT.h"
-#include "psImageExtraction.h"
+#include "psImageStructManip.h"
 #include "psBinaryOp.h"
 #include "psMemory.h"
@@ -454 +454 @@
 
         // subset out the padded area now.
-        psImage* complexOutSansPad = psImageSubset(complexOut,
-                                     FOURIER_PADDING,FOURIER_PADDING,
-                                     FOURIER_PADDING+numCols,FOURIER_PADDING+numRows);
+        psImage* complexOutSansPad = psImageSubset(complexOut,(psRegion) {
+                                         FOURIER_PADDING,FOURIER_PADDING,
+                                         FOURIER_PADDING+numCols,FOURIER_PADDING+numRows
+                                     }
+                                                  );
 
         out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);

trunk/psLib/src/image/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-15 00:12:08 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:08:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
-#include "psImageExtraction.h"
 #include "psImageIO.h"
 

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-15 00:12:08 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:08:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 #include "psImageConvolve.h"
 #include "psImageFFT.h"
-#include "psImageExtraction.h"
+#include "psImageStructManip.h"
 #include "psBinaryOp.h"
 #include "psMemory.h"
@@ -454 +454 @@
 
         // subset out the padded area now.
-        psImage* complexOutSansPad = psImageSubset(complexOut,
-                                     FOURIER_PADDING,FOURIER_PADDING,
-                                     FOURIER_PADDING+numCols,FOURIER_PADDING+numRows);
+        psImage* complexOutSansPad = psImageSubset(complexOut,(psRegion) {
+                                         FOURIER_PADDING,FOURIER_PADDING,
+                                         FOURIER_PADDING+numCols,FOURIER_PADDING+numRows
+                                     }
+                                                  );
 
         out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);