apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some memory leaks (#55)

Browse Source
This commit is contained in:
matlabbe 2018-07-04 12:28:58 -04:00
parent 2cb9120f74
commit 1abda367d6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/FindObject.cpp
View File

@ -668,6 +668,7 @@ public:
uFormat("Image of object %d is null or not type CV_8UC1!?!? (cols=%d, rows=%d, type=%d)", uFormat("Image of object %d is null or not type CV_8UC1!?!? (cols=%d, rows=%d, type=%d)",
objectId, image.cols, image.rows, image.type()).c_str()); objectId, image.cols, image.rows, image.type()).c_str());
} }
virtual ~ExtractFeaturesThread() {}
int objectId() const {return objectId_;} int objectId() const {return objectId_;}
const cv::Mat & image() const {return image_;} const cv::Mat & image() const {return image_;}
const std::vector<cv::KeyPoint> & keypoints() const {return keypoints_;} const std::vector<cv::KeyPoint> & keypoints() const {return keypoints_;}
@ -774,6 +775,8 @@ protected:
timeDetection_ += threads[k]->timeDetection(); timeDetection_ += threads[k]->timeDetection();
timeExtraction_ += threads[k]->timeExtraction(); timeExtraction_ += threads[k]->timeExtraction();
timeSubPix_ += threads[k]->timeSubPix(); timeSubPix_ += threads[k]->timeSubPix();
delete threads[k];
} }
} }
} }
@ -868,6 +871,7 @@ void FindObject::updateObjects(const QList<int> & ids)
{ {
objects_.value(id)->removeImage(); objects_.value(id)->removeImage();
} }
delete threads[j];
} }
} }
UINFO("Features extraction from %d objects... done! (%d ms)", objectsList.size(), time.elapsed()); UINFO("Features extraction from %d objects... done! (%d ms)", objectsList.size(), time.elapsed());
@ -1730,6 +1734,7 @@ bool FindObject::detect(const cv::Mat & image, find_object::DetectionInfo & info
info.rejectedOutliers_.insert(id, threads[j]->getOutliers()); info.rejectedOutliers_.insert(id, threads[j]->getOutliers());
info.rejectedCodes_.insert(id, code); info.rejectedCodes_.insert(id, code);
} }
delete threads[j];
} }
UDEBUG("Processed matches %d", i+1); UDEBUG("Processed matches %d", i+1);
} }