--- a/Meerwald/wm_dugad_e.c	Tue Aug 14 19:59:48 2007 +0200
+++ b/Meerwald/wm_dugad_e.c	Tue Aug 14 21:11:21 2007 +0200
@@ -47,7 +47,7 @@
   double alpha = 0.0;
   double t1 = 0.0;
 
-  int levels = 0;
+  int level = 0;
   int filter = 0;
   int method = -1;
   char filter_name[MAXPATHLEN] = "";
@@ -97,9 +97,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;
@@ -155,8 +155,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)
@@ -206,12 +206,12 @@
   fclose(in);
 
   // wavelet transform
-  init_dwt(cols, rows, filter_name, filter, 3, 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(image);