add badge.eink_png_info(filename or bytestring)

basvs · basvs · commit 65ca2d4886ea · 2017-08-16T21:45:22.000+02:00
diff --git a/esp32/modbadge.c b/esp32/modbadge.c
@@ -370,6 +370,75 @@ STATIC mp_obj_t badge_eink_png(mp_obj_t obj_x, mp_obj_t obj_y, mp_obj_t obj_file
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(badge_eink_png_obj, badge_eink_png);
 
+STATIC mp_obj_t badge_eink_png_info(mp_obj_t obj_filename)
+{
+	lib_reader_read_t reader;
+	void * reader_p;
+
+	bool is_bytes = MP_OBJ_IS_TYPE(obj_filename, &mp_type_bytes);
+
+	if (is_bytes) {
+		size_t len;
+		const uint8_t* png_data = (const uint8_t *) mp_obj_str_get_data(obj_filename, &len);
+		struct lib_mem_reader *mr = lib_mem_new(png_data, len);
+		if (mr == NULL)
+		{
+			nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "out of memory!"));
+			return mp_const_none;
+		}
+		reader = (lib_reader_read_t) &lib_mem_read;
+		reader_p = mr;
+
+	} else {
+		const char* filename = mp_obj_str_get_str(obj_filename);
+		struct lib_file_reader *fr = lib_file_new(filename, 1024);
+		if (fr == NULL)
+		{
+			nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Could not open file '%s'!",filename));
+			return mp_const_none;
+		}
+		reader = (lib_reader_read_t) &lib_file_read;
+		reader_p = fr;
+	}
+
+	struct lib_png_reader *pr = lib_png_new(reader, reader_p);
+	if (pr == NULL)
+	{
+		if (is_bytes) {
+			lib_mem_destroy(reader_p);
+		} else {
+			lib_file_destroy(reader_p);
+		}
+		nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "out of memory."));
+		return mp_const_none;
+	}
+
+	int res = lib_png_read_header(pr);
+
+	mp_obj_t tuple[4];
+	if (res >= 0) {
+		tuple[0] = mp_obj_new_int(pr->ihdr.width);
+		tuple[1] = mp_obj_new_int(pr->ihdr.height);
+		tuple[2] = mp_obj_new_int(pr->ihdr.bit_depth);
+		tuple[3] = mp_obj_new_int(pr->ihdr.color_type);
+	}
+
+	lib_png_destroy(pr);
+	if (is_bytes) {
+		lib_mem_destroy(reader_p);
+	} else {
+		lib_file_destroy(reader_p);
+	}
+
+	if (res < 0)
+	{
+		nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "failed to load image: res = %d", res));
+	}
+
+	return mp_obj_new_tuple(4, tuple);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(badge_eink_png_info_obj, badge_eink_png_info);
+
 /* END OF PNG READER TEST */
 
 
@@ -675,6 +744,7 @@ STATIC const mp_rom_map_elem_t badge_module_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR_eink_busy_wait), MP_ROM_PTR(&badge_eink_busy_wait_obj)},
 
     {MP_ROM_QSTR(MP_QSTR_eink_png), MP_ROM_PTR(&badge_eink_png_obj)},
+    {MP_ROM_QSTR(MP_QSTR_eink_png_info), MP_ROM_PTR(&badge_eink_png_info_obj)},
     {MP_ROM_QSTR(MP_QSTR_eink_display_raw), MP_ROM_PTR(&badge_eink_display_raw_obj)},
 
 /*
