TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move temporary bitmap descriptor onto bm_load_sub stack

Browse source
This commit is contained in:
Kp 2013-12-08 00:30:12 +00:00
parent 38e92ddce0
commit 3e42f8c382
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
d1x-rebirth/main/bmread.cpp
View file

@ -167,7 +167,6 @@ int compute_average_pixel(grs_bitmap *n)
static bitmap_index bm_load_sub(int skip, char * filename )
{
bitmap_index bitmap_num;
grs_bitmap * n;
ubyte newpal[256*3];
int iff_error; //reference parm to avoid warning message
char fname[20];
@ -185,21 +184,20 @@ static bitmap_index bm_load_sub(int skip, char * filename )
return bitmap_num;
}
MALLOC( n, grs_bitmap, 1 );
iff_error = iff_read_bitmap(filename,n,BM_LINEAR,newpal);
grs_bitmap n;
iff_error = iff_read_bitmap(filename,&n,BM_LINEAR,newpal);
if (iff_error != IFF_NO_ERROR) {
Error("File %s - IFF error: %s",filename,iff_errormsg(iff_error));
}
if ( iff_has_transparency )
gr_remap_bitmap_good( n, newpal, iff_transparent_color, SuperX );
gr_remap_bitmap_good( &n, newpal, iff_transparent_color, SuperX );
else
gr_remap_bitmap_good( n, newpal, -1, SuperX );
gr_remap_bitmap_good( &n, newpal, -1, SuperX );
n->avg_color = compute_average_pixel(n);
n.avg_color = compute_average_pixel(&n);
bitmap_num = piggy_register_bitmap( n, fname, 0 );
d_free( n );
bitmap_num = piggy_register_bitmap( &n, fname, 0 );
return bitmap_num;
}

16
d2x-rebirth/main/bmread.cpp
View file

@ -171,7 +171,6 @@ int compute_average_pixel(grs_bitmap *n)
static bitmap_index bm_load_sub(int skip, char * filename )
{
bitmap_index bitmap_num;
grs_bitmap * n;
ubyte newpal[256*3];
int iff_error; //reference parm to avoid warning message
char fname[20];
@ -193,22 +192,21 @@ static bitmap_index bm_load_sub(int skip, char * filename )
return bitmap_num;
}
MALLOC( n, grs_bitmap, 1 );
iff_error = iff_read_bitmap(filename,n,BM_LINEAR,newpal);
n->bm_handle=0;
grs_bitmap n;
iff_error = iff_read_bitmap(filename,&n,BM_LINEAR,newpal);
n.bm_handle=0;
if (iff_error != IFF_NO_ERROR) {
Error("File <%s> - IFF error: %s, line %d",filename,iff_errormsg(iff_error),linenum);
}
if ( iff_has_transparency )
gr_remap_bitmap_good( n, newpal, iff_transparent_color, SuperX );
gr_remap_bitmap_good( &n, newpal, iff_transparent_color, SuperX );
else
gr_remap_bitmap_good( n, newpal, -1, SuperX );
gr_remap_bitmap_good( &n, newpal, -1, SuperX );
n->avg_color = compute_average_pixel(n);
n.avg_color = compute_average_pixel(&n);
bitmap_num = piggy_register_bitmap( n, fname, 0 );
d_free( n );
bitmap_num = piggy_register_bitmap( &n, fname, 0 );
return bitmap_num;
}