Menu
▾
▴
[Sox-commits] sox/src alsa.c, 1.109, 1.110 biquads.c, 1.20, 1.21 cvsd-fmt.c, 1.12, 1.13 filter.c, 1.47, 1.48 formats.c, 1.31, 1.32 loudness.c, 1.1, 1.2 sox-fmt.c, 1.5, 1.6
|
From: robs <ro...@us...> - 2008-10-30 05:03:38
|
Update of /cvsroot/sox/sox/src In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22173/src Modified Files: alsa.c biquads.c cvsd-fmt.c filter.c formats.c loudness.c sox-fmt.c Log Message: quash warnings on 64-bit Index: cvsd-fmt.c =================================================================== RCS file: /cvsroot/sox/sox/src/cvsd-fmt.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- cvsd-fmt.c 18 Oct 2008 16:42:40 -0000 1.12 +++ cvsd-fmt.c 30 Oct 2008 05:03:25 -0000 1.13 @@ -75,7 +75,7 @@ for (i = 0; i < len; ++i) { if (!(p->bit_count & 7)) - if (lsx_read_b_buf(ft, &p->byte, 1) != 1) + if (lsx_read_b_buf(ft, &p->byte, (size_t)1) != 1) break; ++p->bit_count; decode(p, p->byte & 1); Index: filter.c =================================================================== RCS file: /cvsroot/sox/sox/src/filter.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- filter.c 24 Oct 2008 02:15:25 -0000 1.47 +++ filter.c 30 Oct 2008 05:03:25 -0000 1.48 @@ -199,7 +199,7 @@ return (SOX_SUCCESS); } -static int p2(int n) +static int p2(long n) { int N; for (N = 1; n; n >>= 1, N <<= 1); Index: formats.c =================================================================== RCS file: /cvsroot/sox/sox/src/formats.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- formats.c 27 Oct 2008 07:15:23 -0000 1.31 +++ formats.c 30 Oct 2008 05:03:25 -0000 1.32 @@ -321,9 +321,9 @@ static sox_bool is_url(char const * text) /* detects only wget-supported URLs */ { return !( - strncasecmp(text, "http:" , 5) && - strncasecmp(text, "https:", 6) && - strncasecmp(text, "ftp:" , 4)); + strncasecmp(text, "http:" , (size_t)5) && + strncasecmp(text, "https:", (size_t)6) && + strncasecmp(text, "ftp:" , (size_t)4)); } static int xfclose(FILE * file, lsx_io_type io_type) Index: alsa.c =================================================================== RCS file: /cvsroot/sox/sox/src/alsa.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- alsa.c 25 Oct 2008 20:25:48 -0000 1.109 +++ alsa.c 30 Oct 2008 05:03:25 -0000 1.110 @@ -505,7 +505,7 @@ long n = snd_pcm_readi(alsa->pcm_handle, alsa->buf, (nsamp - len)/ft->signal.channels); /* ALSA takes "frame" counts. */ if (n < 0) { - if (xrun_recovery(alsa->pcm_handle, n) < 0) { + if (xrun_recovery(alsa->pcm_handle, (int)n) < 0) { lsx_fail_errno(ft, SOX_EPERM, "ALSA read error"); return 0; } Index: biquads.c =================================================================== RCS file: /cvsroot/sox/sox/src/biquads.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- biquads.c 24 Oct 2008 02:15:25 -0000 1.20 +++ biquads.c 30 Oct 2008 05:03:25 -0000 1.21 @@ -334,26 +334,26 @@ if (effp->in_signal.rate == 44100) { static const double zeros[] = {-0.2014898, 0.9233820}; static const double poles[] = {0.7083149, 0.9924091}; - make_poly_from_roots(zeros, 2, &p->b0); - make_poly_from_roots(poles, 2, &p->a0); + make_poly_from_roots(zeros, (size_t)2, &p->b0); + make_poly_from_roots(poles, (size_t)2, &p->a0); } else if (effp->in_signal.rate == 48000) { static const double zeros[] = {-0.1766069, 0.9321590}; static const double poles[] = {0.7396325, 0.9931330}; - make_poly_from_roots(zeros, 2, &p->b0); - make_poly_from_roots(poles, 2, &p->a0); + make_poly_from_roots(zeros, (size_t)2, &p->b0); + make_poly_from_roots(poles, (size_t)2, &p->a0); } else if (effp->in_signal.rate == 88200) { static const double zeros[] = {-0.1168735, 0.9648312}; static const double poles[] = {0.8590646, 0.9964002}; - make_poly_from_roots(zeros, 2, &p->b0); - make_poly_from_roots(poles, 2, &p->a0); + make_poly_from_roots(zeros, (size_t)2, &p->b0); + make_poly_from_roots(poles, (size_t)2, &p->a0); } else if (effp->in_signal.rate == 96000) { static const double zeros[] = {-0.1141486, 0.9676817}; static const double poles[] = {0.8699137, 0.9966946}; - make_poly_from_roots(zeros, 2, &p->b0); - make_poly_from_roots(poles, 2, &p->a0); + make_poly_from_roots(zeros, (size_t)2, &p->b0); + make_poly_from_roots(poles, (size_t)2, &p->a0); } else { lsx_fail("Sample rate must be 44.1k, 48k, 88.2k, or 96k"); Index: sox-fmt.c =================================================================== RCS file: /cvsroot/sox/sox/src/sox-fmt.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- sox-fmt.c 26 Oct 2008 09:18:02 -0000 1.5 +++ sox-fmt.c 30 Oct 2008 05:03:25 -0000 1.6 @@ -53,8 +53,8 @@ } if (comments_bytes) { - char * buf = lsx_calloc(1, comments_bytes + 1); /* ensure nul-terminated */ - if (lsx_readchars(ft, buf, comments_bytes) != SOX_SUCCESS) { + char * buf = lsx_calloc(1, (size_t)comments_bytes + 1); /* ensure nul-terminated */ + if (lsx_readchars(ft, buf, (size_t)comments_bytes) != SOX_SUCCESS) { free(buf); return SOX_EOF; } @@ -83,7 +83,7 @@ ||lsx_writeqw(ft, size) ||lsx_writedf(ft, ft->signal.rate) ||lsx_writedw(ft, ft->signal.channels) - ||lsx_writedw(ft, comments_len) + ||lsx_writedw(ft, (unsigned)comments_len) ||lsx_writechars(ft, comments, comments_len) ||lsx_padbytes(ft, comments_bytes - comments_len); free(comments); Index: loudness.c =================================================================== RCS file: /cvsroot/sox/sox/src/loudness.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- loudness.c 21 Sep 2008 20:46:08 -0000 1.1 +++ loudness.c 30 Oct 2008 05:03:25 -0000 1.2 @@ -79,7 +79,7 @@ } fs[i + 1] = log(100000.); spl[i + 1] = spl[0]; - lsx_prepare_spline3(fs, spl, LEN, HUGE_VAL, HUGE_VAL, d); + lsx_prepare_spline3(fs, spl, (int)LEN, HUGE_VAL, HUGE_VAL, d); for (work_len = 8192; work_len < rate / 2; work_len <<= 1); work = lsx_calloc(work_len, sizeof(*work)); @@ -87,7 +87,7 @@ for (i = 1; i <= work_len / 2; ++i) { double f = rate * i / work_len; - double spl1 = f < 1? spl[0] : lsx_spline3(fs, spl, d, LEN, log(f)); + double spl1 = f < 1? spl[0] : lsx_spline3(fs, spl, d, (int)LEN, log(f)); work[i < work_len / 2 ? 2 * i : 1] = dB_to_linear(spl1); } lsx_safe_rdft(work_len, -1, work); |