Changeset 5064 for trunk/psLib/src/mathtypes

Timestamp:

Sep 16, 2005, 1:56:51 PM (21 years ago)

Author:

drobbin

Message:

Relatively minor changes from new SDRS rev16

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (2 diffs)
• psImage.h (modified) (2 diffs)
• psVector.c (modified) (7 diffs)
• psVector.h (modified) (2 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-15 21:22:22 $
+ *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-16 23:56:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
 // XXX EAM : this needs to be changes to use psRegion rather than psRegion*
 psRegion psRegionForImage(psImage *image,
-                          psRegion *in)
+                          psRegion in)
 {
 
     // x0,y0, x1,y1 are in *parent* units
     //    PS_ASSERT_PTR_NON_NULL(in, NULL);
-    if( in == NULL ) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, "Unallowable operation.  psRegion *in is NULL.");
-        return *in;
-    }
-    /*    if (out == NULL) {
-    //    out = psRegionAlloc(in->x0, in->x1, in->y0, in->y1);
-        *out = psRegionSet(in->x0, in->x1, in->y0, in->y1);
-        } else {
-        *out = *in;
-        }
-    */    // XXX these are probably wrong (see above)
-    if (in->x1 <= 0) {
-        in->x1 = image->col0 + image->numCols + in->x1;
-    }
-    if (in->y1 <= 0) {
-        in->y1 = image->row0 + image->numRows + in->y1;
+    /*
+        if( in == NULL ) {
+            psError(PS_ERR_BAD_PARAMETER_NULL, true, "Unallowable operation.  psRegion in is NULL.");
+            return in;
+        }
+    */    /*    if (out == NULL) {
+        //    out = psRegionAlloc(in->x0, in->x1, in->y0, in->y1);
+            *out = psRegionSet(in->x0, in->x1, in->y0, in->y1);
+            } else {
+            *out = *in;
+            }
+        */    // XXX these are probably wrong (see above)
+    if (in.x1 <= 0) {
+        in.x1 = image->col0 + image->numCols + in.x1;
+    }
+    if (in.y1 <= 0) {
+        in.y1 = image->row0 + image->numRows + in.y1;
     }
 
     // force the lower-limits to be on the child
-    in->x0 = PS_MAX(image->col0, in->x0);
-    in->y0 = PS_MAX(image->row0, in->y0);
+    in.x0 = PS_MAX(image->col0, in.x0);
+    in.y0 = PS_MAX(image->row0, in.y0);
 
     // force the upper-limits to be on the child
-    in->x1 = PS_MIN(image->col0 + image->numCols, in->x1);
-    in->y1 = PS_MIN(image->row0 + image->numRows, in->y1);
-    return (*in);
+    in.x1 = PS_MIN(image->col0 + image->numCols, in.x1);
+    in.y1 = PS_MIN(image->row0 + image->numRows, in.y1);
+    return (in);
 }
 

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-15 21:22:22 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-16 23:56:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -168 +168 @@
 psRegion psRegionForImage(
     psImage *image,                    ///< the image for which the region is to be set
-    psRegion *in                       ///< the image region limits
+    psRegion in                        ///< the image region limits
 );
 

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-02 21:32:06 $
+*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-16 23:56:51 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -616 +616 @@
 
 
-bool psVectorInit(psVector *image,
+bool psVectorInit(psVector *vector,
                   ...)
 {
@@ -636 +636 @@
     int temp2;
 
-    if (image == NULL)
+    if (vector == NULL)
         return (false);
 
-    va_start (argp, image);
-
-    switch (image->type.type) {
+    va_start (argp, vector);
+
+    switch (vector->type.type) {
     case PS_TYPE_U8:
         temp = va_arg (argp, psU32);
@@ -650 +650 @@
             return false;
         }
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.U8[iy] = vU8;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.U8[iy] = vU8;
         }
         return (true);
     case PS_TYPE_F32:
         vF32 = (psF32)va_arg (argp, psF64);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.F32[iy] = vF32;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.F32[iy] = vF32;
         }
         return (true);
     case PS_TYPE_F64:
         vF64 = va_arg (argp, psF64);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.F64[iy] = vF64;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.F64[iy] = vF64;
         }
         return (true);
@@ -674 +674 @@
             return false;
         }
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.U16[iy] = vU16;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.U16[iy] = vU16;
         }
         return (true);
     case PS_TYPE_U32:
         vU32 = va_arg (argp, psU32);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.U32[iy] = vU32;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.U32[iy] = vU32;
         }
         return (true);
     case PS_TYPE_U64:
         vU64 = va_arg (argp, psU64);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.U64[iy] = vU64;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.U64[iy] = vU64;
         }
         return (true);
@@ -698 +698 @@
             return false;
         }
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.S8[iy] = vS8;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.S8[iy] = vS8;
         }
         return (true);
@@ -710 +710 @@
             return false;
         }
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.S16[iy] = vS16;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.S16[iy] = vS16;
         }
         return (true);
     case PS_TYPE_S32:
         vS32 = va_arg (argp, psS32);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.S32[iy] = vS32;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.S32[iy] = vS32;
         }
         return (true);
     case PS_TYPE_S64:
         vS64 = va_arg (argp, psS64);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.S64[iy] = vS64;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.S64[iy] = vS64;
         }
         return (true);
     case PS_TYPE_C32:
         vC32 = va_arg (argp, psC32);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.C32[iy] = vC32;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.C32[iy] = vC32;
         }
         return (true);
     case PS_TYPE_C64:
         vC64 = va_arg (argp, psC64);
-        for (long iy = 0; iy < image->n; iy++) {
-            image->data.C64[iy] = vC64;
+        for (long iy = 0; iy < vector->n; iy++) {
+            vector->data.C64[iy] = vC64;
         }
         return (true);
     default:
-        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", image->type);
+        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", vector->type);
         return (false);
     }

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-15 21:22:22 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-16 23:56:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -204 +204 @@
  */
 bool psVectorInit(
-    psVector *image,                   ///< the vector to be initialized
+    psVector *vector,                  ///< the vector to be initialized
     ...                                ///< Variable argument list for initialization
 );