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

remove faulty assertions

Browse source 
these assertions did not hold true in practice when the underlying file
ends up changing during load.
This commit is contained in:
NRK 2023-07-02 19:16:55 +06:00
parent d19924f288
commit 69d4957a92
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
image.c
View file

@ -490,9 +490,22 @@ static bool img_load_multiframe(img_t *img, const fileinfo_t *file)
bool has_alpha; bool has_alpha;
imlib_context_set_image(m->cnt < 1 ? blank : m->frames[m->cnt - 1].im); imlib_context_set_image(m->cnt < 1 ? blank : m->frames[m->cnt - 1].im);
if ((canvas = imlib_clone_image()) == NULL || canvas = imlib_clone_image();
(frame = imlib_load_image_frame(file->path, n)) == NULL) if ((frame = imlib_load_image_frame(file->path, n)) != NULL) {
imlib_context_set_image(frame);
imlib_image_set_changes_on_disk(); /* see img_load() for rationale */
imlib_image_get_frame_info(&finfo);
}
/* NOTE: the underlying file can end up changing during load.
* so check if frame_count, w, h are all still the same or not.
*/
if (canvas == NULL || frame == NULL || finfo.frame_count != (int)fcnt ||
finfo.canvas_w != img->w || finfo.canvas_h != img->h)
{ {
if (frame != NULL) {
imlib_context_set_image(frame);
imlib_free_image();
}
if (canvas != NULL) { if (canvas != NULL) {
imlib_context_set_image(canvas); imlib_context_set_image(canvas);
imlib_free_image(); imlib_free_image();
@ -501,11 +514,6 @@ static bool img_load_multiframe(img_t *img, const fileinfo_t *file)
break; break;
} }
imlib_context_set_image(frame);
imlib_image_set_changes_on_disk(); /* see img_load() for rationale */
imlib_image_get_frame_info(&finfo);
assert(finfo.frame_count == (int)fcnt);
assert(finfo.canvas_w == img->w && finfo.canvas_h == img->h);
sx = finfo.frame_x; sx = finfo.frame_x;
sy = finfo.frame_y; sy = finfo.frame_y;
sw = finfo.frame_w; sw = finfo.frame_w;