diff options
| author | Volker Fischer <corrados@users.noreply.github.com> | 2021-05-22 10:01:21 +0200 |
|---|---|---|
| committer | Volker Fischer <corrados@users.noreply.github.com> | 2021-05-22 10:01:21 +0200 |
| commit | 0711d0f5aef38ee60653d52ca2f04c8d7051b1e6 (patch) | |
| tree | c57f3c4e4388772a874fe3b8313ed69429944a39 | |
| parent | 5be222dee61dc8b28a429d93c39a2500a28de759 (diff) | |
| parent | 0fcb75e864ff8ed42622249dfdd7af9abfda033d (diff) | |
Merge remote-tracking branch 'origin/two_samples_bug_fix' into edrumulus
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/sample_selection.cc | 3 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ac65c69..28c492d 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ dnl Check for -ffloat-store support dnl =========================== AC_LANG_PUSH([C++]) TMP_CXXFLAGS="$CXXFLAGS" -CXXFLAGS="-Wall -Werror -ffloat-store" +CXXFLAGS="-Wall -Werror -Wextra -ffloat-store" AC_MSG_CHECKING([whether CXX supports -ffloat-store]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) diff --git a/src/sample_selection.cc b/src/sample_selection.cc index 0ff2c51..06e97c9 100644 --- a/src/sample_selection.cc +++ b/src/sample_selection.cc @@ -108,9 +108,6 @@ const Sample* SampleSelection::get(level_t level, float position, std::size_t po { DEBUG(rand, "%d %d", (int)up_index, (int)down_index); - // at least avoid infinite loops in case of a bug... - if (up_index == samples.size()-1 && down_index == 0) { break; } - std::size_t current_index; if (up_value_lb < down_value_lb) { diff --git a/test/Makefile.am b/test/Makefile.am index add962a..6d62314 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -24,7 +24,9 @@ if ENABLE_LV2 TESTS += lv2 endif +noinst_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS) + resource_CXXFLAGS = \ -I$(top_srcdir)/test/uunit -DOUTPUT=\"resource\" \ $(SNDFILE_CFLAGS) \ |