mirror of
https://github.com/0xFEEDC0DE64/arduino-esp32.git
synced 2025-07-01 04:50:58 +02:00
Update IDF to v3.2 977854975 (#2771)
* Update IDF to v3.2 977854975 * Update app_httpd.cpp
This commit is contained in:
@ -27,6 +27,7 @@ extern "C"
|
||||
{
|
||||
#endif
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#include "mtmn.h"
|
||||
|
||||
#define MAX_VALID_COUNT_PER_IMAGE (30)
|
||||
@ -57,6 +58,7 @@ extern "C"
|
||||
|
||||
typedef struct tag_box_list
|
||||
{
|
||||
fptp_t *score;
|
||||
box_t *box;
|
||||
landmark_t *landmark;
|
||||
int len;
|
||||
@ -142,12 +144,19 @@ extern "C"
|
||||
for (int i = 0; i < boxes->len; i++)
|
||||
{
|
||||
box_t *box = &(boxes->box[i]);
|
||||
float w, h;
|
||||
image_get_width_and_height(box, &w, &h);
|
||||
float l = DL_IMAGE_MAX(w, h);
|
||||
|
||||
box->box_p[0] = DL_IMAGE_MAX(0, box->box_p[0] + 0.5 * (w - l));
|
||||
box->box_p[1] = DL_IMAGE_MAX(0, box->box_p[1] + 0.5 * (h - l));
|
||||
int x1 = round(box->box_p[0]);
|
||||
int y1 = round(box->box_p[1]);
|
||||
int x2 = round(box->box_p[2]);
|
||||
int y2 = round(box->box_p[3]);
|
||||
|
||||
int w = x2 - x1 + 1;
|
||||
int h = y2 - y1 + 1;
|
||||
int l = DL_IMAGE_MAX(w, h);
|
||||
|
||||
box->box_p[0] = round(DL_IMAGE_MAX(0, x1) + 0.5 * (w - l));
|
||||
box->box_p[1] = round(DL_IMAGE_MAX(0, y1) + 0.5 * (h - l));
|
||||
|
||||
box->box_p[2] = box->box_p[0] + l - 1;
|
||||
if (box->box_p[2] > width)
|
||||
{
|
||||
@ -215,6 +224,25 @@ extern "C"
|
||||
*/
|
||||
void image_nms_process(image_list_t *image_list, fptp_t nms_threshold, int same_area);
|
||||
|
||||
/**
|
||||
* @brief
|
||||
*
|
||||
* @param dimage
|
||||
* @param dw
|
||||
* @param dh
|
||||
* @param dc
|
||||
* @param simage
|
||||
* @param sw
|
||||
* @param sc
|
||||
*/
|
||||
void image_zoom_in_twice(uint8_t *dimage,
|
||||
int dw,
|
||||
int dh,
|
||||
int dc,
|
||||
uint8_t *simage,
|
||||
int sw,
|
||||
int sc);
|
||||
|
||||
/**
|
||||
* @brief
|
||||
*
|
||||
|
Reference in New Issue
Block a user