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

Create static bitmap from GIF if it only contains one frame

Browse source
This commit is contained in:
Struma 2021-05-03 13:57:10 -04:00 • committed by Roza
parent d7336552eb
commit 8a3470edc7
1 changed files with 31 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/display/bitmap.cpp
View file

@ -431,40 +431,6 @@ struct BitmapOpenHandler : FileSystem::OpenHandler
delete gif_data; delete gif_data;
return false; return false;
} }
/*
// Read every frame
for (int i = 0; i < gif->frame_count; i++) {
int status = gif_decode_frame(&gif, i);
if (status != GIF_OK && status != GIF_WORKING) {
error = "Failed to read GIF frame " + std::to_string(i + 1) + " (Error " + std::to_string(status) + ")";
for (SDL_Surface *s : surfaces)
SDL_FreeSurface(s);
break;
}
if (image_width == -1 || !image_height == -1) {
image_width = gif.width;
image_height = gif.height;
}
else if (gif.width != image_width || gif.height != image_height) {
error = "Failed to read GIF (Varying frame size)";
for (SDL_Surface *s : surfaces)
SDL_FreeSurface(s);
break;
}
if (animation_rate == -1 && gif.frames[gif.decoded_frame].frame_delay) {
animation_rate = 1 / ((float)gif.frames[gif.decoded_frame].frame_delay / 100);
}
SDL_Surface *s = SDL_CreateRGBSurfaceWithFormat(0, gif.width, gif.height, 32, SDL_PIXELFORMAT_ABGR8888);
memcpy(s->pixels, gif.frame_image, gif.width * gif.height * 4);
surfaces.push_back(s);
}
gif_finalise(&gif);
delete data;
*/
} else { } else {
surface = IMG_LoadTyped_RW(&ops, 1, ext); surface = IMG_LoadTyped_RW(&ops, 1, ext);
} }
@ -488,16 +454,41 @@ Bitmap::Bitmap(const char *filename)
if (handler.gif) { if (handler.gif) {
p = new BitmapPrivate(this); p = new BitmapPrivate(this);
if (handler.gif->width >= glState.caps.maxTexSize || handler.gif->height > glState.caps.maxTexSize)
{
throw new Exception(Exception::MKXPError, "Animation too large (%ix%i, max %ix%i)",
handler.gif->width, handler.gif->height, glState.caps.maxTexSize, glState.caps.maxTexSize);
}
if (handler.gif->frame_count == 1) {
TEXFBO texfbo;
try {
texfbo = shState->texPool().request(handler.gif->width, handler.gif->height);
}
catch (const Exception &e)
{
gif_finalise(handler.gif);
delete handler.gif;
delete handler.gif_data;
throw e;
}
TEX::bind(texfbo.tex);
TEX::uploadImage(p->gl.width, p->gl.height, handler.gif->frame_image, GL_RGBA);
gif_finalise(handler.gif);
delete handler.gif;
delete handler.gif_data;
p->addTaintedArea(rect());
return;
}
p->animation.enabled = true; p->animation.enabled = true;
p->animation.width = handler.gif->width; p->animation.width = handler.gif->width;
p->animation.height = handler.gif->height; p->animation.height = handler.gif->height;
if (p->animation.width >= glState.caps.maxTexSize || p->animation.height > glState.caps.maxTexSize)
{
throw new Exception(Exception::MKXPError, "Animation too large (%ix%i, max %ix%i)",
p->animation.width, p->animation.height, glState.caps.maxTexSize, glState.caps.maxTexSize);
}
// Guess framerate based on the first frame's delay // Guess framerate based on the first frame's delay
p->animation.fps = 1 / ((float)handler.gif->frames[handler.gif->decoded_frame].frame_delay / 100); p->animation.fps = 1 / ((float)handler.gif->frames[handler.gif->decoded_frame].frame_delay / 100);
if (p->animation.fps < 0) p->animation.fps = shState->graphics().getFrameRate(); if (p->animation.fps < 0) p->animation.fps = shState->graphics().getFrameRate();
@ -1949,8 +1940,6 @@ void Bitmap::removeFrame(int position) {
p->gl = p->animation.frames[0]; p->gl = p->animation.frames[0];
p->animation.frames.erase(p->animation.frames.begin()); p->animation.frames.erase(p->animation.frames.begin());
p->allocSurface();
FBO::bind(p->gl.fbo); FBO::bind(p->gl.fbo);
gl.ReadPixels(0,0,p->gl.width, p->gl.height, GL_RGBA, GL_UNSIGNED_BYTE, p->surface->pixels); gl.ReadPixels(0,0,p->gl.width, p->gl.height, GL_RGBA, GL_UNSIGNED_BYTE, p->surface->pixels);
taintArea(rect()); taintArea(rect());