Logo (Chafa): fixes setting logo.width with chafa

Regression in v2.51.0

Fixes #1947
This commit is contained in:
李通洲
2025-09-03 10:49:58 +08:00
parent a06e245c34
commit 37ab380a6f
+2 -2
View File
@@ -114,7 +114,7 @@ static bool ffLogoPrintCharsRaw(const char* data, size_t length, bool printError
static uint32_t logoAppendChars(const char* data, bool doColorReplacement, FFstrbuf* result)
{
FFOptionsLogo* options = &instance.config.logo;
uint32_t currentlineLength = options->width;
uint32_t currentlineLength = options->type == FF_LOGO_TYPE_IMAGE_CHAFA ? 0 : options->width; // For chafa, unit of options->width is pixels
uint32_t logoHeight = 0;
if (result)
@@ -260,7 +260,7 @@ static uint32_t logoAppendChars(const char* data, bool doColorReplacement, FFstr
if(currentlineLength > instance.state.logoWidth)
instance.state.logoWidth = currentlineLength;
return options->height > logoHeight ? options->height : logoHeight;
return options->type != FF_LOGO_TYPE_IMAGE_CHAFA && options->height > logoHeight ? options->height : logoHeight;
}
void ffLogoPrintChars(const char* data, bool doColorReplacement)