piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Taranis] A lot of new features, >100 hours work in one commit...

Browse Source
This commit is contained in:
bsongis
2013-11-30 11:11:14 +01:00
committed by Andre Bernet
parent 89c6bb2513
commit 4b9270182e
66 changed files with 3611 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bmp.cpp
+8 -2
View File
@@ -36,7 +36,7 @@
#include "opentx.h"
const pm_char * bmpLoad(uint8_t *dest, const char *filename, const xcoord_t width, const uint8_t height)
const pm_char * bmpLoad(bmp_ptr_t &bmp, const char *filename, const xcoord_t width, const uint8_t height)
{
FIL bmpFile;
UINT read;
@@ -147,10 +147,16 @@ const pm_char * bmpLoad(uint8_t *dest, const char *filename, const xcoord_t widt
}
}
if (bmp == NULL) {
bmp = (uint8_t *)malloc(2+w*((h+7)/8)*4);
}
uint8_t *dest = bmp;
*dest++ = w;
*dest++ = h;
memset(dest, 0, w*(h/8)*4);
memset(dest, 0, w*((h+7)/8)*4);
uint32_t n;