Fixed an alpha bug.

10 files changed, 42 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9c3c172e5..3b0d5cc6b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Oct  5 15:26:30 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c (gdk_rgb_convert_0888_br): Fixed a few long's that
+	should have been guint32. Thanks to Tristan Colgate for finding it.
+
 Sun Oct  4 22:47:22 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gtk/gtkcalendar.h:
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index becabbb20..011dd290a 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -1867,7 +1867,7 @@ gdk_rgb_convert_0888 (GdkImage *image,
 	  r = bp2[0];
 	  g = bp2[1];
 	  b = bp2[2];
-	  ((unsigned long *)obuf)[x] = (r << 16) | (g << 8) | b;
+	  ((guint32 *)obuf)[x] = (r << 16) | (g << 8) | b;
 	  bp2 += 3;
 	}
       bptr += rowstride;
@@ -1898,7 +1898,7 @@ gdk_rgb_convert_0888_br (GdkImage *image,
 	  r = bp2[0];
 	  g = bp2[1];
 	  b = bp2[2];
-	  ((unsigned long *)obuf)[x] = (b << 24) | (g << 16) | (r << 8);
+	  ((guint32 *)obuf)[x] = (b << 24) | (g << 16) | (r << 8);
 	  bp2 += 3;
 	}
       bptr += rowstride;
@@ -1929,7 +1929,7 @@ gdk_rgb_convert_8880_br (GdkImage *image,
 	  r = bp2[0];
 	  g = bp2[1];
 	  b = bp2[2];
-	  ((unsigned long *)obuf)[x] = (b << 16) | (g << 8) | r;
+	  ((guint32 *)obuf)[x] = (b << 16) | (g << 8) | r;
 	  bp2 += 3;
 	}
       bptr += rowstride;
diff --git a/gtk/testrgb.c b/gtk/testrgb.c
index d3eec48c0..92e6f1cc6 100644
--- a/gtk/testrgb.c
+++ b/gtk/testrgb.c
@@ -127,6 +127,8 @@ testrgb_rgb_test (GtkWidget *drawing_area)
 	       NUM_ITERS * (WIDTH * HEIGHT * 1e-6) / total_time);
     }
 
+  g_print ("Please submit these results to http://www.levien.com/gdkrgb/survey.html\n");
+
 #if 1
   for (x = 0; x < WIDTH; x++)
     {
diff --git a/tests/testrgb.c b/tests/testrgb.c
index d3eec48c0..92e6f1cc6 100644
--- a/tests/testrgb.c
+++ b/tests/testrgb.c
@@ -127,6 +127,8 @@ testrgb_rgb_test (GtkWidget *drawing_area)
 	       NUM_ITERS * (WIDTH * HEIGHT * 1e-6) / total_time);
     }
 
+  g_print ("Please submit these results to http://www.levien.com/gdkrgb/survey.html\n");
+
 #if 1
   for (x = 0; x < WIDTH; x++)
     {