Update MP branch

This commit is contained in:
iabdalkader 2014-09-10 23:16:37 +02:00
parent 7bb8bef8a1
commit b8d989be57
3 changed files with 11 additions and 5 deletions

View File

@ -193,8 +193,6 @@ OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/,\
diskio.o \
storage.o \
file.o \
math.o \
mathsincos.o \
rtc.o \
pin.o \
timer.o \
@ -203,6 +201,14 @@ OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/,\
modstm.o \
)
OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/libm/,\
atanf.o \
atan2f.o \
math.o \
mathsincos.o \
)
OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/usbdev/, \
core/src/usbd_core.o \
core/src/usbd_ctlreq.o \

@ -1 +1 @@
Subproject commit c5f2d1507502601abde29d6368fce27171c3185c
Subproject commit 2d1391816921da7011e54f760d3ee0d6fadd58db

View File

@ -77,7 +77,7 @@ static void py_image_print(void (*print)(void *env, const char *fmt, ...), void
print(env, "<image width:%d height:%d bpp:%d>", self->_cobj.w, self->_cobj.h, self->_cobj.bpp);
}
static mp_int_t py_image_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags) {
static mp_int_t py_image_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
image_t *image = py_image_cobj(self_in);
if (flags == MP_BUFFER_READ) {
@ -839,7 +839,7 @@ int py_image_descriptor_from_roi(image_t *image, const char *path, rectangle_t *
int kpts_size = 0;
kp_t *kpts = NULL;
int threshold = 2;
int threshold = 10;
bool normalized = false;
kpts = fast_detect(image, threshold, &kpts_size, roi);