consistency: prefer min function to MIN macro

Changes types of scan box dimensions, but uint16_t is more than adequate

Author: Jamie C. Driver

main/camera.c

@@ -176,9 +176,9 @@ static void copy_camera_image_180(
 
 void await_qr_help_activity(const char* url);
 
-size_t camera_displayed_image_width(void) { return UI2CAM(DISPLAY_IMAGE_WIDTH); }
+uint16_t camera_displayed_image_width(void) { return UI2CAM(DISPLAY_IMAGE_WIDTH); }
 
-size_t camera_displayed_image_height(void) { return UI2CAM(DISPLAY_IMAGE_HEIGHT); }
+uint16_t camera_displayed_image_height(void) { return UI2CAM(DISPLAY_IMAGE_HEIGHT); }
 
 gui_activity_t* make_camera_activity(gui_view_node_t** image_node, gui_view_node_t** label_node, bool show_click_btn,
     qr_frame_guides_t qr_frame_guides, progress_bar_t* progress_bar, bool show_help_btn);

main/camera.h

@@ -19,8 +19,8 @@
 #endif
 
 // How much image (central area) is displayed on screen
-size_t camera_displayed_image_width(void);
-size_t camera_displayed_image_height(void);
+uint16_t camera_displayed_image_width(void);
+uint16_t camera_displayed_image_height(void);
 
 // Function to process images from the camera.
 // Should return false if processing incomplete (and so should be called again with the next frame)

main/qrscan.c

@@ -8,9 +8,9 @@
 #include "qrscan.h"
 #include "sensitive.h"
 #include "utils/malloc_ext.h"
+#include "utils/util.h"
 
 #define SCAN_EXTRA_MARGIN 20
-#define MIN(a, b) (a < b ? a : b)
 
 // Inspect qrcodes and try to extract payload - whether any were seen and any
 // string data extracted are stored in the qr_data struct passed.
@@ -132,10 +132,10 @@ bool scan_qr(const size_t width, const size_t height, const uint8_t* data, const
     JADE_ASSERT(qr_data->ds);
 
     // Also correctly size the internal image buffer since we know the size of the camera images/display.
-    const size_t ideal_scan_box_size
-        = MIN(camera_displayed_image_width(), camera_displayed_image_height()) + SCAN_EXTRA_MARGIN;
-    const size_t scan_width = MIN(ideal_scan_box_size, CAMERA_IMAGE_WIDTH);
-    const size_t scan_height = MIN(ideal_scan_box_size, CAMERA_IMAGE_HEIGHT);
+    const uint16_t ideal_scan_box_size
+        = min_u16(camera_displayed_image_width(), camera_displayed_image_height()) + SCAN_EXTRA_MARGIN;
+    const uint16_t scan_width = min_u16(ideal_scan_box_size, CAMERA_IMAGE_WIDTH);
+    const uint16_t scan_height = min_u16(ideal_scan_box_size, CAMERA_IMAGE_HEIGHT);
     const int qret = quirc_resize(qr_data->q, scan_width, scan_height);
     JADE_ASSERT(qret == 0);
     qr_data->len = 0;
@@ -176,10 +176,10 @@ bool jade_camera_scan_qr(
 
     // Also correctly size the internal image buffer since we know the size of the camera images/display.
     // This image buffer is then reused for every camera image frame processed.
-    const size_t ideal_scan_box_size
-        = MIN(camera_displayed_image_width(), camera_displayed_image_height()) + SCAN_EXTRA_MARGIN;
-    const size_t scan_width = MIN(ideal_scan_box_size, CAMERA_IMAGE_WIDTH);
-    const size_t scan_height = MIN(ideal_scan_box_size, CAMERA_IMAGE_HEIGHT);
+    const uint16_t ideal_scan_box_size
+        = min_u16(camera_displayed_image_width(), camera_displayed_image_height()) + SCAN_EXTRA_MARGIN;
+    const uint16_t scan_width = min_u16(ideal_scan_box_size, CAMERA_IMAGE_WIDTH);
+    const uint16_t scan_height = min_u16(ideal_scan_box_size, CAMERA_IMAGE_HEIGHT);
     const int qret = quirc_resize(qr_data->q, scan_width, scan_height);
     JADE_ASSERT(qret == 0);
     qr_data->len = 0;