Changeset 2697

Timestamp:

Dec 10, 2004, 2:16:38 PM (22 years ago)

Author:

harman

Message:

Added support for psF32 types

Location:

trunk/psLib/src

Files:

• dataManip/psMatrix.c (modified) (3 diffs)
• math/psMatrix.c (modified) (3 diffs)

trunk/psLib/src/dataManip/psMatrix.c

@@ -20 +20 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-09 20:51:16 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-11 00:16:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -102 +102 @@
     for(i=0; i<n; i++) {
         if(inVector->type.type == PS_TYPE_F32) {
-            outGslVector->data[i] = (psS32)inVector->data.F32[i];
+            outGslVector->data[i] = (psF64)inVector->data.F32[i];
         } else {
             outGslVector->data[i] = inVector->data.F64[i];
@@ -140 +140 @@
         for(j=0; j<numCols; j++) {
             if(inImage->type.type == PS_TYPE_F32) {
-                outGslMatrix->data[i*numCols+j] = (psS32)inImage->data.F32[i][j];
+                outGslMatrix->data[i*numCols+j] = (psF64)inImage->data.F32[i][j];
             } else {
                 outGslMatrix->data[i*numCols+j] = inImage->data.F64[i][j];

trunk/psLib/src/math/psMatrix.c

@@ -20 +20 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-09 20:51:16 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-11 00:16:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -102 +102 @@
     for(i=0; i<n; i++) {
         if(inVector->type.type == PS_TYPE_F32) {
-            outGslVector->data[i] = (psS32)inVector->data.F32[i];
+            outGslVector->data[i] = (psF64)inVector->data.F32[i];
         } else {
             outGslVector->data[i] = inVector->data.F64[i];
@@ -140 +140 @@
         for(j=0; j<numCols; j++) {
             if(inImage->type.type == PS_TYPE_F32) {
-                outGslMatrix->data[i*numCols+j] = (psS32)inImage->data.F32[i][j];
+                outGslMatrix->data[i*numCols+j] = (psF64)inImage->data.F32[i][j];
             } else {
                 outGslMatrix->data[i*numCols+j] = inImage->data.F64[i][j];