From e39f2e09698556e7895b084b7addb88d3e7ea58d Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 19 Jun 2014 16:58:14 -0400 Subject: canvas: Kill optimizers' ->ptr field. --- libdimension/dimension/canvas.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'libdimension/dimension/canvas.h') diff --git a/libdimension/dimension/canvas.h b/libdimension/dimension/canvas.h index d03a37e..e325364 100644 --- a/libdimension/dimension/canvas.h +++ b/libdimension/dimension/canvas.h @@ -41,23 +41,22 @@ typedef struct dmnsn_canvas { dmnsn_tcolor *pixels; } dmnsn_canvas; +/* Forward-declare dmnsn_canvas_optimizer. */ +typedef struct dmnsn_canvas_optimizer dmnsn_canvas_optimizer; + /** * Canvas optimizer callback type. + * @param[in] optimizer The canvas optimizer. * @param[in] canvas The canvas that was just updated. - * @param[in] ptr The canvas optimizer's data pointer. - * @param[in] x The x-coordinate that was just updated. - * @param[in] y The y-coordinate that was just updated. + * @param[in] x The x-coordinate that was just updated. + * @param[in] y The y-coordinate that was just updated. */ -typedef void dmnsn_canvas_optimizer_fn(const dmnsn_canvas *canvas, void *ptr, - size_t x, size_t y); +typedef void dmnsn_canvas_optimizer_fn(dmnsn_canvas_optimizer *optimizer, const dmnsn_canvas *canvas, size_t x, size_t y); /** Canvas optimizer. */ -typedef struct dmnsn_canvas_optimizer { +struct dmnsn_canvas_optimizer { dmnsn_canvas_optimizer_fn *optimizer_fn; /**< Optimizer callback. */ - dmnsn_free_fn *free_fn; /**< Destructor callback. */ - - void *ptr; /**< Generic pointer. */ -} dmnsn_canvas_optimizer; +}; /** * Allocate a new canvas. @@ -68,6 +67,12 @@ typedef struct dmnsn_canvas_optimizer { */ dmnsn_canvas *dmnsn_new_canvas(dmnsn_pool *pool, size_t width, size_t height); +/** + * Initialize a dmnsn_canvas_optimizer field + * @param[in] optimizer The optimizer to initialize. + */ +void dmnsn_init_canvas_optimizer(dmnsn_canvas_optimizer *optimizer); + /** * Set a canvas optimizer * @param[in,out] canvas The canvas to optimize. -- cgit v1.2.3