changeset 16:4987db85cfae

fix another scanf() warning
author Peter Meerwald <pmeerw@cosy.sbg.ac.at>
date Mon, 30 Jun 2008 21:03:40 +0200
parents ad1d224896c5
children 824d192e5614
files Meerwald/cmp_corvi_sig.c Meerwald/cmp_frid2_sig.c Meerwald/gen_bruyn_sig.c Meerwald/gen_cox_sig.c Meerwald/gen_dugad_sig.c Meerwald/gen_kim_sig.c Meerwald/gen_koch_sig.c Meerwald/gen_wang_sig.c Meerwald/gen_xia_sig.c Meerwald/gen_xie2_sig.c Meerwald/gen_xie_sig.c Meerwald/gen_zhu_sig.c Meerwald/wm_bruyn_d.c Meerwald/wm_bruyn_e.c Meerwald/wm_corvi_d.c Meerwald/wm_corvi_e.c Meerwald/wm_corvi_s.c Meerwald/wm_cox_d.c Meerwald/wm_cox_e.c Meerwald/wm_dugad_d.c Meerwald/wm_dugad_e.c Meerwald/wm_frid2_d.c Meerwald/wm_frid2_e.c Meerwald/wm_kim_a.c Meerwald/wm_kim_d.c Meerwald/wm_kim_e.c Meerwald/wm_koch_d.c Meerwald/wm_koch_e.c Meerwald/wm_kund_e.c Meerwald/wm_wang_d.c Meerwald/wm_wang_e.c Meerwald/wm_xia_d.c Meerwald/wm_xia_e.c Meerwald/wm_xie2_d.c Meerwald/wm_xie2_e.c Meerwald/wm_xie_d.c Meerwald/wm_xie_e.c Meerwald/wm_zhu_d.c Meerwald/wm_zhu_e.c
diffstat 39 files changed, 68 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/Meerwald/cmp_corvi_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/cmp_corvi_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -115,7 +115,7 @@
     exit(1);
   }
 
-  fscanf(sig, "%*lf\n");
+  fscanf(sig, "%*f\n");
   fscanf(sig, "%*d\n");
   fscanf(sig, "%*d\n");
   fscanf(sig, "%*[^\n\r]\n");
