Changeset 4425 for trunk/psModules/src/pmImageCombine.c

Timestamp:

Jun 28, 2005, 3:39:10 PM (21 years ago)

Author:

gusciora

Message:

psTrace message modifications.

File:

• trunk/psModules/src/pmImageCombine.c (modified) (11 diffs)

trunk/psModules/src/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-16 23:11:41 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-29 01:39:10 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -47 +47 @@
                         )
 {
+
     PS_ASSERT_PTR_NON_NULL(images, combine);
     psU32 numImages = images->n;
+    psTrace("ImageCombine.pmCombineImages", 3, "Calling pmCombineImages(%d)\n", images->n);
 
     if (errors != NULL) {
@@ -299 +301 @@
     psFree(qpPtr);
 
+    psTrace("ImageCombine.pmCombineImages", 3, "Exiting pmCombineImages(%d)\n", images->n);
     return(combine);
 }
@@ -311 +314 @@
                           psS32 y)
 {
+    psTrace("ImageCombine.CalcGradient", 4, "Calling CalcGradient(%d, %d)\n", x, y);
     int num = 0;
     psVector *pixels = psVectorAlloc(8, PS_TYPE_F32); // Array of pixels
@@ -339 +343 @@
     psFree(pixels);
     psFree(mask);
-    return median / image->data.F32[y][x];
+
+    psTrace("ImageCombine.CalcGradient", 4, "Exiting CalcGradient(%d, %d)\n", x, y);
+    return(median / image->data.F32[y][x]);
 }
 
@@ -355 +361 @@
                                 psPlaneTransform *myOutToIn)
 {
+    psTrace("ImageCombine.DetermineRegion", 4, "Calling DetermineRegion()\n");
     psRegion myRegion;
     myRegion.x0 = PS_MAX_F32;
@@ -429 +436 @@
     }
 
+    psTrace("ImageCombine.DetermineRegion", 4, "Exiting DetermineRegion()\n");
     return(myRegion);
 }
@@ -437 +445 @@
 static psImage *ImageConvertF32(psImage *image)
 {
+    psTrace("ImageCombine.ImageConvertF32", 4, "Calling ImageConvertF32()\n");
     psImage *imgF32 = psImageAlloc(image->numCols, image->numRows, PS_TYPE_F32);
 
@@ -445 +454 @@
     }
 
+    psTrace("ImageCombine.ImageConvertF32", 4, "Exiting ImageConvertF32()\n");
     return(imgF32);
 }
@@ -472 +482 @@
                        )
 {
+    psTrace("ImageCombine.pmRejectPixels", 3, "Calling pmRejectPixels()\n");
     PS_ASSERT_PTR_NON_NULL(images, NULL);
     PS_ASSERT_PTR_NON_NULL(errors, NULL);
@@ -609 +620 @@
     psFree(inCoords);
     psFree(outCoords);
+    psTrace("ImageCombine.pmRejectPixels", 3, "Exiting pmRejectPixels()\n");
     return(rejects);
 }