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

fix after rebase

Browse Source
This commit is contained in:
Thomas Bernard 2018-01-23 10:08:35 +01:00
parent 9fafd0173f
commit 76f3860712
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buttons.c
View File

@ -3128,7 +3128,7 @@ void Load_picture(enum CONTEXT_TYPE type)
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
strcpy(filename, ""); strcpy(filename, "");
strcpy(directory, Main_backups->Pages->File_directory); strcpy(directory, Main.backups->Pages->File_directory);
Init_context_layered_image(&context, filename, directory); Init_context_layered_image(&context, filename, directory);
context.Type = CONTEXT_PALETTE; context.Type = CONTEXT_PALETTE;
context.Format = FORMAT_PAL; context.Format = FORMAT_PAL;

4
src/loadsave.c
View File

@ -863,8 +863,8 @@ void Load_image(T_IO_Context *context)
// Make a backup step // Make a backup step
Backup_layers(LAYER_NONE); Backup_layers(LAYER_NONE);
// Copy the loaded palette // Copy the loaded palette
memcpy(Main_palette, context->Palette, sizeof(T_Palette)); memcpy(Main.palette, context->Palette, sizeof(T_Palette));
memcpy(Main_backups->Pages->Palette, context->Palette, sizeof(T_Palette)); memcpy(Main.backups->Pages->Palette, context->Palette, sizeof(T_Palette));
} }
} }
else if (context->Type == CONTEXT_BRUSH && File_error==0) else if (context->Type == CONTEXT_BRUSH && File_error==0)

8
src/palette.c
View File

@ -2613,13 +2613,13 @@ void Button_Palette(void)
} }
case 26: // Load palette case 26: // Load palette
memcpy(backup_palette, Main_palette, sizeof(T_Palette)); memcpy(backup_palette, Main.palette, sizeof(T_Palette));
memcpy(Main_palette, working_palette, sizeof(T_Palette)); memcpy(Main.palette, working_palette, sizeof(T_Palette));
Load_picture(CONTEXT_PALETTE); Load_picture(CONTEXT_PALETTE);
memcpy(working_palette, Main_palette, sizeof(T_Palette)); memcpy(working_palette, Main.palette, sizeof(T_Palette));
Set_palette(working_palette); Set_palette(working_palette);
memcpy(temp_palette,working_palette,sizeof(T_Palette)); memcpy(temp_palette,working_palette,sizeof(T_Palette));
memcpy(Main_palette, backup_palette, sizeof(T_Palette)); memcpy(Main.palette, backup_palette, sizeof(T_Palette));
need_to_remap=1; need_to_remap=1;
break; break;