Changeset 7380 for trunk/psLib/src/types

Timestamp:

Jun 6, 2006, 5:22:07 PM (20 years ago)

Author:

Paul Price

Message:

Merging the pslib "additional" functions from the modules into psLib proper.

Added jpeg directory for psImageJpeg.
Changes to build system (configure.ac, and various Makefile.am)

psVectorSmooth: changed API to allow optional output vector
psSparse: changed sizes to type "long"; added "const"
psRegionIsBad: Renamed psRegionIsNaN
psImageBicubeFit: changed sizes to "long"; added a "const"
psLine: changed sizes to "long"
psImageUnbin: description required in SDRS
psImageClippedStats: renaming to psImageBackground; removing static structures; API changed!
psImageFlipX, psImageFlipY merged to psImageFlip
psStringSubstitute: added "const"

Location:

trunk/psLib/src/types

Files:

• Makefile.am (modified) (2 diffs)
• psMetadata.c (modified) (2 diffs)
• psMetadata.h (modified) (2 diffs)
• psMetadataItemCompare.c (added)
• psMetadataItemCompare.h (added)
• psMetadataItemParse.c (added)
• psMetadataItemParse.h (added)

trunk/psLib/src/types/Makefile.am

@@ -12 +12 @@
         psMetadata.c \
         psMetadataConfig.c \
+        psMetadataItemParse.c \
+        psMetadataItemCompare.c \
         psPixels.c \
         psArguments.c
@@ -26 +28 @@
         psMetadata.h \
         psMetadataConfig.h \
+        psMetadataItemParse.h \
+        psMetadataItemCompare.h \
         psPixels.h \
         psArguments.h

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-06 22:54:22 $
+ *  @version $Revision: 1.108 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-07 03:22:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -445 +445 @@
     return out;
 }
+
+
+// may need to extend this to change the keyname in the copy
+bool psMetadataItemTransfer(psMetadata *out, const psMetadata *in, const char *key)
+{
+
+    psMetadataItem *item = psMetadataLookup(in, key);
+    if (!item) {
+        return false;
+    }
+
+    return psMetadataAddItem(out, item, PS_LIST_TAIL, PS_META_REPLACE);
+}
+
 
 bool psMetadataAddItem(psMetadata *md,

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-06 22:54:22 $
+*  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-07 03:22:06 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -361 +361 @@
 );
 
+// Copy a metadata item from one psMetadata to another
+bool psMetadataItemTransfer(psMetadata *out, // Destination: copy is placed here
+                            const psMetadata *in, // Source: item comes from here
+                            const char *key // key to identify the metadata item
+                           );
+
 /** Add existing metadata item to metadata collection.
  *