mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Merge pull request #221 from openmv/revert-220-add_raw_function
Revert "Add image.raw() function." Function py_image_subscr allows pixel access.
This commit is contained in:
commit
3ca451a5be
@ -21,7 +21,6 @@
|
|||||||
#include "parse.h"
|
#include "parse.h"
|
||||||
#include "obj.h"
|
#include "obj.h"
|
||||||
#include "objtuple.h"
|
#include "objtuple.h"
|
||||||
#include "objstr.h"
|
|
||||||
#include "runtime.h"
|
#include "runtime.h"
|
||||||
#include "stream.h"
|
#include "stream.h"
|
||||||
#include "gc.h"
|
#include "gc.h"
|
||||||
|
|||||||
@ -265,21 +265,6 @@ static mp_obj_t py_image_save(uint n_args, const mp_obj_t *args, mp_map_t *kw_ar
|
|||||||
return mp_const_none;
|
return mp_const_none;
|
||||||
}
|
}
|
||||||
|
|
||||||
static mp_obj_t py_image_raw(mp_obj_t img_obj)
|
|
||||||
{
|
|
||||||
image_t *arg_img = py_image_cobj(img_obj);
|
|
||||||
PY_ASSERT_FALSE_MSG(IM_IS_JPEG(arg_img), "Operation not supported on JPEG.");
|
|
||||||
byte *data = arg_img->pixels;
|
|
||||||
int len = arg_img->w * arg_img->h * arg_img->bpp;
|
|
||||||
printf("%d\n", len);
|
|
||||||
mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
|
|
||||||
o->base.type = &mp_type_bytes;
|
|
||||||
o->hash = qstr_compute_hash(data, len);
|
|
||||||
o->len = len;
|
|
||||||
o->data = data;
|
|
||||||
return MP_OBJ_FROM_PTR(o);
|
|
||||||
}
|
|
||||||
|
|
||||||
static mp_obj_t py_image_compress(uint n_args, const mp_obj_t *args, mp_map_t *kw_args)
|
static mp_obj_t py_image_compress(uint n_args, const mp_obj_t *args, mp_map_t *kw_args)
|
||||||
{
|
{
|
||||||
image_t *arg_img = py_image_cobj(args[0]);
|
image_t *arg_img = py_image_cobj(args[0]);
|
||||||
@ -2853,7 +2838,6 @@ static mp_obj_t py_image_find_hog(uint n_args, const mp_obj_t *args, mp_map_t *k
|
|||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_copy_obj, 1, py_image_copy);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_copy_obj, 1, py_image_copy);
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_copy_to_fb_obj, 1, py_image_copy_to_fb);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_copy_to_fb_obj, 1, py_image_copy_to_fb);
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_save_obj, 2, py_image_save);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_save_obj, 2, py_image_save);
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_image_raw_obj, py_image_raw);
|
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_compress_obj, 1, py_image_compress);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_compress_obj, 1, py_image_compress);
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_compress_for_ide_obj, 1, py_image_compress_for_ide);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_compress_for_ide_obj, 1, py_image_compress_for_ide);
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_compressed_obj, 1, py_image_compressed);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_image_compressed_obj, 1, py_image_compressed);
|
||||||
@ -2929,7 +2913,6 @@ static const mp_map_elem_t locals_dict_table[] = {
|
|||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&py_image_copy_obj},
|
{MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&py_image_copy_obj},
|
||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_copy_to_fb), (mp_obj_t)&py_image_copy_to_fb_obj},
|
{MP_OBJ_NEW_QSTR(MP_QSTR_copy_to_fb), (mp_obj_t)&py_image_copy_to_fb_obj},
|
||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_save), (mp_obj_t)&py_image_save_obj},
|
{MP_OBJ_NEW_QSTR(MP_QSTR_save), (mp_obj_t)&py_image_save_obj},
|
||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_raw), (mp_obj_t)&py_image_raw_obj},
|
|
||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_compress), (mp_obj_t)&py_image_compress_obj},
|
{MP_OBJ_NEW_QSTR(MP_QSTR_compress), (mp_obj_t)&py_image_compress_obj},
|
||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_compress_for_ide), (mp_obj_t)&py_image_compress_for_ide_obj},
|
{MP_OBJ_NEW_QSTR(MP_QSTR_compress_for_ide), (mp_obj_t)&py_image_compress_for_ide_obj},
|
||||||
{MP_OBJ_NEW_QSTR(MP_QSTR_compressed), (mp_obj_t)&py_image_compressed_obj},
|
{MP_OBJ_NEW_QSTR(MP_QSTR_compressed), (mp_obj_t)&py_image_compressed_obj},
|
||||||
|
|||||||
@ -30,7 +30,6 @@ Q(match_descriptor)
|
|||||||
Q(copy)
|
Q(copy)
|
||||||
Q(copy_to_fb)
|
Q(copy_to_fb)
|
||||||
Q(save)
|
Q(save)
|
||||||
Q(raw)
|
|
||||||
Q(compress)
|
Q(compress)
|
||||||
Q(compress_for_ide)
|
Q(compress_for_ide)
|
||||||
Q(compressed)
|
Q(compressed)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user