Changeset 7769 for trunk/psModules/src/imcombine/pmImageCombine.c

Timestamp:

Jun 30, 2006, 1:59:49 PM (20 years ago)

Author:

magnier

Message:

replaced PS_IMAGE_SET and PS_VECTOR_SET with psImageInit, psVectorInit

File:

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

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-04 01:01:33 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-30 23:59:49 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -103 +103 @@
         combine = psImageAlloc(numCols, numRows, PS_TYPE_F32);
         if (pixels != NULL) {
-            PS_IMAGE_SET_F32(combine, 0.0);
+            psImageInit(combine, 0.0);
         }
     }
@@ -127 +127 @@
     //
     psVector *qpPtr = psVectorAlloc(numImages, PS_TYPE_S32);
-    PS_VECTOR_SET_S32(qpPtr, 0);
+    psVectorInit(qpPtr, 0);
     qpPtr->n = numImages;
     //
@@ -139 +139 @@
     if (masks != NULL) {
         pixelMask = psVectorAlloc(numImages, PS_TYPE_U8);
-        PS_VECTOR_SET_U8(pixelMask, 0);
+        psVectorInit(pixelMask, 0);
         pixelMask->n = numImages;
     }
@@ -146 +146 @@
     if (errors != NULL) {
         pixelErrors = psVectorAlloc(numImages, PS_TYPE_F32);
-        PS_VECTOR_SET_F32(pixelErrors, 1.0);
+        psVectorInit(pixelErrors, 1.0);
         pixelErrors->n = numImages;
     }
@@ -157 +157 @@
         for (psS32 p = 0 ; p < pixels->n ; p++) {
             // Must initialize the mask to 0 for every pixel.
-            PS_VECTOR_SET_U8(pixelMask, 0);
+            psVectorInit(pixelMask, 0);
             psS32 col = (pixels->data[p]).x;
             psS32 row = (pixels->data[p]).y;
@@ -553 +553 @@
     //
     psVector *rPtr = psVectorAlloc(numImages, PS_TYPE_S32);
-    PS_VECTOR_SET_S32(rPtr, 0);
+    psVectorInit(rPtr, 0);
     rPtr->n = numImages;