generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bug #1381

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-09-27 15:50:17 +00:00
parent 1c738820de
commit 86882e5dd1
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/objdetect/src/distancetransform.cpp
View File

@ -342,41 +342,30 @@ int DistanceTransformTwoDimensionalProblem(const float *f,
{ {
int i, j, tmp; int i, j, tmp;
int resOneDimProblem; int resOneDimProblem;
float *internalDistTrans;
int *internalPointsX;
int size = n * m; int size = n * m;
std::vector<float> internalDistTrans(size);
// Allocation memory (must be free in this function) std::vector<int> internalPointsX(size);
internalDistTrans = (float *)malloc(sizeof(float) * size);
internalPointsX = (int *)malloc(sizeof(int) * size);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
resOneDimProblem = DistanceTransformOneDimensionalProblem( resOneDimProblem = DistanceTransformOneDimensionalProblem(
f + i * m, m, f + i * m, m,
coeff[0], coeff[2], coeff[0], coeff[2],
internalDistTrans + i * m, &internalDistTrans[i * m],
internalPointsX + i * m); &internalPointsX[i * m]);
if (resOneDimProblem != DISTANCE_TRANSFORM_OK) if (resOneDimProblem != DISTANCE_TRANSFORM_OK)
{
free(internalDistTrans);
return DISTANCE_TRANSFORM_ERROR; return DISTANCE_TRANSFORM_ERROR;
} /* if (resOneDimProblem != DISTANCE_TRANSFORM_OK) */
} }
Transpose(internalDistTrans, n, m); Transpose(&internalDistTrans[0], n, m);
for (j = 0; j < m; j++) for (j = 0; j < m; j++)
{ {
resOneDimProblem = DistanceTransformOneDimensionalProblem( resOneDimProblem = DistanceTransformOneDimensionalProblem(
internalDistTrans + j * n, n, &internalDistTrans[j * n], n,
coeff[1], coeff[3], coeff[1], coeff[3],
distanceTransform + j * n, distanceTransform + j * n,
pointsY + j * n); pointsY + j * n);
if (resOneDimProblem != DISTANCE_TRANSFORM_OK) if (resOneDimProblem != DISTANCE_TRANSFORM_OK)
{
free(internalDistTrans);
return DISTANCE_TRANSFORM_ERROR; return DISTANCE_TRANSFORM_ERROR;
} /* if (resOneDimProblem != DISTANCE_TRANSFORM_OK) */
} }
Transpose(distanceTransform, m, n); Transpose(distanceTransform, m, n);
Transpose_int(pointsY, m, n); Transpose_int(pointsY, m, n);
@ -390,8 +379,5 @@ int DistanceTransformTwoDimensionalProblem(const float *f,
} }
} }
// Release allocated memory
free(internalDistTrans);
free(internalPointsX);
return DISTANCE_TRANSFORM_OK; return DISTANCE_TRANSFORM_OK;
} }