fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2025-01-15 10:09:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove useless parameter in GRRLIB_LoadTextureTPL

Browse source
This commit is contained in:
Crayon2000 2025-01-12 12:53:40 -05:00
parent bad483cc57
commit 0652beb6b7
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
GRRLIB/GRRLIB/GRRLIB_texEdit.c
View file

@ -1,5 +1,5 @@
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
Copyright (c) 2009-2024 The GRRLIB Team Copyright (c) 2009-2025 The GRRLIB Team
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -204,12 +204,11 @@ GRRLIB_texImg* GRRLIB_CreateEmptyTexture (const u32 width, const u32 height)
/** /**
* Set TPL data to a GRRLIB_texImg structure. * Set TPL data to a GRRLIB_texImg structure.
* @param my_tpl The TPL buffer to set. * @param my_tpl The TPL buffer to set.
* @param size Size of the TPL buffer to set.
* @param id ID of the TPL buffer to set. * @param id ID of the TPL buffer to set.
* @return A GRRLIB_texImg structure filled with image information. * @return A GRRLIB_texImg structure filled with image information.
*/ */
GRRLIB_texImg* GRRLIB_LoadTextureTPL (const u8 *my_tpl, const int size, u32 id) { GRRLIB_texImg* GRRLIB_LoadTextureTPL (const u8 *my_tpl, u32 id) {
if(my_tpl == NULL || size <= 0) { if(my_tpl == NULL || my_tpl[0] != 0x00 || my_tpl[1] != 0x20 || my_tpl[2] != 0xAF || my_tpl[3] != 0x30) {
return NULL; return NULL;
} }
@ -245,7 +244,9 @@ GRRLIB_texImg* GRRLIB_LoadTextureTPL (const u8 *my_tpl, const int size, u32 id)
* @return A GRRLIB_texImg structure filled with image information. * @return A GRRLIB_texImg structure filled with image information.
*/ */
GRRLIB_texImg* GRRLIB_LoadTexture (const u8 *my_img) { GRRLIB_texImg* GRRLIB_LoadTexture (const u8 *my_img) {
if (my_img[0]==0xFF && my_img[1]==0xD8 && my_img[2]==0xFF) if(my_img[0]==0x00 && my_img[1]==0x20 && my_img[2]==0xAF && my_img[3]==0x30)
return GRRLIB_LoadTextureTPL(my_img, 0); // Load id 0 from TPL
else if (my_img[0]==0xFF && my_img[1]==0xD8 && my_img[2]==0xFF)
return (GRRLIB_LoadTextureJPG(my_img)); return (GRRLIB_LoadTextureJPG(my_img));
else if (my_img[0]=='B' && my_img[1]=='M') else if (my_img[0]=='B' && my_img[1]=='M')
return (GRRLIB_LoadTextureBMP(my_img)); return (GRRLIB_LoadTextureBMP(my_img));

4
GRRLIB/GRRLIB/grrlib/GRRLIB__lib.h
View file

@ -1,5 +1,5 @@
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
Copyright (c) 2009-2024 The GRRLIB Team Copyright (c) 2009-2025 The GRRLIB Team
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -142,7 +142,7 @@ GRRLIB_texImg* GRRLIB_LoadTexturePNG (const u8 *my_png);
GRRLIB_texImg* GRRLIB_LoadTextureJPG (const u8 *my_jpg); GRRLIB_texImg* GRRLIB_LoadTextureJPG (const u8 *my_jpg);
GRRLIB_texImg* GRRLIB_LoadTextureJPGEx (const u8 *my_jpg, const u32 my_size); GRRLIB_texImg* GRRLIB_LoadTextureJPGEx (const u8 *my_jpg, const u32 my_size);
GRRLIB_texImg* GRRLIB_LoadTextureBMP (const u8 *my_bmp); GRRLIB_texImg* GRRLIB_LoadTextureBMP (const u8 *my_bmp);
GRRLIB_texImg* GRRLIB_LoadTextureTPL (const u8 *my_tpl, const int size, u32 id); GRRLIB_texImg* GRRLIB_LoadTextureTPL (const u8 *my_tpl, u32 id);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// GRRLIB_gecko.c - USB_Gecko output facilities // GRRLIB_gecko.c - USB_Gecko output facilities