From a13205c215f879c0e63d736fca2f56028b243ffa Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 2 Nov 2021 15:21:49 +0000 Subject: GIF: Rename frame to frame_idx through decode function. --- src/libnsgif.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/libnsgif.c b/src/libnsgif.c index e3cb1b5..aa8fc83 100644 --- a/src/libnsgif.c +++ b/src/libnsgif.c @@ -936,7 +936,7 @@ gif_decode_frame_exit: */ static gif_result gif_internal_decode_frame(gif_animation *gif, - uint32_t frame) + uint32_t frame_idx) { gif_result ret; uint8_t *gif_data, *gif_end; @@ -948,22 +948,22 @@ gif_internal_decode_frame(gif_animation *gif, uint32_t save_buffer_position; /* Ensure this frame is supposed to be decoded */ - if (gif->frames[frame].display == false) { + if (gif->frames[frame_idx].display == false) { return GIF_OK; } /* Ensure the frame is in range to decode */ - if (frame > gif->frame_count_partial) { + if (frame_idx > gif->frame_count_partial) { return GIF_INSUFFICIENT_DATA; } /* done if frame is already decoded */ - if (((int)frame == gif->decoded_frame)) { + if (((int)frame_idx == gif->decoded_frame)) { return GIF_OK; } /* Get the start of our frame data and the end of the GIF data */ - gif_data = gif->gif_data + gif->frames[frame].frame_pointer; + gif_data = gif->gif_data + gif->frames[frame_idx].frame_pointer; gif_end = gif->gif_data + gif->buffer_size; gif_bytes = (gif_end - gif_data); @@ -972,28 +972,28 @@ gif_internal_decode_frame(gif_animation *gif, gif->buffer_position = gif_data - gif->gif_data; /* Skip any extensions because they have already been processed */ - ret = gif__parse_frame_extensions(gif, &gif->frames[frame], false); + ret = gif__parse_frame_extensions(gif, &gif->frames[frame_idx], false); if (ret != GIF_OK) { goto gif_decode_frame_exit; } - ret = gif__parse_image_descriptor(gif, &gif->frames[frame], false); + ret = gif__parse_image_descriptor(gif, &gif->frames[frame_idx], false); if (ret != GIF_OK) { goto gif_decode_frame_exit; } - ret = gif__parse_colour_table(gif, &gif->frames[frame], true); + ret = gif__parse_colour_table(gif, &gif->frames[frame_idx], true); if (ret != GIF_OK) { return ret; } gif_data = gif->gif_data + gif->buffer_position; gif_bytes = (gif_end - gif_data); - offset_x = gif->frames[frame].redraw_x; - offset_y = gif->frames[frame].redraw_y; - width = gif->frames[frame].redraw_width; - height = gif->frames[frame].redraw_height; - interlace = gif->frames[frame].flags & GIF_INTERLACE_MASK; + offset_x = gif->frames[frame_idx].redraw_x; + offset_y = gif->frames[frame_idx].redraw_y; + width = gif->frames[frame_idx].redraw_width; + height = gif->frames[frame_idx].redraw_height; + interlace = gif->frames[frame_idx].flags & GIF_INTERLACE_MASK; colour_table = gif->colour_table; @@ -1043,20 +1043,20 @@ gif_internal_decode_frame(gif_animation *gif, * the background colour or this is the first frame, clear * the frame data */ - if (frame == 0 || gif->decoded_frame == GIF_INVALID_FRAME) { + if (frame_idx == 0 || gif->decoded_frame == GIF_INVALID_FRAME) { memset((char*)frame_data, GIF_TRANSPARENT_COLOUR, gif->width * gif->height * sizeof(*frame_data)); - } else if ((frame != 0) && - (gif->frames[frame - 1].disposal_method == GIF_FRAME_CLEAR)) { - ret = gif_clear_frame(gif, &gif->frames[frame - 1], frame_data); + } else if ((frame_idx != 0) && + (gif->frames[frame_idx - 1].disposal_method == GIF_FRAME_CLEAR)) { + ret = gif_clear_frame(gif, &gif->frames[frame_idx - 1], frame_data); if (ret != GIF_OK) { goto gif_decode_frame_exit; } - } else if ((frame != 0) && - (gif->frames[frame - 1].disposal_method == GIF_FRAME_RESTORE)) { + } else if ((frame_idx != 0) && + (gif->frames[frame_idx - 1].disposal_method == GIF_FRAME_RESTORE)) { /* * If the previous frame's disposal method requires we * restore the previous image, restore our saved image. @@ -1072,15 +1072,15 @@ gif_internal_decode_frame(gif_animation *gif, } } - if (gif->frames[frame].disposal_method == GIF_FRAME_RESTORE) { + if (gif->frames[frame_idx].disposal_method == GIF_FRAME_RESTORE) { /* Store the previous frame for later restoration */ gif__record_previous_frame(gif); } - gif->decoded_frame = frame; + gif->decoded_frame = frame_idx; gif->buffer_position = (gif_data - gif->gif_data) + 1; - ret = gif__decode(gif, frame, width, height, + ret = gif__decode(gif, frame_idx, width, height, offset_x, offset_y, interlace, gif_data[0], frame_data, colour_table); @@ -1091,17 +1091,17 @@ gif_decode_frame_exit: } /* Check if we should test for optimisation */ - if (gif->frames[frame].virgin) { + if (gif->frames[frame_idx].virgin) { if (gif->bitmap_callbacks.bitmap_test_opaque) { - gif->frames[frame].opaque = gif->bitmap_callbacks.bitmap_test_opaque(gif->frame_image); + gif->frames[frame_idx].opaque = gif->bitmap_callbacks.bitmap_test_opaque(gif->frame_image); } else { - gif->frames[frame].opaque = false; + gif->frames[frame_idx].opaque = false; } - gif->frames[frame].virgin = false; + gif->frames[frame_idx].virgin = false; } if (gif->bitmap_callbacks.bitmap_set_opaque) { - gif->bitmap_callbacks.bitmap_set_opaque(gif->frame_image, gif->frames[frame].opaque); + gif->bitmap_callbacks.bitmap_set_opaque(gif->frame_image, gif->frames[frame_idx].opaque); } /* Restore the buffer position */ -- cgit v1.2.3