fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-11-22 06:52:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made the code in pngu.c easier to read

Browse source 
By adding some curly brackets and reducing some variable scopes.
This commit is contained in:
Crayon2000 2024-03-02 17:44:06 -05:00
parent ec76ad184f
commit bb8d8ed569
2 changed files with 68 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GRRLIB/GRRLIB/GRRLIB_bmf.c
View file

@ -32,7 +32,7 @@ THE SOFTWARE.
* @return A GRRLIB_bytemapFont structure filled with BMF information.
* @see GRRLIB_FreeBMF
*/
GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) {
GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[]) {
GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont));
if (fontArray != NULL && my_bmf[0]==0xE1 && my_bmf[1]==0xE6 && my_bmf[2]==0xD5 && my_bmf[3]==0x1A) {

118
GRRLIB/lib/pngu/pngu.c
View file

@ -58,12 +58,10 @@ struct _IMGCTX
IMGCTX PNGU_SelectImageFromBuffer (const void *buffer)
{
IMGCTX ctx = NULL;
if (!buffer)
return NULL;
ctx = malloc (sizeof (struct _IMGCTX));
IMGCTX ctx = malloc (sizeof (struct _IMGCTX));
if (!ctx)
return NULL;
@ -80,12 +78,10 @@ IMGCTX PNGU_SelectImageFromBuffer (const void *buffer)
IMGCTX PNGU_SelectImageFromDevice (const char *filename)
{
IMGCTX ctx = NULL;
if (!filename)
return NULL;
ctx = malloc (sizeof (struct _IMGCTX));
IMGCTX ctx = malloc (sizeof (struct _IMGCTX));
if (!ctx)
return NULL;
@ -142,9 +138,6 @@ int PNGU_GetImageProperties (IMGCTX ctx, PNGUPROP *imgprop)
int PNGU_DecodeToYCbYCr (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffer, PNGU_u32 stride)
{
int result;
PNGU_u32 x, y;
// width needs to be divisible by two
if (width % 2)
return PNGU_ODD_WIDTH;
@ -153,16 +146,20 @@ int PNGU_DecodeToYCbYCr (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buff
if (stride % 2)
return PNGU_ODD_STRIDE;
result = pngu_decode (ctx, width, height, 1);
const int result = pngu_decode (ctx, width, height, 1);
if (result != PNGU_OK)
return result;
// Copy image to the output buffer
const PNGU_u32 buffWidth = (width + stride) / 2;
for (y = 0; y < height; y++)
for (x = 0; x < (width / 2); x++)
for (PNGU_u32 y = 0; y < height; y++)
{
for (PNGU_u32 x = 0; x < (width / 2); x++)
{
((PNGU_u32 *)buffer)[y*buffWidth+x] = PNGU_RGB8_TO_YCbYCr (*(ctx->row_pointers[y]+x*6), *(ctx->row_pointers[y]+x*6+1), *(ctx->row_pointers[y]+x*6+2),
*(ctx->row_pointers[y]+x*6+3), *(ctx->row_pointers[y]+x*6+4), *(ctx->row_pointers[y]+x*6+5));
}
}
// Free resources
free (ctx->img_data);
@ -175,22 +172,23 @@ int PNGU_DecodeToYCbYCr (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buff
int PNGU_DecodeToRGB565 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffer, PNGU_u32 stride)
{
int result;
PNGU_u32 x, y;
result = pngu_decode (ctx, width, height, 1);
const int result = pngu_decode (ctx, width, height, 1);
if (result != PNGU_OK)
return result;
const PNGU_u32 buffWidth = width + stride;
// Copy image to the output buffer
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
for (PNGU_u32 y = 0; y < height; y++)
{
for (PNGU_u32 x = 0; x < width; x++)
{
((PNGU_u16 *)buffer)[y*buffWidth+x] =
(((PNGU_u16) (ctx->row_pointers[y][x*3] & 0xF8)) << 8) |
(((PNGU_u16) (ctx->row_pointers[y][x*3+1] & 0xFC)) << 3) |
(((PNGU_u16) (ctx->row_pointers[y][x*3+2] & 0xF8)) >> 3);
}
}
// Free resources
free (ctx->img_data);
@ -203,10 +201,7 @@ int PNGU_DecodeToRGB565 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buff
int PNGU_DecodeToRGBA8 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffer, PNGU_u32 stride, PNGU_u8 default_alpha)
{
int result;
PNGU_u32 x, y;
result = pngu_decode (ctx, width, height, 0);
const int result = pngu_decode (ctx, width, height, 0);
if (result != PNGU_OK)
return result;
@ -216,20 +211,26 @@ int PNGU_DecodeToRGBA8 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffe
if ( (ctx->prop.imgColorType == PNGU_COLOR_TYPE_GRAY_ALPHA) || (ctx->prop.imgColorType == PNGU_COLOR_TYPE_RGB_ALPHA) )
{
// Alpha channel present, copy image to the output buffer
for (y = 0; y < height; y++)
for (PNGU_u32 y = 0; y < height; y++)
{
memcpy (buffer + (y * buffWidth * 4), ctx->row_pointers[y], width * 4);
}
}
else
{
// No alpha channel present, copy image to the output buffer
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
for (PNGU_u32 y = 0; y < height; y++)
{
for (PNGU_u32 x = 0; x < width; x++)
{
((PNGU_u32 *)buffer)[y*buffWidth+x] =
(((PNGU_u32) ctx->row_pointers[y][x*3]) << 24) |
(((PNGU_u32) ctx->row_pointers[y][x*3+1]) << 16) |
(((PNGU_u32) ctx->row_pointers[y][x*3+2]) << 8) |
((PNGU_u32) default_alpha);
}
}
}
// Free resources
free (ctx->img_data);
@ -242,14 +243,11 @@ int PNGU_DecodeToRGBA8 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffe
int PNGU_DecodeTo4x4RGB565 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffer)
{
int result;
PNGU_u32 x, y;
// width and height need to be divisible by four
if ((width % 4) || (height % 4))
return PNGU_INVALID_WIDTH_OR_HEIGHT;
result = pngu_decode (ctx, width, height, 1);
const int result = pngu_decode (ctx, width, height, 1);
if (result != PNGU_OK)
return result;
@ -257,10 +255,11 @@ int PNGU_DecodeTo4x4RGB565 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
const PNGU_u32 qwidth = width / 4;
const PNGU_u32 qheight = height / 4;
for (y = 0; y < qheight; y++)
for (x = 0; x < qwidth; x++)
for (PNGU_u32 y = 0; y < qheight; y++)
{
int blockbase = (y * qwidth + x) * 4;
for (PNGU_u32 x = 0; x < qwidth; x++)
{
const int blockbase = (y * qwidth + x) * 4;
PNGU_u64 field64 = *((PNGU_u64 *)(ctx->row_pointers[y*4]+x*12));
PNGU_u64 field32 = (PNGU_u64) *((PNGU_u32 *)(ctx->row_pointers[y*4]+x*12+8));
@ -294,6 +293,7 @@ int PNGU_DecodeTo4x4RGB565 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
(((field64 & 0xF800ULL) << 16) | ((field64 & 0xFCULL) << 19) | ((field32 & 0xF8000000ULL) >> 11)) |
(((field32 & 0xF80000ULL) >> 8) | ((field32 & 0xFC00ULL) >> 5) | ((field32 & 0xF8ULL) >> 3)));
}
}
// Free resources
free (ctx->img_data);
@ -306,14 +306,11 @@ int PNGU_DecodeTo4x4RGB565 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *buffer, PNGU_u8 default_alpha)
{
int result;
PNGU_u32 x, y;
// width and height need to be divisible by four
if ((width % 4) || (height % 4))
return PNGU_INVALID_WIDTH_OR_HEIGHT;
result = pngu_decode (ctx, width, height, 0);
const int result = pngu_decode (ctx, width, height, 0);
if (result != PNGU_OK)
return result;
@ -325,8 +322,9 @@ int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
if ( (ctx->prop.imgColorType == PNGU_COLOR_TYPE_GRAY_ALPHA) || (ctx->prop.imgColorType == PNGU_COLOR_TYPE_RGB_ALPHA) )
{
// Alpha channel present, copy image to the output buffer
for (y = 0; y < qheight; y++)
for (x = 0; x < qwidth; x++)
for (PNGU_u32 y = 0; y < qheight; y++)
{
for (PNGU_u32 x = 0; x < qwidth; x++)
{
int blockbase = (y * qwidth + x) * 4;
PNGU_u64 tmp;
@ -452,6 +450,7 @@ int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
((PNGU_u64 *) buffer)[blockbase+3] = tmp;
}
}
}
else
{
PNGU_u64 alphaMask;
@ -463,8 +462,9 @@ int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
// The user wants an opaque texture, so set MSB to 1 and encode colors in RGB555
alphaMask = 0x8000800080008000ULL;
for (y = 0; y < qheight; y++)
for (x = 0; x < qwidth; x++)
for (PNGU_u32 y = 0; y < qheight; y++)
{
for (PNGU_u32 x = 0; x < qwidth; x++)
{
int blockbase = (y * qwidth + x) * 4;
@ -501,6 +501,7 @@ int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
((field32 & 0xF8000000ULL) >> 11) | ((field32 & 0xF80000ULL) >> 9) | ((field32 & 0xF800ULL) >> 6) | ((field32 & 0xF8ULL) >> 3);
}
}
}
else
{
// The user wants a translucid texture, so set MSB to 0 and encode colors in ARGB3444
@ -508,8 +509,9 @@ int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
alphaMask = (((PNGU_u64) default_alpha) << 56) | (((PNGU_u64) default_alpha) << 40) |
(((PNGU_u64) default_alpha) << 24) | (((PNGU_u64) default_alpha) << 8);
for (y = 0; y < qheight; y++)
for (x = 0; x < qwidth; x++)
for (PNGU_u32 y = 0; y < qheight; y++)
{
for (PNGU_u32 x = 0; x < qwidth; x++)
{
int blockbase = (y * qwidth + x) * 4;
@ -547,6 +549,7 @@ int PNGU_DecodeTo4x4RGB5A3 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, void *b
}
}
}
}
// Free resources
free (ctx->img_data);
@ -577,7 +580,7 @@ PNGU_u8 * PNGU_DecodeTo4x4RGBA8 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, in
if(width > 1024 || height > 1024)
{
float ratio = (float)width/(float)height;
const float ratio = (float)width/(float)height;
if(ratio > 1)
{
@ -621,7 +624,7 @@ PNGU_u8 * PNGU_DecodeTo4x4RGBA8 (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, in
}
else
{
png_byte *pixel;
const png_byte *pixel;
if(xRatio > 0)
{
x2 = ((x*xRatio)>>16);
@ -988,12 +991,12 @@ int pngu_info (IMGCTX ctx)
png_color_16p background;
png_bytep trans;
png_color_16p trans_values;
int i;
// Check if there is a file selected and if it is a valid .png
if (ctx->source == PNGU_SOURCE_BUFFER)
{
memcpy (magic, ctx->buffer, 8);
}
else if (ctx->source == PNGU_SOURCE_DEVICE)
{
// Open file
@ -1007,9 +1010,10 @@ int pngu_info (IMGCTX ctx)
return PNGU_CANT_READ_FILE;
}
}
else
{
return PNGU_NO_FILE_SELECTED;
}
if (png_sig_cmp(magic, 0, 8) != 0)
{
@ -1085,9 +1089,7 @@ int pngu_info (IMGCTX ctx)
}
// Constant used to scale 16 bit values to 8 bit values
int scale = 1;
if (ctx->prop.imgBitDepth == 16)
scale = 256;
const int scale = (ctx->prop.imgBitDepth == 16) ? 256 : 1;
// Query background color, if any.
ctx->prop.validBckgrnd = 0;
@ -1116,16 +1118,20 @@ int pngu_info (IMGCTX ctx)
{
ctx->prop.trans = malloc (sizeof (PNGUCOLOR) * ctx->prop.numTrans);
if (ctx->prop.trans)
for (i = 0; i < ctx->prop.numTrans; i++)
{
for (int i = 0; i < ctx->prop.numTrans; i++)
{
ctx->prop.trans[i].r = trans_values[i].red / scale;
ctx->prop.trans[i].g = trans_values[i].green / scale;
ctx->prop.trans[i].b = trans_values[i].blue / scale;
}
}
else
{
ctx->prop.numTrans = 0;
}
}
}
else if (((ctx->prop.imgColorType == PNGU_COLOR_TYPE_GRAY) || (ctx->prop.imgColorType == PNGU_COLOR_TYPE_GRAY_ALPHA)) &&
(png_get_tRNS (ctx->png_ptr, ctx->info_ptr, &trans, (int *) &(ctx->prop.numTrans), &trans_values)))
{
@ -1133,13 +1139,19 @@ int pngu_info (IMGCTX ctx)
{
ctx->prop.trans = malloc (sizeof (PNGUCOLOR) * ctx->prop.numTrans);
if (ctx->prop.trans)
for (i = 0; i < ctx->prop.numTrans; i++)
{
for (int i = 0; i < ctx->prop.numTrans; i++)
{
ctx->prop.trans[i].r = ctx->prop.trans[i].g = ctx->prop.trans[i].b =
trans_values[i].gray / scale;
}
}
else
{
ctx->prop.numTrans = 0;
}
}
}
ctx->propRead = 1;
}
@ -1212,7 +1224,9 @@ int pngu_decode (IMGCTX ctx, PNGU_u32 width, PNGU_u32 height, PNGU_u32 stripAlph
}
for (i = 0; i < ctx->prop.imgHeight; i++)
{
ctx->row_pointers[i] = ctx->img_data + (i * rowbytes);
}
// Transform the image and copy it to our allocated memory
png_read_image (ctx->png_ptr, ctx->row_pointers);