potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-07-28 10:04:17 +03:00
parent 5d6cce0b99 603d7ded88
commit 3b2d7b3f1b
28 changed files with 780 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/contours_blockstorage.hpp
+2 -2
View File
@@ -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;
modules/imgproc/src/contours_common.hpp
+2 -2
View File
@@ -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