mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Fix formatting.
This commit is contained in:
parent
c59495d215
commit
1057dce2c9
@ -2064,10 +2064,10 @@ static mp_obj_t py_image_find_blobs(uint n_args, const mp_obj_t *args, mp_map_t
|
|||||||
mp_obj_get_array(arg_thresholds[i], &arg_threshold_len, &arg_threshold);
|
mp_obj_get_array(arg_thresholds[i], &arg_threshold_len, &arg_threshold);
|
||||||
if (arg_threshold_len) {
|
if (arg_threshold_len) {
|
||||||
color_thresholds_list_lnk_data_t lnk_data;
|
color_thresholds_list_lnk_data_t lnk_data;
|
||||||
lnk_data.LMin = (arg_threshold_len > 0) ?
|
lnk_data.LMin = (arg_threshold_len > 0) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[0]),
|
||||||
IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[0]), IM_MAX(COLOR_L_MAX, COLOR_GRAYSCALE_MAX)), IM_MIN(COLOR_L_MIN, COLOR_GRAYSCALE_MIN)) : 0;
|
IM_MAX(COLOR_L_MAX, COLOR_GRAYSCALE_MAX)), IM_MIN(COLOR_L_MIN, COLOR_GRAYSCALE_MIN)) : 0;
|
||||||
lnk_data.LMax = (arg_threshold_len > 1)
|
lnk_data.LMax = (arg_threshold_len > 1) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[1]),
|
||||||
? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[1]), IM_MAX(COLOR_L_MAX, COLOR_GRAYSCALE_MAX)), IM_MIN(COLOR_L_MIN, COLOR_GRAYSCALE_MIN)) : 0;
|
IM_MAX(COLOR_L_MAX, COLOR_GRAYSCALE_MAX)), IM_MIN(COLOR_L_MIN, COLOR_GRAYSCALE_MIN)) : 0;
|
||||||
lnk_data.AMin = (arg_threshold_len > 2) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[2]), COLOR_A_MAX), COLOR_A_MIN) : 0;
|
lnk_data.AMin = (arg_threshold_len > 2) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[2]), COLOR_A_MAX), COLOR_A_MIN) : 0;
|
||||||
lnk_data.AMax = (arg_threshold_len > 3) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[3]), COLOR_A_MAX), COLOR_A_MIN) : 0;
|
lnk_data.AMax = (arg_threshold_len > 3) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[3]), COLOR_A_MAX), COLOR_A_MIN) : 0;
|
||||||
lnk_data.BMin = (arg_threshold_len > 4) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[4]), COLOR_B_MAX), COLOR_B_MIN) : 0;
|
lnk_data.BMin = (arg_threshold_len > 4) ? IM_MAX(IM_MIN(mp_obj_get_int(arg_threshold[4]), COLOR_B_MAX), COLOR_B_MIN) : 0;
|
||||||
@ -2102,9 +2102,9 @@ static mp_obj_t py_image_find_blobs(uint n_args, const mp_obj_t *args, mp_map_t
|
|||||||
|
|
||||||
list_t out;
|
list_t out;
|
||||||
fb_alloc_mark();
|
fb_alloc_mark();
|
||||||
imlib_find_blobs(&out, arg_img, &roi, x_stride, y_stride, &thresholds, invert, area_threshold, pixels_threshold, merge, margin,
|
imlib_find_blobs(&out, arg_img, &roi, x_stride, y_stride, &thresholds, invert, area_threshold,
|
||||||
py_image_find_blobs_threshold_cb, threshold_cb_kw_val,
|
pixels_threshold, merge, margin, py_image_find_blobs_threshold_cb, threshold_cb_kw_val,
|
||||||
py_image_find_blobs_merge_cb, merge_cb_kw_val);
|
py_image_find_blobs_merge_cb, merge_cb_kw_val);
|
||||||
fb_alloc_free_till_mark();
|
fb_alloc_free_till_mark();
|
||||||
list_free(&thresholds);
|
list_free(&thresholds);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user