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

fix: -A not working (#503)

Browse source 
the imlib2 based multi-frame loader has not respected -A setting
since it's introduction in commit 76c2b81b.

also change multi.framedelay to `int` to avoid signedness change
warning.

Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/503
Reviewed-by: eylles <eylles@noreply.codeberg.org>
This commit is contained in:
NRK 2024-06-18 15:08:37 +00:00
parent faf67fcc62
commit 36d5b27fff
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
image.c
View file

@ -234,7 +234,8 @@ static bool img_load_multiframe(img_t *img, const fileinfo_t *file)
imlib_context_set_blend(!!(finfo.frame_flags & IMLIB_FRAME_BLEND)); imlib_context_set_blend(!!(finfo.frame_flags & IMLIB_FRAME_BLEND));
imlib_blend_image_onto_image(frame, has_alpha, 0, 0, sw, sh, sx, sy, sw, sh); imlib_blend_image_onto_image(frame, has_alpha, 0, 0, sw, sh, sx, sy, sw, sh);
m->frames[m->cnt].im = canvas; m->frames[m->cnt].im = canvas;
m->frames[m->cnt].delay = finfo.frame_delay ? finfo.frame_delay : DEF_ANIM_DELAY; m->frames[m->cnt].delay = m->framedelay ? m->framedelay :
(finfo.frame_delay ? finfo.frame_delay : DEF_ANIM_DELAY);
m->length += m->frames[m->cnt].delay; m->length += m->frames[m->cnt].delay;
m->cnt++; m->cnt++;
img_free(frame, false); img_free(frame, false);

2
nsxiv.h
View file

@ -180,7 +180,7 @@ typedef struct {
unsigned int cnt; unsigned int cnt;
unsigned int sel; unsigned int sel;
bool animate; bool animate;
unsigned int framedelay; int framedelay;
int length; int length;
} multi_img_t; } multi_img_t;