added replaced nanojpeg with turbojpeg and attempting a rebase

This commit is contained in:
NightlyFox 2018-09-29 12:46:22 -05:00
parent 6105fe1ada
commit ec048686a3

View File

@ -294,7 +294,7 @@ bool menuEntryLoad(menuEntry_s* me, const char* name, bool shortcut) {
/*if (shortcut) /*if (shortcut)
shortcutFree(&sc);*/ shortcutFree(&sc);*/
} }
if (me->type == ENTRY_TYPE_THEME) { if (me->type == ENTRY_TYPE_THEME) {
config_t cfg = {0}; config_t cfg = {0};
config_init(&cfg); config_init(&cfg);
@ -334,8 +334,7 @@ void menuEntryParseIcon(menuEntry_s* me) {
if (w != 256 || h != 256 ) return; //The decoded image must be 256x256. if (w != 256 || h != 256 ) return; //The decoded image must be 256x256.
if(tjDecompress2(_jpegDecompressor, me->icon, me->icon_size, imageptr, w, 0/*pitch*/, h, TJPF_RGB, TJFLAG_ACCURATEDCT)==-1)//The decoded image must be RGB if(tjDecompress2(_jpegDecompressor, me->icon, me->icon_size, imageptr, w, 0/*pitch*/, h, TJPF_RGB, TJFLAG_ACCURATEDCT)==-1) return; //The decoded image must be RGB
return;
me->icon_size = 0; me->icon_size = 0;
free(me->icon); free(me->icon);