penwing/zeniba-nsxiv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

img_load_webp: remove unnecessary casting

Browse source
This commit is contained in:
NRK 2021-11-07 01:08:22 +06:00 committed by N-R-K
parent eccd7de532
commit 3b6db44267
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
image.c
View file

@ -302,12 +302,11 @@ static bool img_load_webp(img_t *img, const fileinfo_t *file)
{ {
FILE *webp_file; FILE *webp_file;
WebPData data; WebPData data;
Imlib_Image im = NULL; Imlib_Image im = NULL;
struct WebPAnimDecoderOptions opts; struct WebPAnimDecoderOptions opts;
WebPAnimDecoder *dec = NULL; WebPAnimDecoder *dec = NULL;
struct WebPAnimInfo info; struct WebPAnimInfo info;
unsigned char *buf = NULL; unsigned char *buf = NULL, *bytes = NULL;
int ts; int ts;
const WebPDemuxer *demux; const WebPDemuxer *demux;
WebPIterator iter; WebPIterator iter;
@ -315,8 +314,6 @@ static bool img_load_webp(img_t *img, const fileinfo_t *file)
unsigned int delay; unsigned int delay;
bool err = false; bool err = false;
data.bytes = NULL;
if ((err = (webp_file = fopen(file->path, "rb")) == NULL)) { if ((err = (webp_file = fopen(file->path, "rb")) == NULL)) {
error(0, 0, "%s: Error opening webp image", file->name); error(0, 0, "%s: Error opening webp image", file->name);
goto fail; goto fail;
@ -324,11 +321,12 @@ static bool img_load_webp(img_t *img, const fileinfo_t *file)
fseek(webp_file, 0L, SEEK_END); fseek(webp_file, 0L, SEEK_END);
data.size = ftell(webp_file); data.size = ftell(webp_file);
rewind(webp_file); rewind(webp_file);
data.bytes = emalloc(data.size); bytes = emalloc(data.size);
if ((err = fread((unsigned char *)data.bytes, 1, data.size, webp_file) != data.size)) { if ((err = fread(bytes, 1, data.size, webp_file) != data.size)) {
error(0, 0, "%s: Error reading webp image", file->name); error(0, 0, "%s: Error reading webp image", file->name);
goto fail; goto fail;
} }
data.bytes = bytes;
/* Setup the WebP Animation Decoder */ /* Setup the WebP Animation Decoder */
if ((err = !WebPAnimDecoderOptionsInit(&opts))) { if ((err = !WebPAnimDecoderOptionsInit(&opts))) {
@ -391,7 +389,7 @@ static bool img_load_webp(img_t *img, const fileinfo_t *file)
fail: fail:
if (dec != NULL) if (dec != NULL)
WebPAnimDecoderDelete(dec); WebPAnimDecoderDelete(dec);
free((unsigned char *)data.bytes); free(bytes);
return !err; return !err;
} }
#endif /* HAVE_LIBWEBP */ #endif /* HAVE_LIBWEBP */