Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix a memory leak and an off-by-one problem in curves filter. #164

Merged
merged 2 commits into from
May 12, 2023
Merged

Fix a memory leak and an off-by-one problem in curves filter. #164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a6615e
Fix a memory leak and an off-by-one problem in curves filter.
rrrapha May 5, 2023
1df8a18
curves init fix to run without paramenter changes
jaromil May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/filter/curves/curves.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,9 @@ f0r_instance_t f0r_construct(unsigned int width, unsigned int height)
inst->pointNumber = 2;
inst->formula = 1;
inst->bspline = calloc(1, sizeof(char));
inst->bsplineMap = malloc(sizeof(double));
inst->csplineMap = malloc(sizeof(double));
inst->curveMap = malloc(sizeof(float));
inst->bsplineMap = NULL;
inst->csplineMap = NULL;
inst->curveMap = NULL;
inst->points[0] = 0;
inst->points[1] = 0;
inst->points[2] = 1;
Expand All @@ -273,12 +273,12 @@ f0r_instance_t f0r_construct(unsigned int width, unsigned int height)

void f0r_destruct(f0r_instance_t instance)
{
if (((curves_instance_t*)instance)->bspline)
free(((curves_instance_t*)instance)->bspline);
free(((curves_instance_t*)instance)->bsplineMap);
free(((curves_instance_t*)instance)->csplineMap);
free(((curves_instance_t*)instance)->curveMap);
free(instance);
curves_instance_t* inst = (curves_instance_t*)instance;
if (inst->bspline) free(inst->bspline);
if(inst->bsplineMap) free(inst->bsplineMap);
if(inst->csplineMap) free(inst->csplineMap);
if(inst->curveMap) free(inst->curveMap);
free(inst);
}

void f0r_set_param_value(f0r_instance_t instance,
Expand Down Expand Up @@ -666,7 +666,7 @@ void updateBsplineMap(f0r_instance_t instance)
c = 1;
}
step = 1 / (double)c;
position *curve = (position *) malloc(c * sizeof(position));
position *curve = (position *) malloc((c + 1) * sizeof(position));
while (t <= 1) {
curve[pn++] = pointOnBezier(t, p);
t += step;
Expand Down Expand Up @@ -759,9 +759,10 @@ void updateCsplineMap(f0r_instance_t instance)
}
if (inst->drawCurves) {
int scale = inst->height / 2;
free(inst->curveMap);
inst->curveMap = malloc(scale * sizeof(float));
for(i = 0; i < scale; i++)
inst->curveMap[i] = spline((float)i / scale, points, (size_t)inst->pointNumber, coeffs) * scale;
inst->curveMap[i] = spline((double)i / scale, points, (size_t)inst->pointNumber, coeffs) * scale;
}

free(coeffs);
Expand All @@ -775,6 +776,13 @@ void f0r_update(f0r_instance_t instance, double time,
curves_instance_t* inst = (curves_instance_t*)instance;
unsigned int len = inst->width * inst->height;

// test initalization c/b spline
double *splinemap = strlen(inst->bspline)>0 ? inst->bsplineMap : inst->csplineMap;
if(!splinemap) {
memcpy(outframe,inframe,inst->width * inst->height * 4);
return;
}

unsigned char* dst = (unsigned char*)outframe;
const unsigned char* src = (unsigned char*)inframe;

Expand Down