diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-12-23 14:15:24 +0100 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-12-23 14:15:45 +0100 |
| commit | f70764d96a2063a933fb436abd43575de3e95c68 (patch) | |
| tree | 59e49556e74153f289debef843055e47cbe398e0 | |
| parent | 9db980551518a09069b8ade34743238329a36661 (diff) | |
Remove need_reset
| -rw-r--r-- | pixman/pixman-gradient-walker.c | 17 | ||||
| -rw-r--r-- | pixman/pixman-private.h | 2 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pixman/pixman-gradient-walker.c b/pixman/pixman-gradient-walker.c index 048039e..d0b55e7 100644 --- a/pixman/pixman-gradient-walker.c +++ b/pixman/pixman-gradient-walker.c @@ -35,16 +35,13 @@ _pixman_gradient_walker_init (pixman_gradient_walker_t *walker, { walker->num_stops = gradient->n_stops; walker->stops = gradient->stops; - walker->left_x = 0; - walker->right_x = 0x10000; - walker->stepper = 0; - walker->left_ag = 0; - walker->left_rb = 0; - walker->right_ag = 0; - walker->right_rb = 0; walker->repeat = repeat; - walker->need_reset = TRUE; + /* The remaining part of the structure should be initalized by the + * reset function. Set left < right to trigger a reset as soon as + * the gradient walker is used. */ + walker->left_x = 0x10000; + walker->right_x = 0; } static void @@ -127,8 +124,6 @@ gradient_walker_reset (pixman_gradient_walker_t *walker, int32_t width = right_x - left_x; walker->stepper = ((1 << 24) + width / 2) / width; } - - walker->need_reset = FALSE; } uint32_t @@ -138,7 +133,7 @@ _pixman_gradient_walker_pixel (pixman_gradient_walker_t *walker, int dist, idist; uint32_t t1, t2, a, color; - if (walker->need_reset || x < walker->left_x || x >= walker->right_x) + if (x < walker->left_x || x >= walker->right_x) gradient_walker_reset (walker, x); dist = ((int)(x - walker->left_x) * walker->stepper) >> 16; diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 1443bfb..a41d46c 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -306,8 +306,6 @@ typedef struct pixman_gradient_stop_t *stops; int num_stops; pixman_repeat_t repeat; - - pixman_bool_t need_reset; } pixman_gradient_walker_t; void |