Index: /trunk/psLib/src/types/psPixels.c
===================================================================
--- /trunk/psLib/src/types/psPixels.c	(revision 11706)
+++ /trunk/psLib/src/types/psPixels.c	(revision 11707)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 21:29:50 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -58,10 +58,13 @@
 }
 
-psPixels* psPixelsAlloc(long nalloc)
-{
-    psPixels* out = psAlloc(sizeof(psPixels));
+psPixels* p_psPixelsAlloc(const char *file,
+                          unsigned int lineno,
+                          const char *func,
+                          long nalloc)
+{
+    psPixels* out = p_psAlloc(file, lineno, func, sizeof(psPixels));
 
     if (nalloc > 0) {
-        out->data = psAlloc(sizeof(psPixelCoord)*nalloc);
+        out->data = p_psAlloc(file, lineno, func, sizeof(psPixelCoord)*nalloc);
     } else {
         out->data = NULL;
@@ -83,13 +86,16 @@
 
 
-psPixels* psPixelsRealloc(psPixels* pixels,
-                          long nalloc)
-{
-    if (pixels == NULL) {
-        return psPixelsAlloc(nalloc);
+psPixels* p_psPixelsRealloc(const char *file,
+                            unsigned int lineno,
+                            const char *func,
+                            psPixels* pixels,
+                            long nalloc)
+{
+    if (pixels == NULL) {
+        return p_psPixelsAlloc(file, lineno, func, nalloc);
     }
 
     if (nalloc > 0) {
-        pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*nalloc);
+        pixels->data = p_psRealloc(file, lineno, func, pixels->data, sizeof(psPixelCoord)*nalloc);
     } else {
         psFree(pixels->data);
@@ -129,6 +135,9 @@
 }
 
-psPixels* psPixelsCopy(psPixels* out,
-                       const psPixels* pixels)
+psPixels* p_psPixelsCopy(const char *file,
+                         unsigned int lineno,
+                         const char *func,
+                         psPixels* out,
+                         const psPixels* pixels)
 {
     if (pixels == NULL) {
@@ -138,5 +147,5 @@
     }
 
-    out = psPixelsRealloc(out, pixels->n);
+    out = p_psPixelsRealloc(file, lineno, func, out, pixels->n);
 
     memcpy(out->data,pixels->data, pixels->n*sizeof(psPixelCoord));
Index: /trunk/psLib/src/types/psPixels.h
===================================================================
--- /trunk/psLib/src/types/psPixels.h	(revision 11706)
+++ /trunk/psLib/src/types/psPixels.h	(revision 11707)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 21:29:50 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52,16 +52,28 @@
 
 
-        /** Allocates a new psPixels structure
-         *
-         *  @return psPixels*   new psPixels
-         */
-        psPixels* psPixelsAlloc(
-            long nalloc                       ///< the size of the coordinate vectors
-        )
-        ;
+/** Allocates a new psPixels structure
+ *
+ *  @return psPixels*   new psPixels
+ */
+#ifdef DOXYGEN
+psPixels* psPixelsAlloc(
+    long nalloc                         ///< the size of the coordinate vectors
+);
+#else // ifdef DOXYGEN
+psPixels* p_psPixelsAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    long nalloc                         ///< the size of the coordinate vectors
+);
+#define psPixelsAlloc(nalloc) \
+      p_psPixelsAlloc(__FILE__, __LINE__, __func__, nalloc)
+#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 psPixels structure, false otherwise.
@@ -76,8 +88,21 @@
  *  @return psPixels*   resized psPixels
  */
+#ifdef DOXYGEN
 psPixels* psPixelsRealloc(
     psPixels* pixels,                  ///< psPixels to resize, or NULL to create new psPixels
     long nalloc                        ///< the size of the coordinate vectors
 );
+#else // ifdef DOXYGEN
+psPixels* p_psPixelsRealloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psPixels* pixels,                  ///< psPixels to resize, or NULL to create new psPixels
+    long nalloc                        ///< the size of the coordinate vectors
+);
+#define psPixelsRealloc(pixels, nalloc) \
+      p_psPixelsRealloc(__FILE__, __LINE__, __func__, pixels, nalloc)
+#endif // ifdef DOXYGEN
+
 
 /** Add a pixel location to a psPixels
@@ -95,4 +120,5 @@
 );
 
+
 /** Copies a psPixels object
  *
@@ -102,8 +128,21 @@
  *  @return psPixels*   a new psPixels that is a duplicate to IN
  */
+#ifdef DOXYGEN
 psPixels* psPixelsCopy(
     psPixels* out,                     ///< psPixels struct to recycle, or NULL
     const psPixels* pixels             ///< psPixels struct to copy
 );
+#else // ifdef DOXYGEN
+psPixels* p_psPixelsCopy(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psPixels* out,                     ///< psPixels struct to recycle, or NULL
+    const psPixels* pixels             ///< psPixels struct to copy
+);
+#define psPixelsCopy(out, pixels) \
+      p_psPixelsCopy(__FILE__, __LINE__, __func__, out, pixels)
+#endif // ifdef DOXYGEN
+
 
 /** Generate a psImage from a psPixels
@@ -126,4 +165,5 @@
 );
 
+
 /** Generate a psPixels from a mask psImage
  *
@@ -140,4 +180,5 @@
     psMaskType maskVal                 ///< the mask bit-values to act upon
 );
+
 
 /** Concatenates two psPixels
@@ -155,4 +196,5 @@
     const psPixels *pixels             ///< psPixels to append to OUT
 );
+
 
 /** Prints a psPixels to specified destination.
@@ -166,4 +208,5 @@
 );
 
+
 /** Sets the value of the the pixels array at the specified position to value.
  *
@@ -178,4 +221,5 @@
 );
 
+
 /** Returns the value of the pixels array at the specified position.
  *
@@ -189,4 +233,5 @@
 );
 
+
 /** Get the number of elements in use from a specified psPixels. (pixels.n)
  *
@@ -197,4 +242,5 @@
 );
 
+
 /// @}
 #endif // #ifndef PS_PIXELS_H