Changeset 4977 for trunk/psphot/src/psLibUtils.c

Timestamp:

Sep 7, 2005, 6:32:40 PM (21 years ago)

Author:

eugene

Message:

cleanup, organization

File:

• trunk/psphot/src/psLibUtils.c (modified) (2 diffs)

trunk/psphot/src/psLibUtils.c

@@ -1 +1 @@
 # include <strings.h>  // for strncasecmp
 # include <pslib.h>
+# include "psLibUtils.h"
 
 // XXX EAM : this is NOT included in the C99 headers ??
@@ -157 +158 @@
     memcpy (tmpVector->data.F32, image->data.F32[row], image->numCols*sizeof(psF32));
     return(tmpVector);
-}
-
-// extract config informatin from config data or from image header, if specified
-psF32 pmConfigLookupF32 (bool *status, psMetadata *config, psMetadata *header, char *name) {
-
-    char *source;
-    char *keyword;
-    psF32 value;
-    psMetadataItem *item;
-
-    // look for the entry in the config collection
-    item = psMetadataLookup (config, name);
-    if (item == NULL) {
-        psLogMsg ("pmConfigLookupF32", 2, "no key %s in config data, trying as header keyword", name);
-        value = psMetadataLookupF32 (status, header, name);
-        if (*status == false) {
-            psAbort ("pmConfigLookupF32", "no key %s in header", name);
-        }
-        *status = true;
-        return (value);
-    }   
-
-    // I'm either expecting a string, with the name "HD:keyword"...
-    if (item->type == PS_META_STR) {
-        source = item->data.V;
-        if (!strncasecmp (source, "HD:", 3)) {
-            keyword = &source[3]; 
-            value = psMetadataLookupF32 (status, header, keyword);
-            if (*status == false) {
-                psAbort ("pmConfigLookupF32", "no key %s in config", name);
-            }
-            *status = true;
-            // psFree (item);
-            return (value);
-        }       
-    }
-
-    //  ... or a value (F32?)
-    if (item->type == PS_META_F32) {
-        value = item->data.F32;
-        // psFree (item);
-        return (value);
-    }
-
-    *status = false;
-    psError(PS_ERR_UNKNOWN, true, "invalid item");
-    return (0);
 }