Changeset 11699

Timestamp:

Feb 7, 2007, 5:10:33 PM (19 years ago)

Author:

jhoblitt

Message:

change psImageAlloc() & psImageRecycle() into wrappers so file/lineo/func can be recorded in the memBlock
whitespace cleanup

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (5 diffs)
• psImage.h (modified) (12 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-06 21:36:09 $
+ *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 03:10:33 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -59 +59 @@
 }
 
-psImage* psImageAlloc(int numCols,
-                      int numRows,
-                      psElemType type)
+psImage* p_psImageAlloc(const char *file,
+                        unsigned int lineno,
+                        const char *func,
+                        int numCols,
+                        int numRows,
+                        psElemType type)
 {
     int elementSize = PSELEMTYPE_SIZEOF(type);  // element size in bytes
@@ -81 +84 @@
     long numBytes = numRows * numCols * elementSize;
 
-    psImage* image = (psImage* ) psAlloc(sizeof(psImage));
+    psImage* image = (psImage* ) p_psAlloc(file, lineno, func, sizeof(psImage));
 
     psMemSetDeallocator(image, (psFreeFunc) imageFree);
@@ -364 +367 @@
 }
 
-psImage* psImageRecycle(psImage* old,
+psImage* p_psImageRecycle(const char *file,
+                        unsigned int lineno,
+                        const char *func,
+                        psImage* old,
                         int numCols,
                         int numRows,
@@ -373 +379 @@
 
     if (old == NULL) {
-        old = psImageAlloc(numCols, numRows, type);
+        old = p_psImageAlloc(file, lineno, func, numCols, numRows, type);
         return old;
     }

trunk/psLib/src/mathtypes/psImage.h

@@ -7 +7 @@
  * @author Robert DeSonia, MHPCC
  * @author Ross Harman, MHPCC
- *
- * @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-07 02:53:47 $
+ * @author Joshua Hoblitt, University of Hawaii
+ *
+ * @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-08 03:10:33 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -42 +43 @@
     //    PS_INTERPOLATE_NUM_MODES           ///< enum end-marker; does not coorespond to a interpolation mode
 } psImageInterpolateMode;
+
 
 /** Basic image data structure.
@@ -79 +81 @@
 psImage;
 
+
 #define P_PSIMAGE_SET_NUMCOLS(img,nc) {*(int*)&img->numCols = nc;}
 #define P_PSIMAGE_SET_NUMROWS(img,nr) {*(int*)&img->numRows = nr;}
@@ -91 +94 @@
  *
  */
+#ifdef DOXYGEN
 psImage* psImageAlloc(
     int numCols,                       ///< Number of columns in image.
     int numRows,                       ///< Number of rows in image.
     psElemType type                    ///< Type of data for image.
-)
-;
+);
+#else // ifdef DOXYGEN
+psImage* p_psImageAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    int numCols,                       ///< Number of columns in image.
+    int numRows,                       ///< Number of rows in image.
+    psElemType type                    ///< Type of data for image.
+);
+#define psImageAlloc(numCols, numRows, type) \
+      p_psImageAlloc(__FILE__, __LINE__, __func__, numCols, numRows, type)
+#endif // ifdef DOXYGEN
+
 
 /** Checks the type of a particular pointer.
  *
- *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
- *
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr * datatype. 
  *  @return bool:       True if the pointer matches a psImage structure, false otherwise.
  */
@@ -118 +133 @@
     ...                                ///< Variable argument list for initialization
 );
+
 
 /** Sets the value of the image at the specified x,y position to value.
@@ -148 +164 @@
  *  @return psImage* Resized psImage.
  */
+#ifdef DOXYGEN
 psImage* psImageRecycle(
     psImage* old,                      ///< the psImage to recycle by resizing image buffer
@@ -154 +171 @@
     const psElemType type              ///< the desired datatype of the image
 );
+#else // ifdef DOXYGEN
+psImage* psImageRecycle(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psImage* old,                      ///< the psImage to recycle by resizing image buffer
+    int numCols,                       ///< the desired number of columns in image
+    int numRows,                       ///< the desired number of rows in image
+    const psElemType type              ///< the desired datatype of the image
+);
+#define psImageRecycle(old, numCols, numRows, type) \
+      p_psImageRecycle(__FILE__, __LINE__, __func__, old, numCols, numRows, type)
+#endif // ifdef DOXYGEN
+
 
 /** Copy an image to a new buffer
@@ -165 +196 @@
 );
 
+
 /** Frees all children of a psImage.
  *
@@ -172 +204 @@
     psImage* image                     ///< psImage in which all children shall be deallocated
 );
+
 
 /** get an element of an image as a psF64.
@@ -183 +216 @@
 );
 
+
 /** print image pixel values.
  *
@@ -192 +226 @@
     char *name                         ///< name of the image (for title)
 );
+
 
 /** Interpolate image pixel value given floating point coordinates.
@@ -207 +242 @@
     psImageInterpolateMode mode        ///< interpolation mode
 );
+
 
 #define PIXEL_INTERPOLATE_FCN_PROTOTYPE(SUFFIX, RETURNTYPE) \