Changeset 614963a for src

Timestamp:

Jul 16, 2012, 12:44:01 AM (13 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6bfbcdc

Parents:

55012c4 (diff), 3cd2434 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into io

File:

• src/tempo/beattracking.c (modified) (2 diffs)

src/tempo/beattracking.c

@@ -160 +160 @@
   for (i = 1; i < laglen - 1; i++) {
     for (a = 1; a <= numelem; a++) {
-      for (b = (1 - a); b < a; b++) {
+      for (b = (1 - a); b < (sint_t)a; b++) {
         bt->acfout->data[i] += bt->acf->data[a * (i + 1) + b - 1]
             * 1. / (2. * a - 1.);
@@ -300 +300 @@
     for (i = 1; i < laglen - 1; i++) {
       for (a = 1; a <= bt->timesig; a++) {
-        for (b = (1 - a); b < a; b++) {
+        for (b = (1 - a); b < (sint_t)a; b++) {
           acfout->data[i] += acf->data[a * (i + 1) + b - 1];
         }