Changeset 15492

Timestamp:

Nov 7, 2007, 3:09:49 PM (19 years ago)

Author:

Paul Price

Message:

Adding memory instrumentation for psImageCopy.

Location:

trunk/psLib/src/imageops

Files:

• psImageStructManip.c (modified) (3 diffs)
• psImageStructManip.h (modified) (3 diffs)

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-05 23:56:33 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-08 01:09:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -161 +161 @@
     psRegion region = {0, 0, 0, 0};
     region = psRegionForImage (input, region);
-    psImage *result = imageSubset (__FILE__, __LINE__, __func__, output, input,
-                                   region.x0, region.y0, region.x1, region.y1);
+    psImage *result = imageSubset(__FILE__, __LINE__, __func__, output, input,
+                                  region.x0, region.y0, region.x1, region.y1);
     return result;
 }
 
-psImage* psImageCopy(psImage* output,
-                     const psImage* input,
-                     psElemType type)
+psImage* p_psImageCopy(const char *file, unsigned int lineno, const char *func,
+                       psImage* output, const psImage* input, psElemType type)
 {
     psElemType inDatatype;
@@ -203 +202 @@
     elementSize = PSELEMTYPE_SIZEOF(inDatatype);
 
-    output = psImageRecycle(output, numCols, numRows, type);
+    output = p_psImageRecycle(file, lineno, func, output, numCols, numRows, type);
     P_PSIMAGE_SET_COL0(output, input->col0);
     P_PSIMAGE_SET_ROW0(output, input->row0);

trunk/psLib/src/imageops/psImageStructManip.h

@@ -5 +5 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-11-05 23:56:33 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-11-08 01:09:49 $
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
 */
@@ -64 +64 @@
  *
  */
+#ifdef DOXYGEN
 psImage* psImageCopy(
     psImage* output,                   ///< if not NULL, a psImage that could be recycled.
@@ -69 +70 @@
     psElemType type                    ///< the desired datatype of the returned copy
 );
+#else // ifdef DOXYGEN
+psImage* p_psImageCopy(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psImage* output,                   ///< if not NULL, a psImage that could be recycled.
+    const psImage* input,              ///< the psImage to copy
+    psElemType type                    ///< the desired datatype of the returned copy
+) PS_ATTR_MALLOC;
+#define psImageCopy(output, input, type) \
+      p_psImageSubset(__FILE__, __LINE__, __func__, output, input, type)
+#endif // ifdef DOXYGEN
 
 /** Trim an image