Changeset 10270 for trunk/ppMerge/src/ppMergeOptions.c

Timestamp:

Nov 28, 2006, 5:06:41 PM (19 years ago)

Author:

Paul Price

Message:

Adding weights option.

File:

• trunk/ppMerge/src/ppMergeOptions.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeOptions.c

@@ -58 +58 @@
     options->combine->nKeep = 1;
     options->combine->maskVal = 0xff;
+    options->combine->weights = false;
 
     return options;
@@ -67 +68 @@
 
 // Parse a recipe option according to its type
-#define OPTION_PARSE(OPTION,MD,NAME,TYPE)                                                                    \
-{                                                                                                            \
-    psMetadataItem *item = psMetadataLookup(MD, NAME);                                                       \
-    if (item) {                                                                                              \
-        OPTION = psMetadataItemParse##TYPE(item);                                                            \
-    }                                                                                                        \
+#define OPTION_PARSE(OPTION,MD,NAME,TYPE) \
+{ \
+    psMetadataItem *item = psMetadataLookup(MD, NAME); \
+    if (item) { \
+        OPTION = psMetadataItemParse##TYPE(item); \
+    } else { \
+        psWarning("Recipe option %s isn't specified; using default.\n", NAME); \
+    } \
 }
 
@@ -139 +142 @@
     OPTION_PARSE(options->combine->nKeep,    recipe, "NKEEP",          S32);
     OPTION_PARSE(options->combine->maskVal,  recipe, "MASKVAL",        S32);
+    OPTION_PARSE(options->combine->weights,  recipe, "WEIGHTS",        Bool);
     OPTION_PARSE(options->fringeNum,         recipe, "FRINGE.NUM",     S32);
     OPTION_PARSE(options->fringeSize,        recipe, "FRINGE.SIZE",    S32);