summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Kendrick (humdrum) <rob.kendrick@codethink.co.uk>2013-04-25 18:08:23 +0100
committerRob Kendrick (humdrum) <rob.kendrick@codethink.co.uk>2013-04-25 18:08:23 +0100
commit8897ff1a3b3ede2ee2baf877ebcb1160135303c5 (patch)
tree08ec688bd0a4a5edff79e8d796c81aeabcc5ab90
parentc83878ff0de7c8860b52b88350812d50ef8a8db1 (diff)
downloadnetsurf-rjek/clang-warnings.tar.gz
Clang warning fixesrjek/clang-warnings
-rw-r--r--gtk/bitmap.c2
-rw-r--r--gtk/gdk.c2
-rw-r--r--gtk/scaffolding.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/gtk/bitmap.c b/gtk/bitmap.c
index 0f89c6748..29ce2050c 100644
--- a/gtk/bitmap.c
+++ b/gtk/bitmap.c
@@ -284,7 +284,7 @@ void bitmap_modified(void *vbitmap) {
pixel_count = cairo_image_surface_get_width(gbitmap->surface) *
cairo_image_surface_get_height(gbitmap->surface);
- pixels = (uint32_t *)cairo_image_surface_get_data(gbitmap->surface);
+ pixels = (uint32_t *)(void *)cairo_image_surface_get_data(gbitmap->surface);
if (fmt == CAIRO_FORMAT_RGB24) {
for (pixel_loop=0; pixel_loop < pixel_count; pixel_loop++) {
diff --git a/gtk/gdk.c b/gtk/gdk.c
index 22569285d..f2a63abc7 100644
--- a/gtk/gdk.c
+++ b/gtk/gdk.c
@@ -33,7 +33,7 @@ convert_alpha(guchar *dest_data,
int x, y;
for (y = 0; y < height; y++) {
- guint32 *src = (guint32 *) src_data;
+ guint32 *src = (guint32 *) (void *) src_data;
for (x = 0; x < width; x++) {
guint alpha = src[x] >> 24;
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 4097837a9..2ec3b64ff 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -610,7 +610,7 @@ MULTIHANDLER(newwindow)
MULTIHANDLER(newtab)
{
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
- nsurl *url;
+ nsurl *url = NULL;
nserror error;
if (!nsoption_bool(new_blank)) {