mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shared: Fix release/debugoptimized build warning with gcc 

Fix ‘image’ clobbered by ‘longjmp’ warning using volatile.

jpeg_image_data members are now also declared volatile (like
png_image_data members) to explicitly request compilers to store them
on the stack (not in registers) to avoid warnings and bugs later.

Co-authored-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
Signed-off-by: Loïc Molinari <loic.molinari@collabora.com>
This commit is contained in:
Loïc Molinari 2024-06-13 12:17:11 +02:00 committed by Daniel Stone
parent 8c2d47f86d
commit d534977c3e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared/image-loader.c
View File

@ -110,8 +110,8 @@ swizzle_row(JSAMPLE *row, JDIMENSION width)
}
struct jpeg_image_data {
JSAMPLE *data;
bool all_data_read;
JSAMPLE *volatile data;
bool volatile all_data_read;
};
static pixman_image_t *
@ -183,7 +183,7 @@ error_exit(j_common_ptr cinfo)
static struct weston_image *
load_jpeg(FILE *fp, uint32_t image_load_flags)
{
struct weston_image *image;
struct weston_image *volatile image;
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
struct jpeg_image_data jpeg_image_data = { 0 };
@ -411,7 +411,7 @@ load_png_icc(FILE *fp, png_struct *png, png_info *info,
static struct weston_image *
load_png(FILE *fp, uint32_t image_load_flags)
{
struct weston_image *image = NULL;
struct weston_image *volatile image = NULL;
struct png_image_data png_image_data = { 0 };
png_struct *png;
png_info *info;