Changeset 2807

Timestamp:

Dec 23, 2004, 9:14:15 AM (22 years ago)

Author:

desonia

Message:

adjusted for the addition of the error parameter on psVectorStats.

Location:

trunk/psLib/src

Files:

• image/psImageExtraction.c (modified) (4 diffs)
• image/psImageManip.c (modified) (2 diffs)
• image/psImageStats.c (modified) (3 diffs)
• imageops/psImageStats.c (modified) (3 diffs)

trunk/psLib/src/image/psImageExtraction.c

@@ -9 +9 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:05:00 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 19:14:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -381 +381 @@
                     } \
                 } \
-                myStats = psVectorStats(myStats,imgVec,maskVec,maskVal); \
+                myStats = psVectorStats(myStats,imgVec,NULL,maskVec,maskVal); \
                 (void)p_psGetStatValue(myStats,&statVal); \
                 *outData = statVal; \
@@ -457 +457 @@
                 maskVec->data.V = (psPtr )(mask->data.U8[r] + col0 * sizeof(psMaskType));
             }
-            myStats = psVectorStats(myStats, imgVec, maskVec, maskVal);
+            myStats = psVectorStats(myStats, imgVec, NULL, maskVec, maskVal);
             (void)p_psGetStatValue(myStats, &statVal);  // we know it works cause we tested it above
             *outData = statVal;
@@ -795 +795 @@
 
     for (psS32 r = 0; r < numOut; r++) {
-        myStats = psVectorStats(myStats,buffer[r], bufferMask[r],maskVal);
+        myStats = psVectorStats(myStats,buffer[r], NULL, bufferMask[r],maskVal);
         (void)p_psGetStatValue(myStats,&statVal);
         outData[r] = statVal;

trunk/psLib/src/image/psImageManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-04 01:05:00 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 19:14:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -487 +487 @@
                 } \
                 vec->n = n; \
-                myStats = psVectorStats(myStats,vec,maskVec,maskVal); \
+                myStats = psVectorStats(myStats,vec,NULL,maskVec,maskVal); \
                 p_psGetStatValue(myStats,&statVal); \
                 outRowData[col] = (ps##type)statVal; \

trunk/psLib/src/image/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-20 21:39:42 $
+ *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 19:14:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
     }
 
-    stats = psVectorStats(stats, junkData, junkMask, maskVal);
+    stats = psVectorStats(stats, junkData, NULL, junkMask, maskVal);
 
     psFree(junkMask);
@@ -113 +113 @@
     }
 
-    out = psVectorHistogram(out, junkData, junkMask, maskVal);
+    out = psVectorHistogram(out, junkData, NULL, junkMask, maskVal);
 
     psFree(junkMask);

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-20 21:39:42 $
+ *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 19:14:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
     }
 
-    stats = psVectorStats(stats, junkData, junkMask, maskVal);
+    stats = psVectorStats(stats, junkData, NULL, junkMask, maskVal);
 
     psFree(junkMask);
@@ -113 +113 @@
     }
 
-    out = psVectorHistogram(out, junkData, junkMask, maskVal);
+    out = psVectorHistogram(out, junkData, NULL, junkMask, maskVal);
 
     psFree(junkMask);