diff --git a/CMakeLists.txt b/CMakeLists.txt index a2fb130932f49335fee6d3ec6606001f32e44cfd..9da0cf46b80560aaef49553147aadb283af908b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,7 +388,7 @@ include(ftl_paths) if (WIN32) # TODO(nick) Should do based upon compiler (VS) add_definitions(-DWIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /wd4996") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DFTL_DEBUG /Wall") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2") set(OS_LIBS "") diff --git a/components/calibration/include/ftl/calibration/optimize.hpp b/components/calibration/include/ftl/calibration/optimize.hpp index 84f2a1d5c0b7902502144eb03284bef19dbe6be5..a8ba52ab33d5e4d4ae7fb8072cde6729a45c7a6e 100644 --- a/components/calibration/include/ftl/calibration/optimize.hpp +++ b/components/calibration/include/ftl/calibration/optimize.hpp @@ -9,7 +9,10 @@ #include <ftl/config.h> +#ifdef HAVE_CERES #include <ceres/ceres.h> +#endif + #include <opencv2/core/core.hpp> // BundleAdjustment uses Point3d instances via double* diff --git a/components/codecs/src/nvidia_decoder.cpp b/components/codecs/src/nvidia_decoder.cpp index 20632ffab9a1a3f5b0b7b883a4146e30ad76fe3c..b4638ad048c3e7aa5cf65f021bbcffd73e62540a 100644 --- a/components/codecs/src/nvidia_decoder.cpp +++ b/components/codecs/src/nvidia_decoder.cpp @@ -195,7 +195,7 @@ bool NvidiaDecoder::decode(const ftl::codecs::Packet &pkt, cv::cuda::GpuMat &out ftl::cuda::vuya_to_depth(out, sroi, csroi, 16.0f, cvstream); } else { - ftl::cuda::nv12_to_float(decodedPtr, width_, (float*)out.data, out.step1(), width_/2, height_, stream_); + ftl::cuda::nv12_to_float(decodedPtr, width_, (float*)out.data, static_cast<uint32_t>(out.step1()), width_/2, height_, stream_); } } else { // Flag 0x1 means frame is in RGB so needs conversion to BGR