Changeset 12545

Timestamp:

Mar 22, 2007, 8:18:20 AM (19 years ago)

Author:

eugene

Message:

CHIP_SELECTIONS is an argument, not a recipe option

Location:

trunk/psphot/src

Files:

• psphotArguments.c (modified) (1 diff)
• psphotParseCamera.c (modified) (1 diff)

trunk/psphot/src/psphotArguments.c

@@ -91 +91 @@
     if ((N = psArgumentGet (argc, argv, "-chip"))) {
         psArgumentRemove (N, &argc, argv);
-        psMetadataAddStr (options, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", argv[N]);
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", argv[N]);
         psArgumentRemove (N, &argc, argv);
     }
-
-    // drop the local view on the options (saved in config->arguments:PSPHOT_RECIPE)
-    psFree (options);
 
     // if these command-line options are supplied, load the file name lists into config->arguments

trunk/psphot/src/psphotParseCamera.c

@@ -114 +114 @@
 
     // Chip selection: turn on only the chips specified (pass status to suppress missing-key log msg)
-    char *chipLine = psMetadataLookupStr(&status, recipe, "CHIP_SELECTIONS");
+    char *chipLine = psMetadataLookupStr(&status, config->arguments, "CHIP_SELECTIONS");
     psArray *chips = psStringSplitArray (chipLine, ",", false);
     if (chips->n > 0) {