File netsurf-fix_pointer_arithmetics.patch of Package netsurf

Overview Repositories Revisions Requests Users Attributes Meta

File netsurf-fix_pointer_arithmetics.patch of Package netsurf (Revision c696d46fa46e91d78e21697b174927c7)

Currently displaying revision c696d46fa46e91d78e21697b174927c7 , Show latest

--- gtk/gtk_gui.c.orig	2008-03-23 16:22:26.000000000 +0100
+++ gtk/gtk_gui.c	2008-03-23 16:23:07.000000000 +0100
@@ -20,6 +20,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -402,7 +403,7 @@
 					gpointer user_data) 
 {
 	browser_window_form_select(select_menu_bw, select_menu_control,
-					(int)user_data);
+					(intptr_t)user_data);
 }
 
 void gui_create_form_select_menu(struct browser_window *bw,
@@ -434,7 +435,7 @@
 				GTK_CHECK_MENU_ITEM(menu_item), TRUE);
 		
 		g_signal_connect(menu_item, "toggled",
-			G_CALLBACK(nsgtk_select_menu_clicked), (gpointer)i);
+			G_CALLBACK(nsgtk_select_menu_clicked), (intptr_t)i);
 		
 		gtk_menu_shell_append(GTK_MENU_SHELL(select_menu), menu_item);
 	}
--- image/bmpread.c.orig	2008-03-23 16:23:28.000000000 +0100
+++ image/bmpread.c	2008-03-23 16:25:10.000000000 +0100
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include "image/bmpread.h"
 #include "image/bitmap.h"
 #include "utils/log.h"
@@ -303,7 +304,7 @@
 		bmp->colour_table = NULL;
 		return BMP_INSUFFICIENT_MEMORY;
 	}
-	bmp->bitmap_offset = (int)data - (int)bmp->bmp_data;
+	bmp->bitmap_offset = (intptr_t)data - (intptr_t)bmp->bmp_data;
 	bitmap_set_suspendable(bmp->bitmap, bmp, bmp_invalidate);
 	return BMP_OK;
 }
@@ -401,7 +402,7 @@
 	if ((!bmp->ico) || (result != BMP_OK))
 		return result;
 
-	bytes = (int)bmp->bmp_data + bmp->buffer_size - (int)data;
+	bytes = (intptr_t)bmp->bmp_data + bmp->buffer_size - (intptr_t)data;
 	return bmp_decode_mask(bmp, data, bytes);
 }
 
@@ -426,12 +427,12 @@
 	top = bitmap_get_buffer(bmp->bitmap);
 	bottom = top + swidth * (bmp->height - 1);
 	end = data + bytes;
-	addr = ((unsigned int)data) & 3;
+	addr = ((intptr_t)data) & 3;
 	skip = bmp->bpp >> 3;
 	bmp->decoded = true;
 
 	for (y = 0; y < bmp->height; y++) {
-		while (addr != (((unsigned int)data) & 3))
+		while (addr != (((intptr_t)data) & 3))
 			data++;
 		if ((data + (skip * bmp->width)) > end)
 			return BMP_INSUFFICIENT_DATA;
@@ -486,11 +487,11 @@
 	top = bitmap_get_buffer(bmp->bitmap);
 	bottom = top + swidth * (bmp->height - 1);
 	end = data + bytes;
-	addr = ((unsigned int)data) & 3;
+	addr = ((intptr_t)data) & 3;
 	bmp->decoded = true;
 
 	for (y = 0; y < bmp->height; y++) {
-		if (addr != (((unsigned int)data) & 3))
+		if (addr != (((intptr_t)data) & 3))
 			data += 2;
 		if ((data + (2 * bmp->width)) > end)
 			return BMP_INSUFFICIENT_DATA;
@@ -553,11 +554,11 @@
 	top = bitmap_get_buffer(bmp->bitmap);
 	bottom = top + swidth * (bmp->height - 1);
 	end = data + bytes;
-	addr = ((unsigned int)data) & 3;
+	addr = ((intptr_t)data) & 3;
 	bmp->decoded = true;
 
 	for (y = 0; y < bmp->height; y++) {
-		while (addr != (((unsigned int)data) & 3))
+		while (addr != (((intptr_t)data) & 3))
 			data++;
 		bit = 32;
 		if ((data + (bmp->width / ppb)) > end)
@@ -599,10 +600,10 @@
 	top = bitmap_get_buffer(bmp->bitmap);
 	bottom = top + swidth * (bmp->height - 1);
 	end = data + bytes;
-	addr = ((unsigned int)data) & 3;
+	addr = ((intptr_t)data) & 3;
 
 	for (y = 0; y < bmp->height; y++) {
-		while (addr != (((unsigned int)data) & 3))
+		while (addr != (((intptr_t)data) & 3))
 			data++;
 		if ((data + (bmp->width >> 3)) > end)
 			return BMP_INSUFFICIENT_DATA;

Places

File netsurf-fix_pointer_arithmetics.patch of Package netsurf (Revision c696d46fa46e91d78e21697b174927c7)

Places