Changeset 727

Timestamp:

May 18, 2004, 3:20:02 PM (22 years ago)

Author:

desonia

Message:

removed psImageFreePixels.

Location:

trunk/psLib/src

Files:

• image/psImage.c (modified) (3 diffs)
• image/psImage.h (modified) (2 diffs)
• mathtypes/psImage.c (modified) (3 diffs)
• mathtypes/psImage.h (modified) (2 diffs)

trunk/psLib/src/image/psImage.c

@@ -7 +7 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-18 23:26:26 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-19 01:20:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
 void psImageFree(psImage *image)
 {
+    if (image == NULL) {
+        return;
+    }
+
     psImageFreeChildren(image);
-    psImageFreePixels(image);
+
+    psFree(image->data.v[0]);
+    psFree(image->data.v);
+    image->data.v = NULL;
+
     psFree(image);
 }
@@ -166 +174 @@
 
     return (out);
-}
-
-void psImageFreePixels(psImage *restrict image)
-{
-    if (image == NULL || image->data.v == NULL) {
-        return;
-    }
-
-    psFree(image->data.v[0]);
-    psFree(image->data.v);
-    image->data.v = NULL;
-
-    // xxx - is this proper?
-    *(unsigned int*)&image->numRows = 0;
-    *(unsigned int*)&image->numCols = 0;
 }
 

trunk/psLib/src/image/psImage.h

@@ -7 +7 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-18 23:26:26 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-19 01:20:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -107 +107 @@
 );
 
-/** Deallocate the image buffer of a psImage.
- *
- *  deallocates the image buffer while preserving the psImage struct and any children.
- *
- */
-void psImageFreePixels(
-    psImage* restrict image             ///< psImage to free pixel memory from
-);
-
 /** Frees all children of a psImage.
  *

trunk/psLib/src/mathtypes/psImage.c

@@ -7 +7 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-18 23:26:26 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-19 01:20:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
 void psImageFree(psImage *image)
 {
+    if (image == NULL) {
+        return;
+    }
+
     psImageFreeChildren(image);
-    psImageFreePixels(image);
+
+    psFree(image->data.v[0]);
+    psFree(image->data.v);
+    image->data.v = NULL;
+
     psFree(image);
 }
@@ -166 +174 @@
 
     return (out);
-}
-
-void psImageFreePixels(psImage *restrict image)
-{
-    if (image == NULL || image->data.v == NULL) {
-        return;
-    }
-
-    psFree(image->data.v[0]);
-    psFree(image->data.v);
-    image->data.v = NULL;
-
-    // xxx - is this proper?
-    *(unsigned int*)&image->numRows = 0;
-    *(unsigned int*)&image->numCols = 0;
 }
 

trunk/psLib/src/mathtypes/psImage.h

@@ -7 +7 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-18 23:26:26 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-19 01:20:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -107 +107 @@
 );
 
-/** Deallocate the image buffer of a psImage.
- *
- *  deallocates the image buffer while preserving the psImage struct and any children.
- *
- */
-void psImageFreePixels(
-    psImage* restrict image             ///< psImage to free pixel memory from
-);
-
 /** Frees all children of a psImage.
  *