Changeset 1574

Timestamp:

Aug 18, 2004, 3:41:35 PM (22 years ago)

Author:

Paul Price

Message:

Filling out psScalar.

File:

• trunk/archive/pslib/include/psMath.h (modified) (2 diffs)

trunk/archive/pslib/include/psMath.h

@@ -11 +11 @@
     psType type;                        ///< data type information
     union {                            
-        psS32 S32;                      ///< integer value entry
-        psF32 F32;                      ///< float value entry
-        psF64 F64;                      ///< double value entry
-        psC32 C32;                      ///< complex value entry
+        psS8   S8;                      ///< bye value entry
+        psS16 S16;                      ///< short int value entry
+        psU8   U8;                      ///< unsigned byte value entry
+        psU16 U16;                      ///< unsigned short int value entry
+        psF32 F32;                      ///< float value entry
+        psF64 F64;                      ///< double value entry
+        psC32 C32;                      ///< complex value entry
+        psC64 C64;                      ///< double complex value entry
     } data;
 } p_psScalar;
@@ -22 +26 @@
  *  \{
  */
+
+/** Scalar constructor */
+psScalar *psScalarAlloc(psC64 value,    ///< Value to set
+                        psElemType dataType ///< Data type
+    );
+
+/** Copy a scalar */
+psScalar *psScalarCopy(psScalar *value  ///< Scalar to copy
+    );
 
 /** Perform a binary operation on two data items (psImage, psVector, psScalar). */