Skip to content

Refactor GIF loader: remove unused parameters and add static to helpers #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dogo merged 1 commit into from
Oct 17, 2025
Merged

Refactor GIF loader: remove unused parameters and add static to helpers #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified libosl.a
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions src/image/format/oslLoadImageFileGIF.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ const short InterlacedOffset[] = { 0, 4, 2, 1 }; /* The way Interlaced image sho
const short InterlacedJumps[] = { 8, 8, 4, 2 }; /* The way Interlaced image should be read - jumps */
GifPixelType osl_gifLineBuf[2048]; // Temporary buffer

int fnGifReadFunc(GifFileType* GifFile, GifByteType* buf, int count)
static int fnGifReadFunc(GifFileType* GifFile, GifByteType* buf, int count)
{
// Read data from the virtual file associated with the GIF
VirtualFileRead(buf, 1, count, (VIRTUAL_FILE*)GifFile->UserData);

return count;
}

void fnCopyLine(void* dst, void* src, int count, int pixelFormat, int transparentColor)
static void fnCopyLine(void* dst, void* src, int count, int pixelFormat)
{
int x;
u8 *p_dest1 = (u8*)dst;
Expand Down Expand Up @@ -49,11 +49,11 @@ void fnCopyLine(void* dst, void* src, int count, int pixelFormat, int transparen
}
}

int DGifGetLineByte(GifFileType *GifFile, GifPixelType *Line, int LineLen, int pixelFormat, int transparentColor)
static int DGifGetLineByte(GifFileType *GifFile, GifPixelType *Line, int LineLen, int pixelFormat)
{
// Get the next line of pixels from the GIF and copy it to the destination buffer
int result = DGifGetLine(GifFile, osl_gifLineBuf, LineLen);
fnCopyLine(Line, osl_gifLineBuf, LineLen, pixelFormat, transparentColor);
fnCopyLine(Line, osl_gifLineBuf, LineLen, pixelFormat);
return result;
}

Expand Down Expand Up @@ -124,13 +124,13 @@ OSL_IMAGE *oslLoadImageFileGIF(char *filename, int location, int pixelFormat)
// Perform 4 passes for interlaced images
for (i = 0; i < 4; i++) {
for (j = Row + InterlacedOffset[i]; j < Row + Height; j += InterlacedJumps[i]) {
DGifGetLineByte(GifFile, (GifPixelType*)oslGetImagePixelAdr(img, Col, j), Width, pixelFormat, transparentColor);
DGifGetLineByte(GifFile, (GifPixelType*)oslGetImagePixelAdr(img, Col, j), Width, pixelFormat);
}
}
} else {
// For non-interlaced images, read the lines sequentially
for (i = 0; i < Height; i++) {
DGifGetLineByte(GifFile, (GifPixelType*)oslGetImagePixelAdr(img, Col, Row), Width, pixelFormat, transparentColor);
DGifGetLineByte(GifFile, (GifPixelType*)oslGetImagePixelAdr(img, Col, Row), Width, pixelFormat);
Row++;
}
}
Expand Down