summaryrefslogtreecommitdiff
path: root/image/bmpread.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-02-25 17:58:00 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2008-02-25 17:58:00 +0000
commit1cf46a6792a9e243edb857e131e44338bcbbd341 (patch)
tree9d145155307f4bc19746e486c7cd49ef897a49a1 /image/bmpread.c
parent674591f63df9c9b1e8e02aef4992a24b39cda0fc (diff)
downloadnetsurf-1cf46a6792a9e243edb857e131e44338bcbbd341.tar.gz
netsurf-1cf46a6792a9e243edb857e131e44338bcbbd341.tar.bz2
SignednessWarnings.squash()
Aside from a number of instances of const being cast away (mostly relating to the urldb, which is correct to only export const data) this now builds warning-free with GCC 4 on x86, which is nice. svn path=/trunk/netsurf/; revision=3868
Diffstat (limited to 'image/bmpread.c')
-rw-r--r--image/bmpread.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/image/bmpread.c b/image/bmpread.c
index c89db98b7..f8ae53cc0 100644
--- a/image/bmpread.c
+++ b/image/bmpread.c
@@ -50,7 +50,7 @@ void bmp_invalidate(struct bitmap *bitmap, void *private_word);
* \return BMP_OK on success
*/
bmp_result bmp_analyse(struct bmp_image *bmp) {
- char *data = bmp->bmp_data;
+ char *data = (char *) bmp->bmp_data;
/* ensure we aren't already initialised */
if (bmp->bitmap)
@@ -87,7 +87,7 @@ bmp_result bmp_analyse(struct bmp_image *bmp) {
* \return BMP_OK on success
*/
bmp_result ico_analyse(struct ico_collection *ico) {
- char *data = ico->ico_data;
+ char *data = (char *) ico->ico_data;
unsigned int count, i;
bmp_result result;
struct ico_image *image;
@@ -126,7 +126,8 @@ bmp_result ico_analyse(struct ico_collection *ico) {
image->bmp.bmp_data = ico->ico_data + READ_INT(data, 12);
image->bmp.ico = true;
data += 16;
- result = bmp_analyse_header(&image->bmp, image->bmp.bmp_data);
+ result = bmp_analyse_header(&image->bmp,
+ (char *) image->bmp.bmp_data);
if (result != BMP_OK)
return result;
area = image->bmp.width * image->bmp.height;
@@ -370,7 +371,7 @@ bmp_result bmp_decode(struct bmp_image *bmp) {
assert(bmp->bitmap);
- data = bmp->bmp_data + bmp->bitmap_offset;
+ data = (char *) bmp->bmp_data + bmp->bitmap_offset;
bytes = bmp->buffer_size - bmp->bitmap_offset;
switch (bmp->encoding) {