Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.1...3.5)

cmake_policy(SET CMP0077 NEW)
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()

project(SPTK VERSION 4.3)

Expand All @@ -23,7 +25,7 @@ endif()

set(CMAKE_CXX_STANDARD 11)
if(MSVC)
set(CMAKE_CXX_FLAGS "/O2 /W4 /wd4100 /EHsc")
set(CMAKE_CXX_FLAGS "/O2 /W4 /wd4100 /wd4456 /EHsc /D_CRT_SECURE_NO_WARNINGS")
else()
set(CMAKE_CXX_FLAGS "-O2 -Wall -Wno-deprecated-register")
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/main/goertzel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ int main(int argc, char* argv[]) {
}

const int input_length(num_order + 1);
const int output_length(frequencies.size());
const int output_length(static_cast<int>(frequencies.size()));
std::vector<double> input_x(input_length);
std::vector<double> output_x(output_length);
std::vector<double> output_y(output_length);
Expand Down
8 changes: 8 additions & 0 deletions third_party/REAPER/core/track.cc
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,11 @@ void Track::FrameIn(const std::vector<float> &fv, int n) {

void Track::FrameIn(const std::vector<double> &fv, int n) {
for (int i = 0; i < num_channels_; i++) {
#if 0
a(n, i) = fv[i];
#else
a(n, i) = static_cast<float>(fv[i]);
#endif
}
}

Expand Down Expand Up @@ -580,7 +584,11 @@ void ConvertToLogarithmic(Track *t) {
if (t->a(i, j) <= 0.0F) {
t->a(i, j) = INVALID_LOG;
} else {
#if 0
t->a(i, j) = log(t->a(i, j));
#else
t->a(i, j) = logf(t->a(i, j));
#endif
}
}
}
Expand Down
Loading