Mercurial > hg > wm
changeset 13:cbecc570129d
cleanup warnings
| author | Peter Meerwald <pmeerw@cosy.sbg.ac.at> |
|---|---|
| date | Mon, 30 Jun 2008 15:43:16 +0200 |
| parents | 6f5fea21a43c |
| children | 1906e659edd0 |
| files | Fotopoulos/cast-hart.c Fotopoulos/cast-pv.c Fotopoulos/cast-sub.c Fotopoulos/common.c Fotopoulos/test-hart.c Fotopoulos/test-pv.c Fotopoulos/test-sub.c |
| diffstat | 7 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Fotopoulos/cast-hart.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/cast-hart.c Mon Jun 30 15:43:16 2008 +0200 @@ -19,13 +19,14 @@ #include <float.h> #include <getopt.h> #include "common.h" +#include "pgm.h" int height, width; void add_watermark(double **in, int N, int coeff_start, int wm_length, int wm_key, double wm_alpha) { int row, col, count; - long int elem, L, M, temp, seed; + long int elem, L, M, seed; double a; count = 0; elem = 0; @@ -108,5 +109,5 @@ freematrix_d(image_d, height); fclose(in); fclose(out); - + exit(EXIT_SUCCESS); }
--- a/Fotopoulos/cast-pv.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/cast-pv.c Mon Jun 30 15:43:16 2008 +0200 @@ -21,6 +21,7 @@ #include <float.h> #include <getopt.h> #include "common.h" +#include "pgm.h" double cu[1024]; double cv[1024]; @@ -129,4 +130,6 @@ free(image_f); fclose(in); fclose(out); + + exit(EXIT_SUCCESS); }
--- a/Fotopoulos/cast-sub.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/cast-sub.c Mon Jun 30 15:43:16 2008 +0200 @@ -20,6 +20,7 @@ #include <float.h> #include <getopt.h> #include "common.h" +#include "pgm.h" void add_hor_add_ver(double **in, int N, double **out); void add_hor_sub_ver(double **in, int N, double **out); @@ -240,6 +241,8 @@ fclose(in); fclose(out); + + exit(EXIT_SUCCESS); }
--- a/Fotopoulos/common.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/common.c Mon Jun 30 15:43:16 2008 +0200 @@ -150,7 +150,7 @@ void inv_sums(double *f) { - int ii, stepsize, stage, curptr, nthreads, thread, step, nsteps; + int stepsize, stage, curptr, nthreads, thread, step, nsteps; for (stage = 1; stage <= m - 1; stage++) { nthreads = 1 << (stage - 1); @@ -182,7 +182,7 @@ void fwd_sums(double *f) { - int ii, stepsize, stage, curptr, nthreads, thread, step, nsteps; + int stepsize, stage, curptr, nthreads, thread, step, nsteps; for (stage = m - 1; stage >= 1; stage--) { nthreads = 1 << (stage - 1);
--- a/Fotopoulos/test-hart.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/test-hart.c Mon Jun 30 15:43:16 2008 +0200 @@ -18,6 +18,7 @@ #include <float.h> #include <getopt.h> #include "common.h" +#include "pgm.h" int height, width; @@ -106,4 +107,6 @@ freematrix_d(image_i, height); freematrix_d(image_d, height); fclose(in); + + exit(EXIT_SUCCESS); }
--- a/Fotopoulos/test-pv.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/test-pv.c Mon Jun 30 15:43:16 2008 +0200 @@ -20,6 +20,7 @@ #include <float.h> #include <getopt.h> #include "common.h" +#include "pgm.h" double cu[1024]; double cv[1024]; @@ -31,7 +32,6 @@ long int elem, L, M, temp, seed, i; double a; double z; - FILE *f; M = start_coeff; L = wm_length; a = wm_alpha; @@ -124,4 +124,6 @@ fclose(in); freematrix(image_i, height); free(image_f); + + exit(EXIT_SUCCESS); }
--- a/Fotopoulos/test-sub.c Thu May 01 19:12:21 2008 +0200 +++ b/Fotopoulos/test-sub.c Mon Jun 30 15:43:16 2008 +0200 @@ -20,6 +20,7 @@ #include <float.h> #include <getopt.h> #include "common.h" +#include "pgm.h" //-------------------------------------------------------- void add_hor_add_ver(double **in, int N, double **out); @@ -230,6 +231,8 @@ freematrix_d(lh, N / 2); freematrix_d(hh, N / 2); fclose(in); + + exit(EXIT_SUCCESS); }