From 3c5add9d0e035ff9027720b09e70b9fae69c38b5 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 28 May 2016 17:31:27 +0000 Subject: [PATCH] Pass bm_mode to gr_init_bitmap_alloc --- common/2d/bitmap.cpp | 2 +- common/include/fwd-gr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/2d/bitmap.cpp b/common/2d/bitmap.cpp index 4a42719cc..518d8dff1 100644 --- a/common/2d/bitmap.cpp +++ b/common/2d/bitmap.cpp @@ -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); } -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; MALLOC(d, unsigned char, MAX_BMP_SIZE(w, h)); diff --git a/common/include/fwd-gr.h b/common/include/fwd-gr.h index 881a6a2df..d1eca9589 100644 --- a/common/include/fwd-gr.h +++ b/common/include/fwd-gr.h @@ -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_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); // Allocate a bitmap and its pixel data buffer.