diff options
Diffstat (limited to 'source/blender/blenkernel/intern/mask_evaluate.c')
-rw-r--r-- | source/blender/blenkernel/intern/mask_evaluate.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index 3425510c8b9..7ece6946e00 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -24,10 +24,10 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -unsigned int BKE_mask_spline_resolution(MaskSpline *spline, int width, int height) +uint BKE_mask_spline_resolution(MaskSpline *spline, int width, int height) { float max_segment = 0.01f; - unsigned int i, resol = 1; + uint i, resol = 1; if (width != 0 && height != 0) { max_segment = 1.0f / (float)max_ii(width, height); @@ -37,7 +37,7 @@ unsigned int BKE_mask_spline_resolution(MaskSpline *spline, int width, int heigh MaskSplinePoint *point = &spline->points[i]; BezTriple *bezt_curr, *bezt_next; float a, b, c, len; - unsigned int cur_resol; + uint cur_resol; bezt_curr = &point->bezt; bezt_next = BKE_mask_spline_point_next_bezt(spline, spline->points, point); @@ -63,10 +63,10 @@ unsigned int BKE_mask_spline_resolution(MaskSpline *spline, int width, int heigh return CLAMPIS(resol, 1, MASK_RESOL_MAX); } -unsigned int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, int height) +uint BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, int height) { const float max_segment = 0.005; - unsigned int resol = BKE_mask_spline_resolution(spline, width, height); + uint resol = BKE_mask_spline_resolution(spline, width, height); float max_jump = 0.0f; /* avoid checking the featrher if we already hit the maximum value */ @@ -102,7 +102,7 @@ unsigned int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, i return CLAMPIS(resol, 1, MASK_RESOL_MAX); } -int BKE_mask_spline_differentiate_calc_total(const MaskSpline *spline, const unsigned int resol) +int BKE_mask_spline_differentiate_calc_total(const MaskSpline *spline, const uint resol) { if (spline->flag & MASK_SPLINE_CYCLIC) { return spline->tot_point * resol; @@ -112,8 +112,8 @@ int BKE_mask_spline_differentiate_calc_total(const MaskSpline *spline, const uns } float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline, - const unsigned int resol, - unsigned int *r_tot_diff_point))[2] + const uint resol, + uint *r_tot_diff_point))[2] { MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline); @@ -176,7 +176,7 @@ float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline, } float (*BKE_mask_spline_differentiate( - MaskSpline *spline, int width, int height, unsigned int *r_tot_diff_point))[2] + MaskSpline *spline, int width, int height, uint *r_tot_diff_point))[2] { uint resol = BKE_mask_spline_resolution(spline, width, height); @@ -316,7 +316,7 @@ static void feather_bucket_get_diagonal(FeatherEdgesBucket *buckets, void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, float (*feather_points)[2], - const unsigned int tot_feather_point) + const uint tot_feather_point) { #define BUCKET_INDEX(co) feather_bucket_index_from_coord(co, min, bucket_scale, buckets_per_side) @@ -340,7 +340,7 @@ void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, INIT_MINMAX2(min, max); for (uint i = 0; i < tot_feather_point; i++) { - unsigned int next = i + 1; + uint next = i + 1; float delta; minmax_v2v2_v2(min, max, feather_points[i]); @@ -489,11 +489,11 @@ void BKE_mask_spline_feather_collapse_inner_loops(MaskSpline *spline, } /** only called from #BKE_mask_spline_feather_differentiated_points_with_resolution() ! */ -static float (*mask_spline_feather_differentiated_points_with_resolution__even( - MaskSpline *spline, - const unsigned int resol, - const bool do_feather_isect, - unsigned int *r_tot_feather_point))[2] +static float ( + *mask_spline_feather_differentiated_points_with_resolution__even(MaskSpline *spline, + const uint resol, + const bool do_feather_isect, + uint *r_tot_feather_point))[2] { MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline); MaskSplinePoint *point_curr, *point_prev; |