Changeset 25149 for branches/czw_branch/cleanup/ippTools/src/pxchip.c

Timestamp:

Aug 20, 2009, 11:48:09 AM (17 years ago)

Author:

watersc1

Message:

 

File:

• branches/czw_branch/cleanup/ippTools/src/pxchip.c (modified) (1 diff)

branches/czw_branch/cleanup/ippTools/src/pxchip.c

@@ -69 +69 @@
     psMetadataAddF64(md,  PS_LIST_TAIL, "-posang_min",         0, "search by min rotator position angle", NAN);
     psMetadataAddF64(md,  PS_LIST_TAIL, "-posang_max",         0, "search by max rotator position angle", NAN);
+<<<<<<< .mine
+=======
     psMetadataAddF32(md,  PS_LIST_TAIL, "-sun_angle_min",         0, "search by min solar angle", NAN);
     psMetadataAddF32(md,  PS_LIST_TAIL, "-sun_angle_max",         0, "search by max solar angle", NAN);
+    psMetadataAddStr(md,  PS_LIST_TAIL, "-object",             0, "search by exposure object", NULL);
+>>>>>>> .r25099
     psMetadataAddStr(md,  PS_LIST_TAIL, "-object",             0, "search by exposure object", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-comment",            0, "search by comment field (LIKE comparison)", NULL);