From 7204a357585fe14b9b960ad18715c10c87e246bd Mon Sep 17 00:00:00 2001 From: Ibrahim Abd Elkader Date: Fri, 28 Apr 2017 18:01:11 +0200 Subject: [PATCH] Revert "Add image.raw() function." --- src/omv/py/mp.h | 1 - src/omv/py/py_image.c | 17 ----------------- src/omv/py/qstrdefsomv.h | 1 - 3 files changed, 19 deletions(-) diff --git a/src/omv/py/mp.h b/src/omv/py/mp.h index f19a89e41..f23786e36 100644 --- a/src/omv/py/mp.h +++ b/src/omv/py/mp.h @@ -21,7 +21,6 @@ #include "parse.h" #include "obj.h" #include "objtuple.h" -#include "objstr.h" #include "runtime.h" #include "stream.h" #include "gc.h" diff --git a/src/omv/py/py_image.c b/src/omv/py/py_image.c index bbbcbbf4f..6c7a6efd4 100644 --- a/src/omv/py/py_image.c +++ b/src/omv/py/py_image.c @@ -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; } -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) { 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_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_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_for_ide_obj, 1, py_image_compress_for_ide); 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_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_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_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}, diff --git a/src/omv/py/qstrdefsomv.h b/src/omv/py/qstrdefsomv.h index ba333ded1..3b7ded296 100644 --- a/src/omv/py/qstrdefsomv.h +++ b/src/omv/py/qstrdefsomv.h @@ -30,7 +30,6 @@ Q(match_descriptor) Q(copy) Q(copy_to_fb) Q(save) -Q(raw) Q(compress) Q(compress_for_ide) Q(compressed)