--- a/Meerwald/wm_dugad_d.c	Tue Aug 14 19:59:48 2007 +0200
+++ b/Meerwald/wm_dugad_d.c	Tue Aug 14 21:11:21 2007 +0200
@@ -51,7 +51,7 @@
   int i;
   int n = 0;
   int method = -1;
-  int levels = 0;
+  int level = 0;
   int filter = 0;
   char filter_name[MAXPATHLEN] = "";
 
@@ -104,9 +104,9 @@
         usage();
         break;
       case 'l':      
-        levels = atoi(optarg);
-        if (levels <= 0) {
-          fprintf(stderr, "%s: decomposition level %d out of range\n", levels);
+        level = atoi(optarg);
+        if (level <= 0) {
+          fprintf(stderr, "%s: decomposition level %d out of range\n", level);
           exit(1);
         }
         break;
@@ -170,8 +170,8 @@
     fgets(line, sizeof(line), sig);
     if (strspn(line, "DGSG") >= 4) {
       fscanf(sig, "%d\n", &n);
-      if (levels == 0)
-        fscanf(sig, "%d\n", &levels);
+      if (level == 0)
+        fscanf(sig, "%d\n", &level);
       else
         fscanf(sig, "%*d\n");
       if (alpha == 0.0)
@@ -224,21 +224,21 @@
 
   fclose(in);
 
-  init_dwt(cols, rows, filter_name, filter, levels, method);
+  init_dwt(cols, rows, filter_name, filter, level, method);
 #ifdef POLLEN_STUFF
-#include "pollen_stuff.xxx"
+#include "pollen_stuff.c"
 #endif
 #ifdef PARAM_STUFF
-#include "param_stuff.xxx"
+#include "param_stuff.c"
 #endif
 
   dwts = fdwt(input_image);
 
   fprintf(out, "DGWM\n");
-  fprintf(out, "%d\n", levels);
+  fprintf(out, "%d\n", level);
   fprintf(out, "%f\n", alpha);
 
-  for (i = 0, s = dwts; i < levels; i++, s = s->coarse) {
+  for (i = 0, s = dwts; i < level; i++, s = s->coarse) {
     int m;
     double z, v;