提交 923698d7 编写于 作者: P Piotr Miecielica

Fixes of some memory leaks

上级 e69d2c1b
......@@ -476,12 +476,19 @@ public:
chamfer_ = new Matching(true);
}
~ChamferMatcher()
{
delete chamfer_;
}
void showMatch(Mat& img, int index = 0);
void showMatch(Mat& img, Match match_);
const Matches& matching(Template&, Mat&);
private:
ChamferMatcher(const ChamferMatcher&);
ChamferMatcher& operator=(const ChamferMatcher&);
void addMatch(float cost, Point offset, const Template* tpl);
......
......@@ -79,9 +79,7 @@ void CvFuzzyCurve::clear()
void CvFuzzyCurve::addPoint(double x, double y)
{
CvFuzzyPoint *point;
point = new CvFuzzyPoint(x, y);
points.push_back(*point);
points.push_back(CvFuzzyPoint(x, y));
};
double CvFuzzyCurve::calcValue(double param)
......
......@@ -209,6 +209,7 @@ int CvMLData::read_csv(const char* filename)
if (!token)
{
fclose(file);
delete [] el_ptr;
return -1;
}
}
......
......@@ -2619,8 +2619,10 @@ void HOGDescriptor::readALTModel(std::string modelfile)
double *linearwt = new double[totwords+1];
int length = totwords;
nread = fread(linearwt, sizeof(double), totwords + 1, modelfl);
if(nread != static_cast<size_t>(length) + 1)
if(nread != static_cast<size_t>(length) + 1) {
delete [] linearwt;
throw Exception();
}
for(int i = 0; i < length; i++)
detector.push_back((float)linearwt[i]);
......
......@@ -142,6 +142,7 @@ CvSeq* cvLatentSvmDetectObjects(IplImage* image,
free(points);
free(oppPoints);
free(score);
free(scoreOut);
return result_seq;
}
......
......@@ -741,8 +741,11 @@ int LSVMparser(const char * filename, CvLSVMFilterObject *** model, int *last, i
//printf("parse : %s\n", filename);
xmlf = fopen(filename, "rb");
if(xmlf == NULL)
if(xmlf == NULL) {
free(*model);
*model = NULL;
return LSVM_PARSER_FILE_NOT_FOUND;
}
//i = 0;
j = 0;
......@@ -808,6 +811,7 @@ int loadModel(
(*kPartFilters)[i] = (comp[i] - comp[i - 1]) - 1;
}
(*kPartFilters)[0] = comp[0];
free(comp);
return 0;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册