Changeset 1264 for trunk/psLib/src/dataManip

Timestamp:

Jul 22, 2004, 10:42:54 AM (22 years ago)

Author:

desonia

Message:

moved image stuff to own folder.

Location:

trunk/psLib/src/dataManip

Files:

• Makefile (modified) (1 diff)
• psFFT.c (modified) (2 diffs)
• psFFT.d (modified) (1 diff)
• psMatrix.d (modified) (1 diff)
• psMatrixVectorArithmetic.d (modified) (1 diff)
• psMinimize.d (modified) (1 diff)
• psVectorFFT.c (modified) (2 diffs)

trunk/psLib/src/dataManip/Makefile

@@ -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 = psStats.o  \
            psFunctions.o \
-           psImageStats.o \
            psMatrix.o \
            psMatrixVectorArithmetic.o \
            psFFT.o \
-           psImageIO.o \
            psMinimize.o \
-           psImageManip.o
            
 all: $(TARGET_STATIC)

trunk/psLib/src/dataManip/psFFT.c

@@ -5 +5 @@
  *  @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 +21 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE

trunk/psLib/src/dataManip/psFFT.d

@@ -1 @@
-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

trunk/psLib/src/dataManip/psMatrix.d

@@ -1 +1 @@
 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

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d

@@ -1 +1 @@
 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

trunk/psLib/src/dataManip/psMinimize.d

@@ -1 +1 @@
 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

trunk/psLib/src/dataManip/psVectorFFT.c

@@ -5 +5 @@
  *  @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 +21 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE