Merge from stable:

2002-08-01  Sven Neumann  <sven@gimp.org>

	Merge from stable:

	* gdk/gdkrgb.c: trivial changes to some debug code so it compiles
	with VERBOSE being defined.

diff --git a/ChangeLog b/ChangeLog
index 88a2375ed9bf8ff1a78c17b86a889e0e48c8cab1..2eaf4c48263e47ba3879b187ae9fc3f180734091 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-01  Sven Neumann  <sven@gimp.org>
+
+       Merge from stable:
+
+       * gdk/gdkrgb.c: trivial changes to some debug code so it compiles
+       with VERBOSE being defined.
+
 Thu Aug  1 11:26:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdkinternals.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88a2375ed9bf8ff1a78c17b86a889e0e48c8cab1..2eaf4c48263e47ba3879b187ae9fc3f180734091 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-08-01  Sven Neumann  <sven@gimp.org>
+
+       Merge from stable:
+
+       * gdk/gdkrgb.c: trivial changes to some debug code so it compiles
+       with VERBOSE being defined.
+
 Thu Aug  1 11:26:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdkinternals.h:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88a2375ed9bf8ff1a78c17b86a889e0e48c8cab1..2eaf4c48263e47ba3879b187ae9fc3f180734091 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-08-01  Sven Neumann  <sven@gimp.org>
+
+       Merge from stable:
+
+       * gdk/gdkrgb.c: trivial changes to some debug code so it compiles
+       with VERBOSE being defined.
+
 Thu Aug  1 11:26:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdkinternals.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88a2375ed9bf8ff1a78c17b86a889e0e48c8cab1..2eaf4c48263e47ba3879b187ae9fc3f180734091 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-08-01  Sven Neumann  <sven@gimp.org>
+
+       Merge from stable:
+
+       * gdk/gdkrgb.c: trivial changes to some debug code so it compiles
+       with VERBOSE being defined.
+
 Thu Aug  1 11:26:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdkinternals.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88a2375ed9bf8ff1a78c17b86a889e0e48c8cab1..2eaf4c48263e47ba3879b187ae9fc3f180734091 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-08-01  Sven Neumann  <sven@gimp.org>
+
+       Merge from stable:
+
+       * gdk/gdkrgb.c: trivial changes to some debug code so it compiles
+       with VERBOSE being defined.
+
 Thu Aug  1 11:26:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdkinternals.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88a2375ed9bf8ff1a78c17b86a889e0e48c8cab1..2eaf4c48263e47ba3879b187ae9fc3f180734091 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-08-01  Sven Neumann  <sven@gimp.org>
+
+       Merge from stable:
+
+       * gdk/gdkrgb.c: trivial changes to some debug code so it compiles
+       with VERBOSE being defined.
+
 Thu Aug  1 11:26:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdkinternals.h:

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 56ac8817622b3459a4b6cb514398b6ff0f9440ea..1f2f24bfd10bd5f9b434270a180590b47d293693 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -181,7 +181,7 @@ gdk_rgb_make_colorcube (GdkRgbInfo *image_info, gulong *pixels,
     {
       image_info->colorcube[i] = pixels[rt[i >> 8] + gt[(i >> 4) & 0x0f] + bt[i & 0x0f]];
 #ifdef VERBOSE
-      g_print ("%03x %02x %x %x %x\n", i, image-info->colorcube[i], rt[i >> 8], gt[(i >> 4) & 0x0f], bt[i & 0x0f]);
+      g_print ("%03x %02x %x %x %x\n", i, image_info->colorcube[i], rt[i >> 8], gt[(i >> 4) & 0x0f], bt[i & 0x0f]);
 #endif
     }
 }
@@ -3373,7 +3373,7 @@ gdk_rgb_cmap_get_info (GdkRgbCmap *cmap,
        ((rgb & 0xf000) >> 8) |
        ((rgb & 0xf0) >> 4);
 #ifdef VERBOSE
-      g_print ("%d %x %x %d\n", i, j, image_info->colorcube[j]);
+      g_print ("%d %x %x\n", i, j, image_info->colorcube[j]);
 #endif
       cmap_info->lut[i] = image_info->colorcube[j];
     }