From 0682a4f2156ef7441af5c6959858b6f26f487be6 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 15 Sep 2011 22:54:23 +0000 Subject: Appease GCC 3.4 svn path=/trunk/netsurf/; revision=12798 --- image/png.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'image') diff --git a/image/png.c b/image/png.c index a94e1a68b..fefb956b2 100644 --- a/image/png.c +++ b/image/png.c @@ -319,7 +319,7 @@ static bool nspng_process_data(struct content *c, const char *data, { nspng_content *png_c = (nspng_content *)c; union content_msg_data msg_data; - bool ret = true; + volatile bool ret = true; if (png_c->no_process_data) { return ret; @@ -427,10 +427,10 @@ png_cache_convert(struct content *c) png_structp png_ptr; png_infop info_ptr; png_infop end_info; - struct bitmap *bitmap = NULL; + volatile struct bitmap *bitmap = NULL; struct png_cache_read_data_s png_cache_read_data; png_uint_32 width, height; - png_bytep *row_pointers = NULL; + volatile png_bytep *row_pointers = NULL; png_cache_read_data.data = content__get_source_data(c, &png_cache_read_data.size); @@ -485,10 +485,10 @@ png_cache_convert(struct content *c) goto png_cache_convert_error; } - row_pointers = calc_row_pointers(bitmap); + row_pointers = calc_row_pointers((struct bitmap *) bitmap); if (row_pointers != NULL) { - png_read_image(png_ptr, row_pointers); + png_read_image(png_ptr, (png_bytep *) row_pointers); } png_cache_convert_error: @@ -496,9 +496,9 @@ png_cache_convert_error: /* cleanup png read */ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - free(row_pointers); + free((png_bytep *) row_pointers); - return bitmap; + return (struct bitmap *) bitmap; } static bool nspng_convert(struct content *c) -- cgit v1.2.3