From b9d83609de0136148f61b615f1dfe30f0af170e3 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 16 Jul 2018 17:09:31 +0300 Subject: [PATCH] build: eliminate GCC8 warnings --- modules/bgsegm/src/bgfg_gsoc.cpp | 3 ++- .../samples/OpenEXRimages_HDR_Retina_toneMapping.cpp | 2 +- modules/rgbd/src/linemod.cpp | 4 ++-- modules/sfm/src/libmv_light/CMakeLists.txt | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/bgsegm/src/bgfg_gsoc.cpp b/modules/bgsegm/src/bgfg_gsoc.cpp index f81eca9c8..abf18d7b2 100644 --- a/modules/bgsegm/src/bgfg_gsoc.cpp +++ b/modules/bgsegm/src/bgfg_gsoc.cpp @@ -237,7 +237,8 @@ public: if (p.y >= size.height) p.y = size.height - 1; - memcpy(&samples[i * stride + j * nSamples], &bm.samples[p.y * stride + p.x * nSamples], sizeof(BackgroundSampleType) * nSamples); + for (int k = 0; k < nSamples; k++) + samples[i * stride + j * nSamples + k] = bm.samples[p.y * stride + p.x * nSamples + k]; } } diff --git a/modules/bioinspired/samples/OpenEXRimages_HDR_Retina_toneMapping.cpp b/modules/bioinspired/samples/OpenEXRimages_HDR_Retina_toneMapping.cpp index 7a7edda3f..9e0ed4384 100644 --- a/modules/bioinspired/samples/OpenEXRimages_HDR_Retina_toneMapping.cpp +++ b/modules/bioinspired/samples/OpenEXRimages_HDR_Retina_toneMapping.cpp @@ -294,7 +294,7 @@ int main(int argc, char* argv[]) */ cv::waitKey(10); } - }catch(cv::Exception e) + } catch(const cv::Exception& e) { std::cerr<<"Error using Retina : "<(r, c), static_cast(src.step1()), dst.ptr(), - static_cast(dst.step1()), src.cols - c, height); + orUnaligned8u(&src.at(r, c), static_cast(src.step1()), dst.ptr(), + static_cast(dst.step1()), src.cols - c, height); } } } diff --git a/modules/sfm/src/libmv_light/CMakeLists.txt b/modules/sfm/src/libmv_light/CMakeLists.txt index 8da6d728c..ec7d47e8f 100644 --- a/modules/sfm/src/libmv_light/CMakeLists.txt +++ b/modules/sfm/src/libmv_light/CMakeLists.txt @@ -4,5 +4,8 @@ include(CMake/Installation.cmake) set(BUILD_SHARED_LIBS OFF) # Force static libs for 3rdparty dependencies ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override) +if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0) + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess) +endif() add_subdirectory(libmv) \ No newline at end of file