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

Adjust GIF decoding loop, again

Browse source
This commit is contained in:
Struma 2021-05-23 11:34:24 -04:00 • committed by Roza
parent fd8bd40260
commit 023e9a05a7
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/display/bitmap.cpp
View file

@ -527,7 +527,22 @@ Bitmap::Bitmap(const char *filename)
if (fcount > fcount_partial) { if (fcount > fcount_partial) {
Debug() << "Non-fatal error reading" << filename << ": Only decoded" << fcount_partial << "out of" << fcount << "frames"; Debug() << "Non-fatal error reading" << filename << ": Only decoded" << fcount_partial << "out of" << fcount << "frames";
} }
for (int i = 1; i < fcount_partial; i++) { for (int i = 0; i < fcount_partial; i++) {
if (i > 0) {
int status = gif_decode_frame(handler.gif, i);
if (status != GIF_OK && status != GIF_WORKING) {
for (TEXFBO &frame : p->animation.frames)
shState->texPool().release(frame);
gif_finalise(handler.gif);
delete handler.gif;
delete handler.gif_data;
throw Exception(Exception::MKXPError, "Failed to decode GIF frame %i out of %i (Status %i)",
i + 1, fcount_partial, status);
}
}
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);
@ -547,19 +562,6 @@ Bitmap::Bitmap(const char *filename)
TEX::bind(texfbo.tex); TEX::bind(texfbo.tex);
TEX::uploadImage(p->animation.width, p->animation.height, handler.gif->frame_image, GL_RGBA); TEX::uploadImage(p->animation.width, p->animation.height, handler.gif->frame_image, GL_RGBA);
p->animation.frames.push_back(texfbo); p->animation.frames.push_back(texfbo);
int status = gif_decode_frame(handler.gif, i);
if (status != GIF_OK && status != GIF_WORKING) {
for (TEXFBO &frame : p->animation.frames)
shState->texPool().release(frame);
gif_finalise(handler.gif);
delete handler.gif;
delete handler.gif_data;
throw Exception(Exception::MKXPError, "Failed to decode GIF frame %i out of %i (Error %i)",
i + 1, fcount_partial, status);
}
} }
gif_finalise(handler.gif); gif_finalise(handler.gif);