guijan
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image: Cosmetics 

- Remove unused function argument in __imlib_ImageFileContextPush()
- Swap function arguments in __imlib_LoadEmbedded()
This commit is contained in:
Kim Woelders 2022-12-05 19:27:13 +01:00
parent 472c823aaf
commit b7d4cab412
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/Imlib2_Loader.h
View File

@ -163,7 +163,7 @@ struct _ImlibImage {
ImlibLoader *__imlib_FindBestLoader(const char *file, const char *format,
int for_save);
int __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
const char *file, int load_data);
int load_data, const char *file);
uint32_t *__imlib_AllocateData(ImlibImage * im);
void __imlib_FreeData(ImlibImage * im);

14
src/lib/image.c
View File

@ -148,7 +148,7 @@ __imlib_FileContextClose(ImlibImageFileInfo * fi)
}
static int
__imlib_ImageFileContextPush(ImlibImage * im, bool load, char *file)
__imlib_ImageFileContextPush(ImlibImage * im, char *file)
{
ImlibImageFileInfo *fi;
@ -553,7 +553,7 @@ __imlib_LoadImage(const char *file, ImlibLoadArgs * ila)
im->key = im_key;
im->frame = ila->frame;
if (__imlib_ImageFileContextPush(im, true, im_file ? im_file : im->file) ||
if (__imlib_ImageFileContextPush(im, im_file ? im_file : im->file) ||
__imlib_FileContextOpen(im->fi, ila->fp, ila->fdata, st.st_size))
{
ila->err = errno;
@ -692,15 +692,15 @@ __imlib_LoadImageData(ImlibImage * im)
}
__EXPORT__ int
__imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, const char *file,
int load_data)
__imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, int load_data,
const char *file)
{
int rc;
if (!l || !im)
return 0;
return LOAD_FAIL;
__imlib_ImageFileContextPush(im, true, strdup(file));
__imlib_ImageFileContextPush(im, strdup(file));
rc = __imlib_FileContextOpen(im->fi, NULL, NULL, 0);
if (rc)
return LOAD_FAIL;
@ -841,7 +841,7 @@ __imlib_SaveImage(ImlibImage * im, const char *file, ImlibLoadArgs * ila)
if (ila->pfunc)
__imlib_LoadCtxInit(im, &ilc, ila->pfunc, ila->pgran);
__imlib_ImageFileContextPush(im, false, strdup(file));
__imlib_ImageFileContextPush(im, strdup(file));
/* call the saver */
loader_ret = l->module->save(im);

2
src/lib/image.h
View File

@ -101,7 +101,7 @@ ImlibLoader *__imlib_FindBestLoader(const char *file, const char *format,
ImlibImage *__imlib_CreateImage(int w, int h, uint32_t * data);
ImlibImage *__imlib_LoadImage(const char *file, ImlibLoadArgs * ila);
int __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
const char *file, int load_data);
int load_data, const char *file);
int __imlib_LoadImageData(ImlibImage * im);
void __imlib_DirtyImage(ImlibImage * im);
void __imlib_FreeImage(ImlibImage * im);

2
src/modules/loaders/decompress_load.c
View File

@ -54,7 +54,7 @@ decompress_load(ImlibImage * im, int load_data, const char *const *pext,
close(dest);
if (res)
rc = __imlib_LoadEmbedded(loader, im, tmp, load_data);
rc = __imlib_LoadEmbedded(loader, im, load_data, tmp);
unlink(tmp);

4
src/modules/loaders/loader_id3.c
View File

@ -531,7 +531,7 @@ _load(ImlibImage * im, int load_data)
goto quit;
}
rc = __imlib_LoadEmbedded(loader, im, tmp, load_data);
rc = __imlib_LoadEmbedded(loader, im, load_data, tmp);
unlink(tmp);
}
@ -565,7 +565,7 @@ _load(ImlibImage * im, int load_data)
goto quit;
}
rc = __imlib_LoadEmbedded(loader, im, file, load_data);
rc = __imlib_LoadEmbedded(loader, im, load_data, file);
#if USE_TAGS
if (!im->loader)