mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-04-22 06:02:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix infinite loop when gif total frames != decoded frames

Browse source
This commit is contained in:
Roza 2021-05-09 18:19:46 -04:00
parent 393449e376
commit 6fa276f551
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/display/bitmap.cpp
View file

@ -522,7 +522,12 @@ Bitmap::Bitmap(const char *filename)
// Loop gif (Either it's looping or it's not, at the moment) // Loop gif (Either it's looping or it's not, at the moment)
p->animation.loop = handler.gif->loop_count >= 0; p->animation.loop = handler.gif->loop_count >= 0;
while (handler.gif->decoded_frame < handler.gif->frame_count - 1) { int fcount = handler.gif->frame_count;
int fcount_partial = handler.gif->frame_count_partial;
if (fcount > fcount_partial) {
Debug() << "Non-fatal error reading" << filename << ": Only decoded" << fcount_partial << "out of" << fcount << "frames";
}
while (handler.gif->decoded_frame < fcount_partial - 1) {
TEXFBO texfbo; TEXFBO texfbo;
try { try {
texfbo = shState->texPool().request(p->animation.width, p->animation.height); texfbo = shState->texPool().request(p->animation.width, p->animation.height);
@ -553,7 +558,7 @@ Bitmap::Bitmap(const char *filename)
delete handler.gif_data; delete handler.gif_data;
throw Exception(Exception::MKXPError, "Failed to decode frame GIF frame %i out of %i (Error %i)", throw Exception(Exception::MKXPError, "Failed to decode frame GIF frame %i out of %i (Error %i)",
handler.gif->decoded_frame + 1, handler.gif->frame_count, status); handler.gif->decoded_frame + 1, fcount_partial, status);
} }
} }