Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(stdlib): make xod graphics bitmaps compile on non-avr boards #2053

Merged
merged 1 commit into from
Oct 5, 2020
Merged

fix(stdlib): make xod graphics bitmaps compile on non-avr boards #2053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions workspace/__ardulib__/Graphics/Bitmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ using xod::XColor;
* A structure to hold basic bitmap parameters.
*/
struct Bitmap {
Bitmap(uint8_t* newBuffer = nullptr, uint8_t newColorDepth = 0, uint16_t newWidth = 0, uint16_t newHeight = 0, uint16_t newKeyColor = 0x0000) {
Bitmap(const uint8_t* newBuffer, uint8_t newColorDepth = 0, uint16_t newWidth = 0, uint16_t newHeight = 0, uint16_t newKeyColor = 0x0000) {
buffer = newBuffer;
colorDepth = newColorDepth;
width = newWidth;
height = newHeight;
keyColor = newKeyColor;
}

uint8_t* buffer;
const uint8_t* buffer;
uint8_t colorDepth; // 0 = Black and white bitmap, 1 = Colored bitmap (565 format), 2 = Colored bitmap (565) with mask color;
uint16_t width;
uint16_t height;
Expand Down