Remove min() and max()

These already exist in ulab numpy as minimum() and maximum(). Removing helps keep the firmware a bit smaller without losing any functionality.

Author: sfe-SparkFro

src/core.cpp

@@ -41,61 +41,3 @@ mp_obj_t cv2_core_inRange(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_
     // Return the result
     return mat_to_mp_obj(dst);
 }
-
-mp_obj_t cv2_core_max(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    // Define the arguments
-    enum { ARG_src1, ARG_src2, ARG_dst };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_src1, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } },
-        { MP_QSTR_src2, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } },
-        { MP_QSTR_dst, MP_ARG_OBJ, { .u_obj = mp_const_none } },
-    };
-
-    // Parse the arguments
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // Convert arguments to required types
-    Mat src1 = mp_obj_to_mat(args[ARG_src1].u_obj);
-    Mat src2 = mp_obj_to_mat(args[ARG_src2].u_obj);
-    Mat dst = mp_obj_to_mat(args[ARG_dst].u_obj);
-
-    // Call the corresponding OpenCV function
-    try {
-        max(src1, src2, dst);
-    } catch(Exception& e) {
-        mp_raise_msg(&mp_type_Exception, MP_ERROR_TEXT(e.what()));
-    }
-    
-    // Return the result
-    return mat_to_mp_obj(dst);
-}
-
-mp_obj_t cv2_core_min(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    // Define the arguments
-    enum { ARG_src1, ARG_src2, ARG_dst };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_src1, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } },
-        { MP_QSTR_src2, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } },
-        { MP_QSTR_dst, MP_ARG_OBJ, { .u_obj = mp_const_none } },
-    };
-
-    // Parse the arguments
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // Convert arguments to required types
-    Mat src1 = mp_obj_to_mat(args[ARG_src1].u_obj);
-    Mat src2 = mp_obj_to_mat(args[ARG_src2].u_obj);
-    Mat dst = mp_obj_to_mat(args[ARG_dst].u_obj);
-
-    // Call the corresponding OpenCV function
-    try {
-        min(src1, src2, dst);
-    } catch(Exception& e) {
-        mp_raise_msg(&mp_type_Exception, MP_ERROR_TEXT(e.what()));
-    }
-
-    // Return the result
-    return mat_to_mp_obj(dst);
-}

src/core.h

@@ -2,5 +2,3 @@
 #include "py/runtime.h"
 
 extern mp_obj_t cv2_core_inRange(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-extern mp_obj_t cv2_core_max(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-extern mp_obj_t cv2_core_min(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);

src/opencv_upy.c

@@ -7,8 +7,6 @@
 
 // OpenCV core module
 static MP_DEFINE_CONST_FUN_OBJ_KW(cv2_core_inRange_obj, 3, cv2_core_inRange);
-static MP_DEFINE_CONST_FUN_OBJ_KW(cv2_core_max_obj, 2, cv2_core_max);
-static MP_DEFINE_CONST_FUN_OBJ_KW(cv2_core_min_obj, 2, cv2_core_min);
 
 // OpenCV imgproc module
 static MP_DEFINE_CONST_FUN_OBJ_KW(cv2_imgproc_arrowedLine_obj, 4, cv2_imgproc_arrowedLine);
@@ -153,8 +151,6 @@ static const mp_rom_map_elem_t cv2_module_globals_table[] = {
     ////////////////////////////////////////////////////////////////////////////
 
     { MP_ROM_QSTR(MP_QSTR_inRange), MP_ROM_PTR(&cv2_core_inRange_obj) },
-    { MP_ROM_QSTR(MP_QSTR_max), MP_ROM_PTR(&cv2_core_max_obj) },
-    { MP_ROM_QSTR(MP_QSTR_min), MP_ROM_PTR(&cv2_core_min_obj) },
 
     ////////////////////////////////////////////////////////////////////////////
     // OpenCV imgproc functions