Changeset 19599 for trunk/ppStack/src/ppStackArguments.c

Timestamp:

Sep 18, 2008, 9:38:38 AM (18 years ago)

Author:

Paul Price

Message:

For the update system, can't change the type of what's on the recipe.

File:

• trunk/ppStack/src/ppStackArguments.c (modified) (2 diffs)

trunk/ppStack/src/ppStackArguments.c

@@ -81 +81 @@
     psMaskType value = pmConfigMaskGet(name, config); \
     psMetadataAddU8(recipe, PS_LIST_TAIL, RECIPENAME, PS_META_REPLACE, NULL, value); \
-}
-
-// Get a statistic name from the command-line or recipe, and add the enum to the arguments
-#define VALUE_ARG_RECIPE_STAT(ARGNAME, RECIPENAME) { \
-    const char *stat = psMetadataLookupStr(NULL, config->arguments, ARGNAME); \
-    if (!stat) { \
-        stat = psMetadataLookupStr(NULL, recipe, RECIPENAME); \
-        if (!stat) { \
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find %s in recipe %s", \
-                    RECIPENAME, PPSTACK_RECIPE); \
-            goto ERROR; \
-        } \
-    } \
-    psMetadataAddS32(recipe, PS_LIST_TAIL, RECIPENAME, PS_META_REPLACE, \
-                     NULL, psStatsOptionFromString(stat)); \
 }
 
@@ -281 +266 @@
     }
     VALUE_ARG_RECIPE_INT("-renorm-width", "RENORM.WIDTH", S32, 0);
-    VALUE_ARG_RECIPE_STAT("-renorm-mean", "RENORM.MEAN");
-    VALUE_ARG_RECIPE_STAT("-renorm-stdev", "RENORM.STDEV");
+    valueArgRecipeStr(arguments, recipe, "-renorm-mean", "RENORM.MEAN", recipe);
+    valueArgRecipeStr(arguments, recipe, "-renorm-stdev", "RENORM.STDEV", recipe);
 
     valueArgRecipeStr(arguments, recipe, "-temp-image",  "TEMP.IMAGE",  recipe);