m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid accessing Main.backups in Load_XXX() or Save_XXX()

Browse Source
This commit is contained in:
Thomas Bernard 2018-12-10 00:00:07 +01:00
parent f003bd8678
commit 28fb91f265
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fileformats.c
View File

@ -1012,7 +1012,7 @@ void Load_IFF(T_IO_Context * context)
previous_frame = calloc(line_size * context->Height,1);
for (y_pos=0; y_pos<context->Height; y_pos++)
{
const byte * pix_p = Main.backups->Pages->Image[Main.current_layer].Pixels + y_pos * Main.backups->Pages->Width;
const byte * pix_p = context->Target_address + y_pos * context->Pitch;
// Dispatch the pixel into planes
for (x_pos=0; x_pos<context->Width; x_pos++)
{
@ -1137,7 +1137,7 @@ void Load_IFF(T_IO_Context * context)
previous_frame = calloc(line_size * context->Height,1);
for (y_pos=0; y_pos<context->Height; y_pos++)
{
const byte * pix_p = Main.backups->Pages->Image[Main.current_layer].Pixels + y_pos * Main.backups->Pages->Width;
const byte * pix_p = context->Target_address + y_pos * context->Pitch;
// Dispatch the pixel into planes
for (x_pos=0; x_pos<context->Width; x_pos++)
{
@ -4804,9 +4804,14 @@ void Save_GIF(T_IO_Context * context)
temp = LSDB.Backcol;//=context->Transparent_color;
for(GIF_pos_Y = 0; GIF_pos_Y < context->Height; GIF_pos_Y++) {
for(GIF_pos_X = 0; GIF_pos_X < context->Width; GIF_pos_X++) {
if (GIF_pos_X >= min_X && GIF_pos_X <= max_X && GIF_pos_Y >= min_Y && GIF_pos_Y <= max_Y)
continue; // already in the box
// compare Pixel from previous layer or from background depending on disposal method
if(disposal_method == DISPOSAL_METHOD_DO_NOT_DISPOSE)
temp = Main.backups->Pages->Image[current_layer - 1].Pixels[GIF_pos_Y * context->Pitch + GIF_pos_X];
if(disposal_method == DISPOSAL_METHOD_DO_NOT_DISPOSE) {
Set_saving_layer(context, current_layer - 1);
temp = Get_pixel(context, GIF_pos_X, GIF_pos_Y);
Set_saving_layer(context, current_layer);
}
if(temp != Get_pixel(context, GIF_pos_X, GIF_pos_Y)) {
if(GIF_pos_X < min_X) min_X = GIF_pos_X;
if(GIF_pos_X > max_X) max_X = GIF_pos_X;

2
src/miscfileformats.c
View File

@ -3874,8 +3874,6 @@ void Test_SCR(T_IO_Context * context, FILE * file)
unsigned long pal_size, file_size;
byte mode, color_anim_flag;
(void)file;
File_error = 1;
file_size = File_length_file(file);