--- a/Meerwald/cmp_frid2_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/cmp_frid2_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -88,8 +88,8 @@
     fgets(line, sizeof(line), sig);
     if (strspn(line, "FR2SG") >= 5) {
       fscanf(sig, "%d\n", &nbit_signature);
-      fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
+      fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
       fscanf(sig, "%*d\n");
       n_signature = NBITSTOBYTES(nbit_signature);
       fread(signature, sizeof(char), n_signature, sig);
--- a/Meerwald/gen_bruyn_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_bruyn_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -169,15 +169,15 @@
       if (q == 0.0)
         fscanf(sig, "%lf\n", &q);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (t1 == 0.0)
         fscanf(sig, "%lf\n", &t1);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (t2 == 0.0)
         fscanf(sig, "%lf\n", &t2);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (b == 0)
         fscanf(sig, "%d\n", &b);
       else
--- a/Meerwald/gen_cox_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_cox_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -100,15 +100,15 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (m == 0.0)
         fscanf(sig, "%lf\n", &m);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (d == 0.0)
         fscanf(sig, "%lf\n", &d);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
     }
     else {
       fprintf(stderr, "%s: invalid signature file %s\n", progname, signature_name);
--- a/Meerwald/gen_dugad_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_dugad_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -154,15 +154,15 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (t1 == 0.0)
         fscanf(sig, "%lf\n", &t1);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (t2 == 0.0)
         fscanf(sig, "%lf\n", &t2);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (e < 0)
         fscanf(sig, "%d\n", &e);
       else
--- a/Meerwald/gen_kim_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_kim_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -140,11 +140,11 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (A == 0.0)
         fscanf(sig, "%lf\n", &A);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (l == 0)
         fscanf(sig, "%d\n", &l);
       else
--- a/Meerwald/gen_koch_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_koch_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -114,7 +114,7 @@
       if (l == 0.0)
         fscanf(sig, "%lf\n", &l);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (q == 0)
         fscanf(sig, "%d\n", &q);
       else
--- a/Meerwald/gen_wang_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_wang_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -131,11 +131,11 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (b == 0.0)
         fscanf(sig, "%lf\n", &b);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (e < 0)
         fscanf(sig, "%d\n", &e);
       else
--- a/Meerwald/gen_xia_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_xia_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -131,7 +131,7 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (l == 0)
         fscanf(sig, "%d\n", &l);
       else
--- a/Meerwald/gen_xie2_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_xie2_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -145,7 +145,7 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (e < 0)
         fscanf(sig, "%d\n", &e);
       else
--- a/Meerwald/gen_xie_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_xie_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -140,7 +140,7 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (e < 0)
         fscanf(sig, "%d\n", &e);
       else
--- a/Meerwald/gen_zhu_sig.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/gen_zhu_sig.c	Mon Jun 30 21:03:40 2008 +0200
@@ -131,7 +131,7 @@
       if (a == 0.0)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (l == 0)
         fscanf(sig, "%d\n", &l);
       else
--- a/Meerwald/wm_bruyn_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_bruyn_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -181,15 +181,15 @@
       if (quality == 0.0)
         fscanf(sig, "%lf\n", &quality);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (threshold_noise == 0.0)
         fscanf(sig, "%lf\n", &threshold_noise);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (threshold_slope == 0.0)
         fscanf(sig, "%lf\n", &threshold_slope);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (blocksize == 0)
         fscanf(sig, "%d\n", &blocksize);
       else
--- a/Meerwald/wm_bruyn_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_bruyn_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -181,15 +181,15 @@
       if (quality == 0.0)
         fscanf(sig, "%lf\n", &quality);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (threshold_noise == 0.0)
         fscanf(sig, "%lf\n", &threshold_noise);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (threshold_slope == 0.0)
         fscanf(sig, "%lf\n", &threshold_slope);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (blocksize == 0)
         fscanf(sig, "%d\n", &blocksize);
       else
--- a/Meerwald/wm_corvi_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_corvi_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -156,7 +156,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_corvi_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_corvi_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -130,7 +130,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_corvi_s.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_corvi_s.c	Mon Jun 30 21:03:40 2008 +0200
@@ -159,7 +159,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (quantization == 0)
         fscanf(sig, "%d\n", &quantization);
       else
--- a/Meerwald/wm_cox_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_cox_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -143,9 +143,9 @@
       if (warn_a)
         fscanf(sig, "%lf\n", &a);
       else
-        fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
     }
     else {
       fprintf(stderr, "%s: invalid signature file %s\n", progname, signature_name);
--- a/Meerwald/wm_cox_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_cox_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -100,9 +100,9 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
     }
     else {
       fprintf(stderr, "%s: invalid signature file %s\n", progname, signature_name);
--- a/Meerwald/wm_dugad_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_dugad_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -178,12 +178,12 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
       if (t2 == 0.0)
         fscanf(sig, "%lf\n", &t2);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_dugad_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_dugad_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -163,12 +163,12 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (t1 == 0.0)
         fscanf(sig, "%lf\n", &t1);
       else
-        fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_frid2_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_frid2_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -126,8 +126,8 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
-      fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
+      fscanf(sig, "%*f\n");
       fscanf(sig, "%d\n", &seed);
       n_signature1 = NBITSTOBYTES(nbit_signature1);
       fread(signature1, sizeof(char), n_signature1, sig);
--- a/Meerwald/wm_frid2_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_frid2_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -126,11 +126,11 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (gamma == 0.0)
         fscanf(sig, "%lf\n", &gamma);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       
       fscanf(sig, "%d\n", &seed);
       n_signature = NBITSTOBYTES(nbit_signature);
--- a/Meerwald/wm_kim_a.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_kim_a.c	Mon Jun 30 21:03:40 2008 +0200
@@ -181,11 +181,11 @@
       if (alpha_detail == 0.0)
         fscanf(sig, "%lf\n", &alpha_detail);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (alpha_approx == 0.0)
         fscanf(sig, "%lf\n", &alpha_approx);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else
--- a/Meerwald/wm_kim_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_kim_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -198,11 +198,11 @@
       if (alpha_detail == 0.0)
         fscanf(sig, "%lf\n", &alpha_detail);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (alpha_approx == 0.0)
         fscanf(sig, "%lf\n", &alpha_approx);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else
--- a/Meerwald/wm_kim_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_kim_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -178,11 +178,11 @@
       if (alpha_detail == 0.0)
         fscanf(sig, "%lf\n", &alpha_detail);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (alpha_approx == 0.0)
         fscanf(sig, "%lf\n", &alpha_approx);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else
--- a/Meerwald/wm_koch_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_koch_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -119,7 +119,7 @@
       if (quality == 0.0)
         fscanf(sig, "%lf\n", &quality);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (quantization == 0)
         fscanf(sig, "%d\n", &quantization);
       else
--- a/Meerwald/wm_koch_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_koch_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -118,7 +118,7 @@
       if (quality == 0.0)
         fscanf(sig, "%lf\n", &quality);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (quantization == 0)
         fscanf(sig, "%d\n", &quantization);
       else
--- a/Meerwald/wm_kund_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_kund_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -143,7 +143,7 @@
       if (quality == 0.0)
         fscanf(sig, "%lf\n", &quality);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_wang_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_wang_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -170,11 +170,11 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (beta == 0.0)
         fscanf(sig, "%lf\n", &beta);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_wang_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_wang_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -143,11 +143,11 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (beta == 0.0)
         fscanf(sig, "%lf\n", &beta);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_xia_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_xia_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -189,7 +189,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else
--- a/Meerwald/wm_xia_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_xia_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -163,7 +163,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else
--- a/Meerwald/wm_xie2_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_xie2_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -160,7 +160,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_xie2_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_xie2_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -154,7 +154,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_xie_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_xie_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -155,7 +155,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_xie_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_xie_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -57,7 +57,7 @@
   Image_tree dwts, p;
 
   gray maxval;
-  int rows, cols, colors, format;
+  int rows, cols, format;
 
   progname = argv[0];
 
@@ -149,7 +149,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (method < 0)
         fscanf(sig, "%d\n", &method);
       else
--- a/Meerwald/wm_zhu_d.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_zhu_d.c	Mon Jun 30 21:03:40 2008 +0200
@@ -169,7 +169,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else
--- a/Meerwald/wm_zhu_e.c	Mon Jun 30 20:59:01 2008 +0200
+++ b/Meerwald/wm_zhu_e.c	Mon Jun 30 21:03:40 2008 +0200
@@ -142,7 +142,7 @@
       if (alpha == 0.0)
         fscanf(sig, "%lf\n", &alpha);
       else
-        fscanf(sig, "%*lf\n");
+        fscanf(sig, "%*f\n");
       if (level == 0)
         fscanf(sig, "%d\n", &level);
       else

Repositories maintained by Peter Meerwald, pmeerw@pmeerw.net.