Skip to content

Commit

Permalink
curves init fix to run without paramenter changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jaromil committed May 12, 2023
1 parent 1a6615e commit 1df8a18
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions src/filter/curves/curves.c
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 @@ -776,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

0 comments on commit 1df8a18

Please # to comment.