github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix warning in test_screenshot_error.h

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2022-09-19 11:19:10 +02:00
parent f1d69ca044
commit d3d11361d9
1 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/unity/unity_support.c
View File

@@ -41,12 +41,12 @@ typedef struct {
png_infop info_ptr; png_infop info_ptr;
int number_of_passes; int number_of_passes;
png_bytep * row_pointers; png_bytep * row_pointers;
}png_img_t; } png_img_t;
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static int read_png_file(png_img_t * p, const char* file_name); static int read_png_file(png_img_t * p, const char * file_name);
static void png_release(png_img_t * p); static void png_release(png_img_t * p);
/********************** /**********************
@@ -79,16 +79,16 @@ bool lv_test_assert_img_eq(const char * fn_ref)
screen_buf = (uint8_t *)test_fb; screen_buf = (uint8_t *)test_fb;
uint8_t * ptr_act = NULL; uint8_t * ptr_act = NULL;
const png_byte* ptr_ref = NULL; const png_byte * ptr_ref = NULL;
bool err = false; bool err = false;
int x, y, i_buf = 0; int x, y, i_buf = 0;
for (y = 0; y < p.height; y++) { for(y = 0; y < p.height; y++) {
png_byte* row = p.row_pointers[y]; png_byte * row = p.row_pointers[y];
for (x = 0; x < p.width; x++) { for(x = 0; x < p.width; x++) {
ptr_ref = &(row[x*3]); ptr_ref = &(row[x * 3]);
ptr_act = &(screen_buf[i_buf*4]); ptr_act = &(screen_buf[i_buf * 4]);
uint32_t ref_px = 0; uint32_t ref_px = 0;
uint32_t act_px = 0; uint32_t act_px = 0;
@@ -119,9 +119,9 @@ bool lv_test_assert_img_eq(const char * fn_ref)
fprintf(f, "static const uint32_t test_screenshot_error_data[] = {\n"); fprintf(f, "static const uint32_t test_screenshot_error_data[] = {\n");
i_buf = 0; i_buf = 0;
for (y = 0; y < 480; y++) { for(y = 0; y < 480; y++) {
fprintf(f, "\n"); fprintf(f, "\n");
for (x = 0; x < 800; x++) { for(x = 0; x < 800; x++) {
ptr_act = &(screen_buf[i_buf * 4]); ptr_act = &(screen_buf[i_buf * 4]);
act_px = 0; act_px = 0;
memcpy(&act_px, ptr_act, 3); memcpy(&act_px, ptr_act, 3);
@@ -137,7 +137,7 @@ bool lv_test_assert_img_eq(const char * fn_ref)
" .header.always_zero = 0,\n" " .header.always_zero = 0,\n"
" .header.cf = LV_IMG_CF_TRUE_COLOR,\n" " .header.cf = LV_IMG_CF_TRUE_COLOR,\n"
" .data_size = 800 * 480 * 4,\n" " .data_size = 800 * 480 * 4,\n"
" .data = test_screenshot_error_data};\n\n" " .data = (const uint8_t *) test_screenshot_error_data};\n\n"
"static inline void test_screenshot_error_show(void)\n" "static inline void test_screenshot_error_show(void)\n"
"{\n" "{\n"
" lv_obj_t * img = lv_img_create(lv_scr_act());\n" " lv_obj_t * img = lv_img_create(lv_scr_act());\n"
@@ -159,19 +159,19 @@ bool lv_test_assert_img_eq(const char * fn_ref)
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/
static int read_png_file(png_img_t * p, const char* file_name) static int read_png_file(png_img_t * p, const char * file_name)
{ {
char header[8]; // 8 is the maximum size that can be checked char header[8]; // 8 is the maximum size that can be checked
/*open file and test for it being a png*/ /*open file and test for it being a png*/
FILE *fp = fopen(file_name, "rb"); FILE * fp = fopen(file_name, "rb");
if (!fp) { if(!fp) {
TEST_PRINTF("%s", "PNG file %s could not be opened for reading"); TEST_PRINTF("%s", "PNG file %s could not be opened for reading");
return -1; return -1;
} }
size_t rcnt = fread(header, 1, 8, fp); size_t rcnt = fread(header, 1, 8, fp);
if (rcnt != 8 || png_sig_cmp((png_const_bytep)header, 0, 8)) { if(rcnt != 8 || png_sig_cmp((png_const_bytep)header, 0, 8)) {
TEST_PRINTF("%s is not recognized as a PNG file", file_name); TEST_PRINTF("%s is not recognized as a PNG file", file_name);
return -1; return -1;
} }
@@ -179,17 +179,17 @@ static int read_png_file(png_img_t * p, const char* file_name)
/*initialize stuff*/ /*initialize stuff*/
p->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); p->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!p->png_ptr) { if(!p->png_ptr) {
TEST_PRINTF("%s", "png_create_read_struct failed"); TEST_PRINTF("%s", "png_create_read_struct failed");
return -1; return -1;
} }
p->info_ptr = png_create_info_struct(p->png_ptr); p->info_ptr = png_create_info_struct(p->png_ptr);
if (!p->info_ptr) { if(!p->info_ptr) {
TEST_PRINTF("%s", "png_create_info_struct failed"); TEST_PRINTF("%s", "png_create_info_struct failed");
return -1; return -1;
} }
if (setjmp(png_jmpbuf(p->png_ptr))) { if(setjmp(png_jmpbuf(p->png_ptr))) {
TEST_PRINTF("%s", "Error during init_io"); TEST_PRINTF("%s", "Error during init_io");
return -1; return -1;
} }
@@ -207,15 +207,15 @@ static int read_png_file(png_img_t * p, const char* file_name)
png_read_update_info(p->png_ptr, p->info_ptr); png_read_update_info(p->png_ptr, p->info_ptr);
/*read file*/ /*read file*/
if (setjmp(png_jmpbuf(p->png_ptr))) { if(setjmp(png_jmpbuf(p->png_ptr))) {
TEST_PRINTF("%s", "Error during read_image"); TEST_PRINTF("%s", "Error during read_image");
return -1; return -1;
} }
p->row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * p->height); p->row_pointers = (png_bytep *) malloc(sizeof(png_bytep) * p->height);
int y; int y;
for (y=0; y<p->height; y++) for(y = 0; y < p->height; y++)
p->row_pointers[y] = (png_byte*) malloc(png_get_rowbytes(p->png_ptr,p->info_ptr)); p->row_pointers[y] = (png_byte *) malloc(png_get_rowbytes(p->png_ptr, p->info_ptr));
png_read_image(p->png_ptr, p->row_pointers); png_read_image(p->png_ptr, p->row_pointers);
@@ -226,7 +226,7 @@ static int read_png_file(png_img_t * p, const char* file_name)
static void png_release(png_img_t * p) static void png_release(png_img_t * p)
{ {
int y; int y;
for (y=0; y<p->height; y++) free(p->row_pointers[y]); for(y = 0; y < p->height; y++) free(p->row_pointers[y]);
free(p->row_pointers); free(p->row_pointers);