diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-08 16:54:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-08 16:54:47 +0400 |
commit | 8238cd6992413d8d85e48b9b5dceabbbc49d1d1f (patch) | |
tree | dee20dc71e997db1740005ffe6bab4ecc6ed7951 /source/blender/blenkernel/intern/mask_evaluate.c | |
parent | 5c4f96af2c9fc5afc676cf132e8171a66a973d1b (diff) |
use unsigned int, for mask rasterizer.
Diffstat (limited to 'source/blender/blenkernel/intern/mask_evaluate.c')
-rw-r--r-- | source/blender/blenkernel/intern/mask_evaluate.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index a6d1f18d87f..abbcc7664a8 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -155,7 +155,7 @@ int BKE_mask_spline_differentiate_calc_total(const MaskSpline *spline, const uns } float (*BKE_mask_spline_differentiate_with_resolution_ex(MaskSpline *spline, - int *tot_diff_point, + unsigned int *tot_diff_point, const unsigned int resol ))[2] { @@ -214,7 +214,7 @@ float (*BKE_mask_spline_differentiate_with_resolution_ex(MaskSpline *spline, } float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline, int width, int height, - int *tot_diff_point + unsigned int *tot_diff_point ))[2] { int unsigned resol = BKE_mask_spline_resolution(spline, width, height); @@ -222,7 +222,7 @@ float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline, int wi return BKE_mask_spline_differentiate_with_resolution_ex(spline, tot_diff_point, resol); } -float (*BKE_mask_spline_differentiate(MaskSpline *spline, int *tot_diff_point))[2] +float (*BKE_mask_spline_differentiate(MaskSpline *spline, unsigned int *tot_diff_point))[2] { return BKE_mask_spline_differentiate_with_resolution(spline, 0, 0, tot_diff_point); } @@ -350,7 +350,7 @@ static void feather_bucket_get_diagonal(FeatherEdgesBucket *buckets, int start_b *diagonal_bucket_b_r = &buckets[diagonal_bucket_b_index]; } -void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*feather_points)[2], const int tot_feather_point) +void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*feather_points)[2], const unsigned int tot_feather_point) { #define BUCKET_INDEX(co) \ feather_bucket_index_from_coord(co, min, bucket_scale, buckets_per_side) @@ -360,7 +360,7 @@ void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*fe FeatherEdgesBucket *buckets; - int i; + unsigned int i; float min[2], max[2]; float max_delta_x = -1.0f, max_delta_y = -1.0f, max_delta; @@ -376,7 +376,7 @@ void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*fe INIT_MINMAX2(min, max); for (i = 0; i < tot_feather_point; i++) { - int next = i + 1; + unsigned int next = i + 1; float delta; minmax_v2v2_v2(min, max, feather_points[i]); @@ -508,7 +508,7 @@ void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*fe /** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution_ex() ! */ static float (*mask_spline_feather_differentiated_points_with_resolution_ex__even(MaskSpline *spline, - int *tot_feather_point, + unsigned int *tot_feather_point, const unsigned int resol, const int do_feather_isect ))[2] @@ -581,7 +581,7 @@ static float (*mask_spline_feather_differentiated_points_with_resolution_ex__eve /** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution_ex() ! */ static float (*mask_spline_feather_differentiated_points_with_resolution_ex__double(MaskSpline *spline, - int *tot_feather_point, + unsigned int *tot_feather_point, const unsigned int resol, const int do_feather_isect ))[2] @@ -718,7 +718,7 @@ static float (*mask_spline_feather_differentiated_points_with_resolution_ex__dou * when \a resol arguments match. */ float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(MaskSpline *spline, - int *tot_feather_point, + unsigned int *tot_feather_point, const unsigned int resol, const int do_feather_isect ))[2] @@ -735,14 +735,14 @@ float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(MaskSpl } float (*BKE_mask_spline_feather_differentiated_points_with_resolution(MaskSpline *spline, int width, int height, - int *tot_feather_point, const int do_feather_isect))[2] + unsigned int *tot_feather_point, const int do_feather_isect))[2] { unsigned int resol = BKE_mask_spline_feather_resolution(spline, width, height); return BKE_mask_spline_feather_differentiated_points_with_resolution_ex(spline, tot_feather_point, resol, do_feather_isect); } -float (*BKE_mask_spline_feather_differentiated_points(MaskSpline *spline, int *tot_feather_point))[2] +float (*BKE_mask_spline_feather_differentiated_points(MaskSpline *spline, unsigned int *tot_feather_point))[2] { return BKE_mask_spline_feather_differentiated_points_with_resolution(spline, 0, 0, tot_feather_point, TRUE); } |