Changeset 2301 for trunk/psLib/src/collections

Timestamp:

Nov 8, 2004, 2:36:13 PM (22 years ago)

Author:

harman

Message:

Time config files updates

Location:

trunk/psLib/src/collections

Files:

• psMetadata.c (modified) (5 diffs)
• psMetadata.h (modified) (2 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-04 01:04:57 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-09 00:36:13 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 #include "psVector.h"
 #include "psMetadata.h"
+#include "psLookupTable.h"
 #include "psString.h"
 #include "psAstronomyErrors.h"
@@ -80 +81 @@
     psFree(metadataItem->comment);
     psFree(metadataItem->items);
-
-    if (type == PS_META_STR || type == PS_META_VEC || type == PS_META_IMG || type == PS_META_JPEG ||
-            type == PS_META_PNG || type == PS_META_ASTROM || type == PS_META_UNKNOWN) {
+    if (type == PS_META_STR || type == PS_META_VEC || type == PS_META_IMG || type == PS_META_LOOKUPTABLE ||
+            type == PS_META_JPEG || type == PS_META_PNG || type == PS_META_ASTROM || type == PS_META_UNKNOWN) {
         psFree(metadataItem->data.V);
     }
@@ -181 +181 @@
         metadataItem->data.V = vecOut;
         break;
+    case PS_META_LOOKUPTABLE:
+        metadataItem->data.V = va_arg(argPtr, psLookupTable*); // Deep copy of input data not performed
+        break;
     case PS_META_IMG:
     case PS_META_JPEG:
@@ -187 +190 @@
     case PS_META_UNKNOWN:
     default:
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psMetadata_METATYPE_INVALID,
-                type);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, type);
         psFree(metadataItem);
         metadataItem = NULL;

trunk/psLib/src/collections/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 00:57:30 $
+*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-09 00:36:13 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     PS_META_VEC,                       ///< Vector data (Stored in as psPtr ).
     PS_META_IMG,                       ///< Image data (Stored in as psPtr ).
+    PS_META_LOOKUPTABLE,               ///< Lookup table data (Stored as void *).
     PS_META_JPEG,                      ///< JPEG data (Stored in as psPtr ).
     PS_META_PNG,                       ///< PNG data (Stored in as psPtr ).