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

Fix issue 320: Image corruption when running a Lua script after loading 24bit image

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1366 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-02-24 02:31:31 +00:00
parent c26b09a3d3
commit 827ad2da1c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buttons.c
View File

@ -653,8 +653,8 @@ void Button_Clear(void)
else else
Clear_current_image(Main_backups->Pages->Transparent_color); Clear_current_image(Main_backups->Pages->Transparent_color);
Redraw_layered_image(); Redraw_layered_image();
Display_all_screen();
End_of_modification(); End_of_modification();
Display_all_screen();
Unselect_button(BUTTON_CLEAR); Unselect_button(BUTTON_CLEAR);
Display_cursor(); Display_cursor();
} }
@ -668,8 +668,8 @@ void Button_Clear_with_backcolor(void)
else else
Clear_current_image(Back_color); Clear_current_image(Back_color);
Redraw_layered_image(); Redraw_layered_image();
Display_all_screen();
End_of_modification(); End_of_modification();
Display_all_screen();
Unselect_button(BUTTON_CLEAR); Unselect_button(BUTTON_CLEAR);
Display_cursor(); Display_cursor();
} }
@ -2747,8 +2747,6 @@ void Load_picture(byte image)
{ {
if (image) if (image)
{ {
End_of_modification();
if (Main_magnifier_mode) if (Main_magnifier_mode)
{ {
Draw_menu_button_frame(BUTTON_MAGNIFIER,0); Draw_menu_button_frame(BUTTON_MAGNIFIER,0);
@ -2791,6 +2789,7 @@ void Load_picture(byte image)
Compute_optimal_menu_colors(Main_palette); Compute_optimal_menu_colors(Main_palette);
Redraw_layered_image(); Redraw_layered_image();
End_of_modification();
Display_all_screen(); Display_all_screen();
if (image) if (image)
@ -2851,8 +2850,6 @@ void Button_Reload(void)
if (File_error!=1) if (File_error!=1)
{ {
End_of_modification();
if (Main_magnifier_mode) if (Main_magnifier_mode)
{ {
Draw_menu_button_frame(BUTTON_MAGNIFIER,0); Draw_menu_button_frame(BUTTON_MAGNIFIER,0);
@ -2893,6 +2890,7 @@ void Button_Reload(void)
Compute_paintbrush_coordinates(); Compute_paintbrush_coordinates();
} }
Redraw_layered_image(); Redraw_layered_image();
End_of_modification();
Display_all_screen(); Display_all_screen();
Main_image_is_modified=0; Main_image_is_modified=0;

2
loadsave.c
View File

@ -1329,7 +1329,6 @@ int Check_recovery(void)
Main_offset_Y=0; Main_offset_Y=0;
Compute_limits(); Compute_limits();
Compute_paintbrush_coordinates(); Compute_paintbrush_coordinates();
Redraw_layered_image();
if (Backups_main) if (Backups_main)
Button_Page(); Button_Page();
} }
@ -1341,7 +1340,6 @@ int Check_recovery(void)
Main_offset_Y=0; Main_offset_Y=0;
Compute_limits(); Compute_limits();
Compute_paintbrush_coordinates(); Compute_paintbrush_coordinates();
Redraw_layered_image();
} }
return restored_main + restored_spare; return restored_main + restored_spare;
} }

4
main.c
View File

@ -811,8 +811,8 @@ int Init_program(int argc,char * argv[])
Init_context_layered_image(&context, spare_filename, spare_directory); Init_context_layered_image(&context, spare_filename, spare_directory);
Load_image(&context); Load_image(&context);
Destroy_context(&context); Destroy_context(&context);
End_of_modification();
Redraw_layered_image(); Redraw_layered_image();
End_of_modification();
Button_Page(); Button_Page();
// no break ! proceed with the other file now // no break ! proceed with the other file now
@ -820,8 +820,8 @@ int Init_program(int argc,char * argv[])
Init_context_layered_image(&context, main_filename, main_directory); Init_context_layered_image(&context, main_filename, main_directory);
Load_image(&context); Load_image(&context);
Destroy_context(&context); Destroy_context(&context);
End_of_modification();
Redraw_layered_image(); Redraw_layered_image();
End_of_modification();
Hide_cursor(); Hide_cursor();
Compute_optimal_menu_colors(Main_palette); Compute_optimal_menu_colors(Main_palette);