Changeset 4128 for trunk/psLib/src/image

Timestamp:

Jun 6, 2005, 4:29:44 PM (21 years ago)

Author:

desonia

Message:

removed psImageIO functions.

Location:

trunk/psLib/src/image

Files:

• Makefile.am (modified) (2 diffs)
• image.i (modified) (1 diff)
• psImage.c (modified) (2 diffs)
• psImage.h (modified) (2 diffs)
• psImageConvolve.c (modified) (2 diffs)
• psImageFFT.c (modified) (2 diffs)
• psImageIO.c (deleted)
• psImageIO.h (deleted)

trunk/psLib/src/image/Makefile.am

@@ -15 +15 @@
         psImagePixelExtract.c \
         psImageStructManip.c \
-        psImageIO.c \
         psImageGeomManip.c \
         psImagePixelManip.c \
@@ -33 +32 @@
         psImagePixelExtract.h \
         psImageStructManip.h \
-        psImageIO.h \
         psImageGeomManip.h \
         psImagePixelManip.h \

trunk/psLib/src/image/image.i

@@ -6 +6 @@
 %include "psImageFFT.h"
 %include "psImage.h"
-%include "psImageIO.h"
 %include "psImageGeomManip.h"
 %include "psImagePixelManip.h"

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-07 02:29:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -352 +352 @@
 
     return numFreed;
+}
+
+bool p_psImagePrint (FILE *f, psImage *a, char *name)
+{
+
+    fprintf (f, "matrix: %s\n", name);
+
+    for (int j = 0; j < a[0].numRows; j++) {
+        for (int i = 0; i < a[0].numCols; i++) {
+            fprintf (f, "%f  ", p_psImageGetElementF64(a, i, j));
+        }
+        fprintf (f, "\n");
+    }
+    fprintf (f, "\n");
+    return (true);
 }
 

trunk/psLib/src/image/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 23:57:37 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-07 02:29:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -176 +176 @@
 );
 
+/** print image pixel values.
+ *
+ *  @return bool    TRUE is successful, otherwise FALSE.
+ */
+bool p_psImagePrint(
+    FILE *f,                           ///< Destination stream
+    psImage *a,                        ///< image to print
+    char *name                         ///< name of the image (for title)
+);
+
 /** Interpolate image pixel value given floating point coordinates.
  *

trunk/psLib/src/image/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-07 02:29:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include "psLogMsg.h"
 #include "psError.h"
-#include "psImageIO.h"
 
 #include "psImageErrors.h"

trunk/psLib/src/image/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-07 02:29:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
-#include "psImageIO.h"
 #include "psImageStructManip.h"