opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-18 00:01:17 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3515 from asmorkalov:as/find_ellipses_memory

Browse Source 
Fixed memory leak in EllipseDetector and Mat addressing
This commit is contained in:
Alexander Smorkalov
2023-06-28 12:48:14 +03:00
committed by GitHub
parent 4f66f8677b d545bab378
commit f10c84d48b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ximgproc/src/find_ellipses.cpp
View File

@@ -1272,9 +1272,9 @@ void EllipseDetectorImpl::preProcessing(Mat1b &image, Mat1b &dp, Mat1b &dn) {
// buffer
int *magBuffer[3];
void *buffer = malloc((imgSize.width + 2) * (imgSize.height + 2) +
(imgSize.width + 2) * 3 * sizeof(int));
magBuffer[0] = (int *) buffer;
AutoBuffer<int> buffer((imgSize.width + 2) * (imgSize.height + 2) +
(imgSize.width + 2) * 3);
magBuffer[0] = buffer.data();
magBuffer[1] = magBuffer[0] + imgSize.width + 2;
magBuffer[2] = magBuffer[1] + imgSize.width + 2;
uchar *map = (uchar *) (magBuffer[2] + imgSize.width + 2);
@@ -1300,8 +1300,8 @@ void EllipseDetectorImpl::preProcessing(Mat1b &image, Mat1b &dp, Mat1b &dn) {
// 2 - the pixel does belong to an edge
for (int i = 0; i <= imgSize.height; i++) {
int *tmpMag = magBuffer[(i > 0) + 1] + 1;
const short *tmpDx = (short *) (dx[i]);
const short *tmpDy = (short *) (dy[i]);
const short *tmpDx = dx.ptr<short>(i);
const short *tmpDy = dy.ptr<short>(i);
uchar *tmpMap;
int prevFlag = 0;
@@ -1980,4 +1980,4 @@ void findEllipses(
Mat(_ellipses).copyTo(ellipses);
}
} // namespace ximgproc
} // namespace cv
} // namespace cv