aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-05 22:41:57 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-10 13:50:26 +0100
commit357e339898204f5c1dfdcc96fc52ffdc293d5781 (patch)
tree4312c7d10d45323c83a984d8a6a08e5a26a0dbe1 /libavcodec
parent64634e809f2e7b6c1a1ea3f6952a17c5915c3f22 (diff)
downloadffmpeg-357e339898204f5c1dfdcc96fc52ffdc293d5781.tar.gz
avcodec/xpmdec: Avoid unnecessary size_t->int conversion
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/xpmdec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c
index 5bc02378c8..e7f8a90fdc 100644
--- a/libavcodec/xpmdec.c
+++ b/libavcodec/xpmdec.c
@@ -233,14 +233,12 @@ static size_t mod_strcspn(const char *string, const char *reject)
return i;
}
-static uint32_t color_string_to_rgba(const char *p, int len)
+static uint32_t color_string_to_rgba(const char *p, size_t len)
{
uint32_t ret = 0xFF000000;
const ColorEntry *entry;
char color_name[100];
- len = FFMIN(FFMAX(len, 0), sizeof(color_name) - 1);
-
if (*p == '#') {
p++;
len--;
@@ -271,6 +269,7 @@ static uint32_t color_string_to_rgba(const char *p, int len)
(hex_char_to_number(p[0]) << 28);
}
} else {
+ len = FFMIN(len, sizeof(color_name) - 1);
strncpy(color_name, p, len);
color_name[len] = '\0';
@@ -375,7 +374,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p,
for (i = 0; i < ncolors; i++) {
const uint8_t *index;
- int len;
+ size_t len;
ptr += mod_strcspn(ptr, "\"") + 1;
if (end - ptr < cpp)