gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of GPL files

Browse Source 
Can you tell this was *not* tested whatsoever?
This commit is contained in:
ISSOtm
2024-07-26 19:37:02 +02:00
committed by Sylvie
parent 1f8f28cac8
commit 3d1f5386c2
4 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gfx/pal_spec.cpp
View File

@@ -352,24 +352,30 @@ static void parseGPLFile(std::filebuf &file) {
}
uint16_t nbColors = 0;
uint16_t maxNbColors = options.nbColorsPerPal * options.nbPalettes;
uint16_t const maxNbColors = options.nbColorsPerPal * options.nbPalettes;
for (;;) {
line.clear();
requireLine("GPL", file, line);
if (!line.length()) {
if (!readLine(file, line)) {
break;
}
if (line.starts_with("#") || line.starts_with("Name:") || line.starts_with("Column:")) {
if (line.starts_with("Name:") || line.starts_with("Columns:")) {
continue;
}
std::string::size_type n = 0;
skipWhitespace(line, n);
// Skip empty lines, or lines that contain just a comment.
if (line.length() == n || line[n] == '#') {
continue;
}
std::optional<Rgba> color = parseColor(line, n, nbColors + 1);
if (!color) {
return;
}
// Ignore anything following the three components
// (sometimes it's a comment, sometimes it's the color in CSS hex format, sometimes there's nothing...).
if (nbColors < maxNbColors) {
if (nbColors % options.nbColorsPerPal == 0) {
@@ -394,7 +400,7 @@ static void parseHEXFile(std::filebuf &file) {
// https://lospec.com/palette-list/tag/gbc
uint16_t nbColors = 0;
uint16_t maxNbColors = options.nbColorsPerPal * options.nbPalettes;
uint16_t const maxNbColors = options.nbColorsPerPal * options.nbPalettes;
for (;;) {
std::string line;