diff options
author | Kim Woelders <kim@woelders.dk> | 2020-02-17 17:53:51 +0100 |
---|---|---|
committer | Kim Woelders <kim@woelders.dk> | 2020-02-17 18:18:13 +0100 |
commit | f588650bb6e2cad15c5f7394b0962d3f1a2aaacd (patch) | |
tree | 6248c3daf973b19377b1f3426f9478730dc14829 | |
parent | 8d9f33d36576f2f81c35937b266837650fc7d110 (diff) | |
download | imlib2-f588650bb6e2cad15c5f7394b0962d3f1a2aaacd.tar.gz |
JPG, PNG loaders: Avoid clobber warnings
-rw-r--r-- | src/modules/loaders/loader_jpeg.c | 8 | ||||
-rw-r--r-- | src/modules/loaders/loader_png.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/modules/loaders/loader_jpeg.c b/src/modules/loaders/loader_jpeg.c index 616934f..3c7152a 100644 --- a/src/modules/loaders/loader_jpeg.c +++ b/src/modules/loaders/loader_jpeg.c @@ -57,6 +57,12 @@ _jdata_init(ImLib_JPEG_data * jd) return jem; } +static int +_jjump_init(ImLib_JPEG_data * jd) +{ + return sigsetjmp(jd->setjmp_buffer, 1); +} + char load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char load_data) @@ -77,7 +83,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, /* set up error handling */ cinfo.err = _jdata_init(&jdata); - if (sigsetjmp(jdata.setjmp_buffer, 1)) + if (_jjump_init(&jdata)) goto quit; jpeg_create_decompress(&cinfo); diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c index dc35e34..05963c9 100644 --- a/src/modules/loaders/loader_png.c +++ b/src/modules/loaders/loader_png.c @@ -12,6 +12,12 @@ comment_free(ImlibImage * im, void *data) free(data); } +static int +jump_init(png_structp png_ptr) +{ + return setjmp(png_jmpbuf(png_ptr)); +} + char load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char load_data) @@ -52,7 +58,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, if (!info_ptr) goto quit; - if (setjmp(png_jmpbuf(png_ptr))) + if (jump_init(png_ptr)) goto quit; png_init_io(png_ptr, f); |