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

Pre_load() sets context->Width & context->Height

Browse Source
This commit is contained in:
Thomas Bernard
2020-01-18 00:11:56 +01:00
parent 266b092f63
commit 7f91480dbb
3 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/miscfileformats.c
View File

@@ -574,8 +574,6 @@ void Load_PKM(T_IO_Context * context)
if (File_error==0)
{
context->Width=header.Width;
context->Height=header.Height;
image_size=(dword)(context->Width*context->Height);
// Palette lue en 64
memcpy(context->Palette,header.Palette,sizeof(T_Palette));
@@ -945,13 +943,12 @@ void Load_CEL(T_IO_Context * context)
&& ( (((header1.Width+1)>>1)*header1.Height)==(file_size-header_size) ) )
{
// Chargement d'un fichier CEL sans signature (vieux fichiers)
context->Width=header1.Width;
context->Height=header1.Height;
Original_screen_X=context->Width;
Original_screen_Y=context->Height;
Pre_load(context, context->Width,context->Height,file_size,FORMAT_CEL,PIXEL_SIMPLE,0);
Pre_load(context, header1.Width, header1.Height,
file_size, FORMAT_CEL, PIXEL_SIMPLE, 0);
if (File_error==0)
{
Original_screen_X = context->Width;
Original_screen_Y = context->Height;
// Chargement de l'image
/*Init_lecture();*/
for (y_pos=0;((y_pos<context->Height) && (!File_error));y_pos++)
@@ -984,13 +981,14 @@ void Load_CEL(T_IO_Context * context)
{
// Chargement d'un fichier CEL avec signature (nouveaux fichiers)
context->Width=header2.Width+header2.X_offset;
context->Height=header2.Height+header2.Y_offset;
Original_screen_X=context->Width;
Original_screen_Y=context->Height;
Pre_load(context, context->Width,context->Height,file_size,FORMAT_CEL,PIXEL_SIMPLE,0);
Pre_load(context,
header2.Width + header2.X_offset,
header2.Height + header2.Y_offset,
file_size, FORMAT_CEL, PIXEL_SIMPLE, 0);
if (File_error==0)
{
Original_screen_X = context->Width;
Original_screen_Y = context->Height;
// Chargement de l'image
/*Init_lecture();*/