mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve type conflict

Browse Source
This commit is contained in:
Nesterov Alexander 2020-05-20 18:05:21 +03:00
parent b7253e3280
commit 735c31bb4a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
3rdparty/quirc/src/quirc.c vendored
View File

@ -27,10 +27,7 @@ struct quirc *quirc_new(void)
{ {
struct quirc *q = malloc(sizeof(*q)); struct quirc *q = malloc(sizeof(*q));
if (!q) memset(q, 0, sizeof(*q));
return NULL;
memset(q, 0, sizeof(*q));
return q; return q;
} }
@ -123,8 +120,10 @@ static const char *const error_table[] = {
const char *quirc_strerror(quirc_decode_error_t err) const char *quirc_strerror(quirc_decode_error_t err)
{ {
if ((int)err >= 0 && (int)err < sizeof(error_table) / sizeof(error_table[0])) if ((int) err >= 0) {
return error_table[err]; if ((unsigned long) err < (unsigned long) (sizeof(error_table) / sizeof(error_table[0])))
return error_table[err];
}
return "Unknown error"; return "Unknown error";
} }