diff --git a/modules/imgcodecs/test/test_exif.cpp b/modules/imgcodecs/test/test_exif.cpp index 09e70b3046..8576c4f1e4 100644 --- a/modules/imgcodecs/test/test_exif.cpp +++ b/modules/imgcodecs/test/test_exif.cpp @@ -565,13 +565,13 @@ TEST_P(ReadExif_Sanity, Check) static const std::vector exif_sanity_params { #ifdef HAVE_JPEG - {"readwrite/testExifOrientation_3.jpg", 916, "Photoshop", 120}, + ReadExif_Sanity_Params("readwrite/testExifOrientation_3.jpg", 916, "Photoshop", 120), #endif #ifdef OPENCV_IMGCODECS_PNG_WITH_EXIF - {"readwrite/testExifOrientation_5.png", 112, "ExifTool", 102}, + ReadExif_Sanity_Params("readwrite/testExifOrientation_5.png", 112, "ExifTool", 102), #endif #ifdef HAVE_AVIF - {"readwrite/testExifOrientation_7.avif", 913, "Photoshop", 120}, + ReadExif_Sanity_Params("readwrite/testExifOrientation_7.avif", 913, "Photoshop", 120), #endif }; diff --git a/modules/imgproc/src/contours_blockstorage.hpp b/modules/imgproc/src/contours_blockstorage.hpp index 7b7c55a72d..a30cba96d4 100644 --- a/modules/imgproc/src/contours_blockstorage.hpp +++ b/modules/imgproc/src/contours_blockstorage.hpp @@ -26,14 +26,14 @@ class BlockStorage { dynamicBlocks.push_back(new block_type); } BlockStorage(const BlockStorage&) = delete; - BlockStorage(BlockStorage&&) noexcept = default; + BlockStorage(BlockStorage&&) = default; ~BlockStorage() { for(const auto & block : dynamicBlocks) { delete block; } } BlockStorage& operator=(const BlockStorage&) = delete; - BlockStorage& operator=(BlockStorage&&) noexcept = default; + BlockStorage& operator=(BlockStorage&&) = default; void clear(void) { const size_t minDynamicBlocks = !staticBlocksCount ? 1 : 0; diff --git a/modules/imgproc/src/contours_common.hpp b/modules/imgproc/src/contours_common.hpp index e02945fd01..08f3dc1b3d 100644 --- a/modules/imgproc/src/contours_common.hpp +++ b/modules/imgproc/src/contours_common.hpp @@ -190,7 +190,7 @@ public: ContourDataStorage(ContourDataStorage&&) noexcept = default; ~ContourDataStorage() = default; ContourDataStorage& operator=(const ContourDataStorage&) = delete; - ContourDataStorage& operator=(ContourDataStorage&&) noexcept = default; + ContourDataStorage& operator=(ContourDataStorage&&) = default; public: typename storage_t::RangeIterator getRangeIterator(void) const {return storage->getRangeIterator(first, last);} public: @@ -243,7 +243,7 @@ public: Contour(const Contour&) = delete; Contour(Contour&& other) noexcept = default; Contour& operator=(const Contour&) = delete; - Contour& operator=(Contour&& other) noexcept = default; + Contour& operator=(Contour&& other) = default; ~Contour() = default; void updateBoundingRect() {} bool isEmpty() const