Changeset 6892

Timestamp:

Apr 18, 2006, 12:42:58 PM (20 years ago)

Author:

Paul Price

Message:

Cleaning up

File:

• trunk/psModules/src/pslib/psMetadataItemParse.c (modified) (4 diffs)

trunk/psModules/src/pslib/psMetadataItemParse.c

@@ -10 +10 @@
 {
     switch (item->type) {
-        PS_METADATA_ITEM_PARSE_NUMBER (F32, F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (F64, F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (S8,  F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (S16, F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (S32, F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (U8,  F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (U16, F32);
-        PS_METADATA_ITEM_PARSE_NUMBER (U32, F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(F32, F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(F64, F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(S8,  F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(S16, F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(S32, F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(U8,  F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(U16, F32);
+        PS_METADATA_ITEM_PARSE_NUMBER(U32, F32);
     default:
         psError(PS_ERR_IO, true, "Item %s (%s) is not of floating point type (%x) --- treating as NaN.\n",
@@ -29 +29 @@
 {
     switch (item->type) {
-        PS_METADATA_ITEM_PARSE_NUMBER (F32, F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (F64, F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (S8,  F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (S16, F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (S32, F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (U8,  F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (U16, F64);
-        PS_METADATA_ITEM_PARSE_NUMBER (U32, F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(F32, F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(F64, F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(S8,  F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(S16, F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(S32, F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(U8,  F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(U16, F64);
+        PS_METADATA_ITEM_PARSE_NUMBER(U32, F64);
     default:
         psError(PS_ERR_IO, true, "Item %s (%s) is not of double-precision floating point type (%x) "
@@ -48 +48 @@
 {
     switch (item->type) {
-    case PS_TYPE_S32:
-        return item->data.S32;
-    case PS_TYPE_F32:
-        psLogMsg(__func__, PS_LOG_WARN, "Item %s (%s) should be S32, but is F32 --- converting.\n",
-                 item->name, item->comment);
-        return (int)item->data.F32;
-    case PS_TYPE_F64:
-        psLogMsg(__func__, PS_LOG_WARN, "Item %s (%s) should be S32, but is F64 --- converting.\n",
-                 item->name, item->comment);
-        return (int)item->data.F64;
+        PS_METADATA_ITEM_PARSE_NUMBER(F32, S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(F64, S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(S8,  S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(S16, S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(S32, S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(U8,  S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(U16, S32);
+        PS_METADATA_ITEM_PARSE_NUMBER(U32, S32);
     default:
         psError(PS_ERR_IO, true, "Item %s (%s) is not of integer type (%x) --- treating as zero.\n",
@@ -94 +92 @@
 }
 
-
-# if 0
-case PS_DATA_F32:
-{
-psString value = NULL;    // String to return
-psStringAppend(&value, "%f", item->data.F32);
-    return value;
-}
-case PS_DATA_S32:
-{
-    psString value = NULL;    // String to return
-    psStringAppend(&value, "%d", item->data.S32);
-    return value;
-}
-# endif