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

Fix RGBGFX reversal (#1425)

Browse Source 
* Print all OoB tilemap IDs before aborting

* Rename `nbTileInstances` to `mapSize`

* Check that reversing doesn't overflow the tile array

---------

Co-authored-by: ISSOtm <me@eldred.fr>
This commit is contained in:
Sylvie
2024-08-08 13:40:41 -04:00
committed by GitHub
parent 747427e801
commit 0cd79c33ef
5 changed files with 146 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/gfx/.gitignore vendored
View File

@@ -6,6 +6,7 @@
/*.rng
# Generated by the test program
/result.2bpp
/result.tilemap
/result.pal
/result.attrmap
/result.png

23
test/gfx/rgbgfx_test.cpp
View File

@@ -432,10 +432,20 @@ int main(int argc, char *argv[]) {
{
char path[] = "../../rgbgfx", out_opt[] = "-o", out_file[] = "result.2bpp",
pal_opt[] = "-p", pal_file[] = "result.pal", attr_opt[] = "-a",
attr_file[] = "result.attrmap", in_file[] = "out0.png";
tmap_opt[] = "-t", tmap_file[] = "result.tilemap", pal_opt[] = "-p",
pal_file[] = "result.pal", attr_opt[] = "-a", attr_file[] = "result.attrmap",
in_file[] = "out0.png";
std::vector<char *> args(
{path, out_opt, out_file, pal_opt, pal_file, attr_opt, attr_file, in_file}
{path,
out_opt,
out_file,
tmap_opt,
tmap_file,
pal_opt,
pal_file,
attr_opt,
attr_file,
in_file}
);
// Also copy the trailing `nullptr`
std::copy_n(&argv[2], argc - 1, std::back_inserter(args));
@@ -449,8 +459,9 @@ int main(int argc, char *argv[]) {
{
char path[] = "../../rgbgfx", reverse_opt[] = "-r", out_opt[] = "-o",
out_file[] = "result.2bpp", pal_opt[] = "-p", pal_file[] = "result.pal",
attr_opt[] = "-a", attr_file[] = "result.attrmap", in_file[] = "result.png";
out_file[] = "result.2bpp", tmap_opt[] = "-t", tmap_file[] = "result.tilemap",
pal_opt[] = "-p", pal_file[] = "result.pal", attr_opt[] = "-a",
attr_file[] = "result.attrmap", in_file[] = "result.png";
auto width_string = std::to_string(image0.getWidth() / 8);
std::vector<char *> args = {
path,
@@ -458,6 +469,8 @@ int main(int argc, char *argv[]) {
width_string.data(),
out_opt,
out_file,
tmap_opt,
tmap_file,
pal_opt,
pal_file,
attr_opt,