Changeset 1440 for trunk/psLib/src/image/psImageExtraction.c

Timestamp:

Aug 9, 2004, 1:34:58 PM (22 years ago)

Author:

desonia

Message:

cleanup of some indent-induced madness.

File:

• trunk/psLib/src/image/psImageExtraction.c (modified) (8 diffs)

trunk/psLib/src/image/psImageExtraction.c

@@ -10 +10 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-07 00:06:06 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:34:58 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include "psError.h"
 
-psImage *psImageSubset(psImage * out,
-                       psImage * image,
+psImage* psImageSubset(psImage* out,
+                       psImage* image,
                        unsigned int numCols, unsigned int numRows, unsigned int col0, unsigned int row0)
 {
@@ -83 +83 @@
     *(int *)&out->row0 = row0;
     *(int *)&out->col0 = col0;
-    *(psImage **) & out->parent = (psImage *) image;
+    *(psImage* *) & out->parent = (psImage* ) image;
 
     // add output image as a child of the input
     // image.
     image->nChildren++;
-    image->children = (psImage **) psRealloc(image->children, image->nChildren * sizeof(psImage *));
+    image->children = (psImage* *) psRealloc(image->children, image->nChildren * sizeof(psImage* ));
     image->children[image->nChildren - 1] = out;
 
@@ -101 +101 @@
 }
 
-psImage *psImageCopy(psImage * restrict output, const psImage * input, psElemType type)
+psImage* psImageCopy(psImage* restrict output, const psImage* input, psElemType type)
 {
     psElemType inDatatype;
@@ -242 +242 @@
 }
 
-psVector *psImageSlice(psVector * out,
-                       psVector * slicePositions,
-                       const psImage * restrict in,
-                       const psImage * restrict mask,
+psVector* psImageSlice(psVector* out,
+                       psVector* slicePositions,
+                       const psImage* restrict in,
+                       const psImage* restrict mask,
                        unsigned int maskVal,
                        unsigned int col,
                        unsigned int row,
                        unsigned int numCols,
-                       unsigned int numRows, psImageCutDirection direction, const psStats * stats)
+                       unsigned int numRows, psImageCutDirection direction, const psStats* stats)
 {
     double statVal;
-    psStats *myStats;
+    psStats* myStats;
     psElemType type;
     int inRows;
     int inCols;
     int delta = 1;
-    psF64 *outData;
+    psF64* outData;
 
     if (in == NULL || in->data.V == NULL) {
@@ -328 +328 @@
 
     if (direction == PS_CUT_X_POS || direction == PS_CUT_X_NEG) {
-        psVector *imgVec = psVectorAlloc(numRows, type);
-        psVector *maskVec = NULL;
-        psMaskType *maskData = NULL;
-        psU32 *outPosition = NULL;
+        psVector* imgVec = psVectorAlloc(numRows, type);
+        psVector* maskVec = NULL;
+        psMaskType* maskData = NULL;
+        psU32* outPosition = NULL;
 
         // recycle output to make a proper
@@ -362 +362 @@
                 if (maskVec != NULL) { \
                     maskVecData = maskVec->data.V; \
-                    maskData = (psMaskType*)(mask->data.V[row]) + col + c; \
+                    maskData = (psMaskType* )(mask->data.V[row]) + col + c; \
                 } \
                 for (int r=0;r<numRows;r++) { \
@@ -417 +417 @@
         // Y
         // direction
-        psVector *imgVec = NULL;
-        psVector *maskVec = NULL;
+        psVector* imgVec = NULL;
+        psVector* maskVec = NULL;
         int elementSize = PSELEMTYPE_SIZEOF(type);
-        psU32 *outPosition = NULL;
+        psU32* outPosition = NULL;
 
         // fill in psVectors to fake out the