From 51da2faa7a1fb204ce24081273e49910d66e1c37 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 29 Jan 2019 13:13:50 +0100 Subject: Fix callback type mismatch --- ell_grid_solve.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ell_grid_solve.c') diff --git a/ell_grid_solve.c b/ell_grid_solve.c index 5b6e586..370deab 100644 --- a/ell_grid_solve.c +++ b/ell_grid_solve.c @@ -243,7 +243,7 @@ static void residual_calc_line_s2_c(size_t linesize, double *dst, double *dst_ma *dst_max = MAX(*dst_max, res_max); } -static void residual_calc_task(void *arg, unsigned int job_idx, unsigned int thread_idx) +static int residual_calc_task(void *arg, unsigned int job_idx, unsigned int thread_idx) { EGSContext *ctx = arg; EGSInternal *priv = ctx->priv; @@ -257,6 +257,8 @@ static void residual_calc_task(void *arg, unsigned int job_idx, unsigned int thr priv->residual_max + thread_idx * priv->calc_blocksize, priv->stride, ctx->u + offset, ctx->rhs + offset, diff_coeffs, priv->fd_factors); + + return 0; } static void residual_calc(EGSContext *ctx) @@ -406,7 +408,7 @@ static void boundaries_apply(EGSContext *ctx) ctx->count_boundaries++; } -static void residual_add_task(void *arg, unsigned int job_idx, unsigned int thread_idx) +static int residual_add_task(void *arg, unsigned int job_idx, unsigned int thread_idx) { EGSContext *ctx = arg; EGSInternal *priv = ctx->priv; @@ -416,6 +418,8 @@ static void residual_add_task(void *arg, unsigned int job_idx, unsigned int thre ctx->u[idx] += priv->r.relax_factor * ctx->residual[idx]; } + + return 0; } static int solve_relax_step(EGSContext *ctx) -- cgit v1.2.3