forked from old/legacy-imlib2
image: Cosmetics
- Remove unused function argument in __imlib_ImageFileContextPush() - Swap function arguments in __imlib_LoadEmbedded()
This commit is contained in:
parent
472c823aaf
commit
b7d4cab412
|
@ -163,7 +163,7 @@ struct _ImlibImage {
|
||||||
ImlibLoader *__imlib_FindBestLoader(const char *file, const char *format,
|
ImlibLoader *__imlib_FindBestLoader(const char *file, const char *format,
|
||||||
int for_save);
|
int for_save);
|
||||||
int __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
|
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);
|
uint32_t *__imlib_AllocateData(ImlibImage * im);
|
||||||
void __imlib_FreeData(ImlibImage * im);
|
void __imlib_FreeData(ImlibImage * im);
|
||||||
|
|
|
@ -148,7 +148,7 @@ __imlib_FileContextClose(ImlibImageFileInfo * fi)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
__imlib_ImageFileContextPush(ImlibImage * im, bool load, char *file)
|
__imlib_ImageFileContextPush(ImlibImage * im, char *file)
|
||||||
{
|
{
|
||||||
ImlibImageFileInfo *fi;
|
ImlibImageFileInfo *fi;
|
||||||
|
|
||||||
|
@ -553,7 +553,7 @@ __imlib_LoadImage(const char *file, ImlibLoadArgs * ila)
|
||||||
im->key = im_key;
|
im->key = im_key;
|
||||||
im->frame = ila->frame;
|
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))
|
__imlib_FileContextOpen(im->fi, ila->fp, ila->fdata, st.st_size))
|
||||||
{
|
{
|
||||||
ila->err = errno;
|
ila->err = errno;
|
||||||
|
@ -692,15 +692,15 @@ __imlib_LoadImageData(ImlibImage * im)
|
||||||
}
|
}
|
||||||
|
|
||||||
__EXPORT__ int
|
__EXPORT__ int
|
||||||
__imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, const char *file,
|
__imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, int load_data,
|
||||||
int load_data)
|
const char *file)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
if (!l || !im)
|
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);
|
rc = __imlib_FileContextOpen(im->fi, NULL, NULL, 0);
|
||||||
if (rc)
|
if (rc)
|
||||||
return LOAD_FAIL;
|
return LOAD_FAIL;
|
||||||
|
@ -841,7 +841,7 @@ __imlib_SaveImage(ImlibImage * im, const char *file, ImlibLoadArgs * ila)
|
||||||
if (ila->pfunc)
|
if (ila->pfunc)
|
||||||
__imlib_LoadCtxInit(im, &ilc, ila->pfunc, ila->pgran);
|
__imlib_LoadCtxInit(im, &ilc, ila->pfunc, ila->pgran);
|
||||||
|
|
||||||
__imlib_ImageFileContextPush(im, false, strdup(file));
|
__imlib_ImageFileContextPush(im, strdup(file));
|
||||||
|
|
||||||
/* call the saver */
|
/* call the saver */
|
||||||
loader_ret = l->module->save(im);
|
loader_ret = l->module->save(im);
|
||||||
|
|
|
@ -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_CreateImage(int w, int h, uint32_t * data);
|
||||||
ImlibImage *__imlib_LoadImage(const char *file, ImlibLoadArgs * ila);
|
ImlibImage *__imlib_LoadImage(const char *file, ImlibLoadArgs * ila);
|
||||||
int __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
|
int __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im,
|
||||||
const char *file, int load_data);
|
int load_data, const char *file);
|
||||||
int __imlib_LoadImageData(ImlibImage * im);
|
int __imlib_LoadImageData(ImlibImage * im);
|
||||||
void __imlib_DirtyImage(ImlibImage * im);
|
void __imlib_DirtyImage(ImlibImage * im);
|
||||||
void __imlib_FreeImage(ImlibImage * im);
|
void __imlib_FreeImage(ImlibImage * im);
|
||||||
|
|
|
@ -54,7 +54,7 @@ decompress_load(ImlibImage * im, int load_data, const char *const *pext,
|
||||||
close(dest);
|
close(dest);
|
||||||
|
|
||||||
if (res)
|
if (res)
|
||||||
rc = __imlib_LoadEmbedded(loader, im, tmp, load_data);
|
rc = __imlib_LoadEmbedded(loader, im, load_data, tmp);
|
||||||
|
|
||||||
unlink(tmp);
|
unlink(tmp);
|
||||||
|
|
||||||
|
|
|
@ -531,7 +531,7 @@ _load(ImlibImage * im, int load_data)
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = __imlib_LoadEmbedded(loader, im, tmp, load_data);
|
rc = __imlib_LoadEmbedded(loader, im, load_data, tmp);
|
||||||
|
|
||||||
unlink(tmp);
|
unlink(tmp);
|
||||||
}
|
}
|
||||||
|
@ -565,7 +565,7 @@ _load(ImlibImage * im, int load_data)
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = __imlib_LoadEmbedded(loader, im, file, load_data);
|
rc = __imlib_LoadEmbedded(loader, im, load_data, file);
|
||||||
|
|
||||||
#if USE_TAGS
|
#if USE_TAGS
|
||||||
if (!im->loader)
|
if (!im->loader)
|
||||||
|
|
Loading…
Reference in New Issue