Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rtext] BMFont loading, support RGB and RGBA image formats #4730

Closed
wants to merge 6 commits into from
Closed

[rtext] BMFont loading, support RGB and RGBA image formats #4730

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4583ce
Added RGB and RGBA image support to BMFont loader
Jan 26, 2025
c7f7fa9
Formatting changes
Jan 26, 2025
8414d6e
Added unsupported pixel format log warning
Jan 26, 2025
6e2c28c
Oops, got the order on the log warning print wrong.
Jan 26, 2025
5e8a67e
Formatting changes
Jan 27, 2025
8856ec6
Name change for RGBA case
Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 35 additions & 18 deletions src/rtext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,26 +2227,43 @@
{
imFonts[i] = LoadImage(TextFormat("%s/%s", GetDirectoryPath(fileName), imFileName[i]));

if (imFonts[i].format == PIXELFORMAT_UNCOMPRESSED_GRAYSCALE)
int pageFormat = imFonts[i].format;

if (pageFormat != PIXELFORMAT_UNCOMPRESSED_GRAYSCALE && pageFormat != PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 && pageFormat != PIXELFORMAT_UNCOMPRESSED_R8G8B8)
{
// Convert image to GRAYSCALE + ALPHA, using the mask as the alpha channel
Image imFontAlpha = {
.data = RL_CALLOC(imFonts[i].width*imFonts[i].height, 2),
.width = imFonts[i].width,
.height = imFonts[i].height,
.mipmaps = 1,
.format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA
};

for (int p = 0, pi = 0; p < (imFonts[i].width*imFonts[i].height*2); p += 2, pi++)
{
((unsigned char *)(imFontAlpha.data))[p] = 0xff;
((unsigned char *)(imFontAlpha.data))[p + 1] = ((unsigned char *)imFonts[i].data)[pi];
}

UnloadImage(imFonts[i]);
imFonts[i] = imFontAlpha;
TRACELOG(LOG_WARNING, "FONT: [%s] Page number %i used an unsupported pixel format", fileName, i);
continue;
}

// Convert image to GRAYSCALE + ALPHA, using the mask as the alpha channel

Image imFont = {
.data = RL_CALLOC(imFonts[i].width * imFonts[i].height, 2),

Check failure

Code scanning / CodeQL

Uncontrolled allocation size High

This allocation size is derived from
user input (string read by fread)
Loading
and could allocate arbitrary amounts of memory.
.width = imFonts[i].width,
.height = imFonts[i].height,
.mipmaps = 1,
.format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA
};

int stride = 1;

if (pageFormat == PIXELFORMAT_UNCOMPRESSED_R8G8B8)
{
stride = 3;
}
else if (pageFormat == PIXELFORMAT_UNCOMPRESSED_R8G8B8A8)
{
stride = 4;
}

for (int p = 0, pi = 0; p < (imFonts[i].width * imFonts[i].height * 2); p += 2, pi++)
{
((unsigned char *)(imFont.data))[p] = 0xff;
((unsigned char *)(imFont.data))[p + 1] = ((unsigned char *)imFonts[i].data)[pi * stride];
}

UnloadImage(imFonts[i]);
imFonts[i] = imFont;
}

Image fullFont = imFonts[0];
Expand Down
Loading