old
/
legacy-imlib2
3
0
Fork 4
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Y4M loader: Guard some debug code properly 

str is effectively unused when compiling without debug.

Also, don't cast away const and drop some unnecessary casts
This commit is contained in:
Kim Woelders 2023-12-28 15:40:13 +01:00
parent 96e04dd8cf
commit 1bdc69a6a1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/loaders/loader_y4m.c
View File

@ -164,16 +164,18 @@ y4m__parse_params(Y4mParse * res, const uint8_t ** start, const uint8_t * end)
int rate_num;
int rate_den;
int nlen;
if (sscanf((char *)p, "%i:%i%n", &rate_num, &rate_den, &nlen) < 2) {
if (sscanf((const char *)p, "%i:%i%n", &rate_num, &rate_den, &nlen) < 2) {
return Y4M_PARSE_CORRUPTED;
}
p += nlen;
if (rate_num == rate_den) {
res->fps = Y4M_PARSE_FPS_1;
} else {
#if IMLIB2_DEBUG
char str[1024];
sscanf((char *)(p-1), "%s", (char *)&str);
sscanf((const char *)(p-1), "%s", str);
D("%s: unknown frame rate: '%s'\n", __func__, str);
#endif
res->fps = Y4M_PARSE_FPS_OTHER;
}
}
@ -188,9 +190,11 @@ y4m__parse_params(Y4mParse * res, const uint8_t ** start, const uint8_t * end)
else if (y4m__match("m", 1, &p, end))
res->interlacing = Y4M_PARSE_IL_MIXED;
else {
#if IMLIB2_DEBUG
char str[1024];
sscanf((char *)(p-1), "%s", (char *)&str);
sscanf((const char *)(p-1), "%s", str);
D("%s: unknown interlace type: '%s'\n", __func__, str);
#endif
return Y4M_PARSE_CORRUPTED;
}
break;
@ -210,9 +214,11 @@ y4m__parse_params(Y4mParse * res, const uint8_t ** start, const uint8_t * end)
else if (y4m__match("444 ", 4, &p, end))
res->colour_space = Y4M_PARSE_CS_444;
else {
#if IMLIB2_DEBUG
char str[1024];
sscanf((char *)(p-1), "%s", (char *)&str);
sscanf((const char *)(p-1), "%s", str);
D("%s: unknown color type: '%s'\n", __func__, str);
#endif
return Y4M_PARSE_CORRUPTED;
}
break;