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
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpcformats.c
View File

@ -1618,9 +1618,6 @@ void Load_PPH(T_IO_Context* context)
Pre_load(context, width, height, file_size, FORMAT_PPH, context->Ratio, 0); Pre_load(context, width, height, file_size, FORMAT_PPH, context->Ratio, 0);
context->Width = width;
context->Height = height;
// First of all, detect the mode // First of all, detect the mode
// 0, 1, 2 > Load as with SCR files? // 0, 1, 2 > Load as with SCR files?
// R(3) > Load as single layer, square pixels, 16 colors // R(3) > Load as single layer, square pixels, 16 colors

13
src/fileformats.c
View File

@ -128,9 +128,6 @@ void Load_IMG(T_IO_Context * context)
{ {
memcpy(context->Palette,IMG_header.Palette,sizeof(T_Palette)); memcpy(context->Palette,IMG_header.Palette,sizeof(T_Palette));
context->Width=IMG_header.Width;
context->Height=IMG_header.Height;
for (y_pos=0;(y_pos<context->Height) && (!File_error);y_pos++) for (y_pos=0;(y_pos<context->Height) && (!File_error);y_pos++)
{ {
if (Read_bytes(file,buffer,context->Width)) if (Read_bytes(file,buffer,context->Width))
@ -3292,15 +3289,15 @@ void Load_PCX(T_IO_Context * context)
Read_word_le(file,&(PCX_header.Screen_Y)) && Read_word_le(file,&(PCX_header.Screen_Y)) &&
Read_bytes(file,&(PCX_header.Filler),54) ) Read_bytes(file,&(PCX_header.Filler),54) )
{ {
Pre_load(context,
context->Width=PCX_header.X_max-PCX_header.X_min+1; PCX_header.X_max - PCX_header.X_min + 1,
context->Height=PCX_header.Y_max-PCX_header.Y_min+1; PCX_header.Y_max - PCX_header.Y_min + 1,
file_size, FORMAT_PCX, PIXEL_SIMPLE,
PCX_header.Plane * PCX_header.Depth);
Original_screen_X = PCX_header.Screen_X; Original_screen_X = PCX_header.Screen_X;
Original_screen_Y = PCX_header.Screen_Y; Original_screen_Y = PCX_header.Screen_Y;
Pre_load(context, context->Width, context->Height, file_size, FORMAT_PCX, PIXEL_SIMPLE, PCX_header.Plane * PCX_header.Depth);
if (!(PCX_header.Plane==3 && PCX_header.Depth==8)) if (!(PCX_header.Plane==3 && PCX_header.Depth==8))
{ {
if (File_error==0) if (File_error==0)

22
src/miscfileformats.c
View File

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