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

Pass bm_mode to gr_init_bitmap_alloc

Browse source
This commit is contained in:
Kp 2016-05-28 17:31:27 +00:00
parent 86122120b7
commit 3c5add9d0e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/2d/bitmap.cpp
View file

@ -83,7 +83,7 @@ void gr_init_bitmap(grs_bitmap &bm, uint8_t mode, uint16_t x, uint16_t y, uint16
gr_set_bitmap_data(bm, data); gr_set_bitmap_data(bm, data);
} }
void gr_init_bitmap_alloc(grs_bitmap &bm, uint8_t mode, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t bytesperline) void gr_init_bitmap_alloc(grs_bitmap &bm, const bm_mode mode, const uint16_t x, const uint16_t y, const uint16_t w, const uint16_t h, const uint16_t bytesperline)
{ {
unsigned char *d; unsigned char *d;
MALLOC(d, unsigned char, MAX_BMP_SIZE(w, h)); MALLOC(d, unsigned char, MAX_BMP_SIZE(w, h));

2
common/include/fwd-gr.h
View file

@ -146,7 +146,7 @@ void gr_clear_canvas(color_t color);
void gr_init_bitmap(grs_bitmap &bm, uint8_t mode, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t bytesperline, const uint8_t* data); void gr_init_bitmap(grs_bitmap &bm, uint8_t mode, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t bytesperline, const uint8_t* data);
void gr_init_sub_bitmap (grs_bitmap &bm, grs_bitmap &bmParent, uint16_t x, uint16_t y, uint16_t w, uint16_t h); void gr_init_sub_bitmap (grs_bitmap &bm, grs_bitmap &bmParent, uint16_t x, uint16_t y, uint16_t w, uint16_t h);
void gr_init_bitmap_alloc(grs_bitmap &bm, uint8_t mode, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t bytesperline); void gr_init_bitmap_alloc(grs_bitmap &bm, bm_mode mode, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t bytesperline);
void gr_free_bitmap_data(grs_bitmap &bm); void gr_free_bitmap_data(grs_bitmap &bm);
// Allocate a bitmap and its pixel data buffer. // Allocate a bitmap and its pixel data buffer.