Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-09-20 14:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix merge issues

Browse source
This commit is contained in:
MX 2023-03-22 22:04:04 +03:00
parent 6057262c18
commit 9165b819f4
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/services/gui/canvas.c
View file

@ -390,7 +390,7 @@ void canvas_draw_icon_bitmap(
x += canvas->offset_x;
y += canvas->offset_y;
uint8_t* icon_data = NULL;
furi_hal_compress_icon_decode(icon_get_data(icon), &icon_data);
compress_icon_decode(canvas->compress_icon, icon_get_data(icon), &icon_data);
u8g2_DrawXBM(&canvas->fb, x, y, w, h, icon_data);
}

7
firmware/targets/f7/api_symbols.csv
View file

@ -706,6 +706,13 @@ Function,+,composite_api_resolver_add,void,"CompositeApiResolver*, const ElfApiI
Function,+,composite_api_resolver_alloc,CompositeApiResolver*,
Function,+,composite_api_resolver_free,void,CompositeApiResolver*
Function,+,composite_api_resolver_get,const ElfApiInterface*,CompositeApiResolver*
Function,-,compress_alloc,Compress*,uint16_t
Function,-,compress_decode,_Bool,"Compress*, uint8_t*, size_t, uint8_t*, size_t, size_t*"
Function,-,compress_encode,_Bool,"Compress*, uint8_t*, size_t, uint8_t*, size_t, size_t*"
Function,-,compress_free,void,Compress*
Function,-,compress_icon_alloc,CompressIcon*,
Function,-,compress_icon_decode,void,"CompressIcon*, const uint8_t*, uint8_t**"
Function,-,compress_icon_free,void,CompressIcon*
Function,-,copysign,double,"double, double"
Function,-,copysignf,float,"float, float"
Function,-,copysignl,long double,"long double, long double"

1 entry status name type params
706 Function + composite_api_resolver_alloc CompositeApiResolver*
707 Function + composite_api_resolver_free void CompositeApiResolver*
708 Function + composite_api_resolver_get const ElfApiInterface* CompositeApiResolver*
709 Function - compress_alloc Compress* uint16_t
710 Function - compress_decode _Bool Compress*, uint8_t*, size_t, uint8_t*, size_t, size_t*
711 Function - compress_encode _Bool Compress*, uint8_t*, size_t, uint8_t*, size_t, size_t*
712 Function - compress_free void Compress*
713 Function - compress_icon_alloc CompressIcon*
714 Function - compress_icon_decode void CompressIcon*, const uint8_t*, uint8_t**
715 Function - compress_icon_free void CompressIcon*
716 Function - copysign double double, double
717 Function - copysignf float float, float
718 Function - copysignl long double long double, long double