Changeset 1073 for trunk/psLib/test/image/tst_psImageIO.c

Timestamp:

Jun 23, 2004, 1:00:17 PM (22 years ago)

Author:

desonia

Message:

Changed the means of deallocation of memory. ps_Alloc now registers an optional free function to handle any additional processing of a memory object.

File:

• trunk/psLib/test/image/tst_psImageIO.c (modified) (6 diffs)

trunk/psLib/test/image/tst_psImageIO.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-11 19:18:41 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-23 23:00:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -107 +107 @@
             return 4; \
         } \
-        psImageFree(img); \
+        psFree(img); \
         img_ref = img = psImageAlloc(2,2,PS_TYPE_F32); \
-        psImageFree(img3); \
+        psFree(img3); \
         img3 = NULL; \
         img = psImageReadSection(img,readM0,readN0,readM,readN,0,NULL,0,filename); \
@@ -139 +139 @@
             } \
         } \
-        psImageFree(img); \
+        psFree(img); \
         img = NULL; \
-        psImageFree(img3); \
+        psFree(img3); \
         img3 = NULL; \
         img3 = psImageReadSection(img3,readM0,readN0,readM,readN,0,NULL,1,filename); \
@@ -167 +167 @@
             } \
         } \
-        psImageFree(img); \
-        psImageFree(img2); \
-        psImageFree(img3); \
-        psImageFree(img4); \
+        psFree(img); \
+        psFree(img2); \
+        psFree(img3); \
+        psFree(img4); \
     }
 
@@ -302 +302 @@
         return 15;
     }
-    psImageFree(img);
-    psImageFree(img2);
+    psFree(img);
+    psFree(img2);
 
     // Did it really overwrite the pixel values?  Let's read it in and see.
@@ -322 +322 @@
     }
 
-    psImageFree(img);
+    psFree(img);
 
     return 0;