diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-12-06 22:56:26 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-12-06 22:56:26 +0000 |
| commit | a8d58a409e0d7f94eb1ea6c688f8288dd5590d5c (patch) | |
| tree | 0ea3f6ed4982bbad48a5372cbd5d4118c3f69b37 | |
| parent | 17bbbde74ae114c629f6ce573a667e60c613bb3e (diff) | |
| download | gdk-pixbuf-a8d58a409e0d7f94eb1ea6c688f8288dd5590d5c.tar.gz | |
Fix incorrect masks in PACKED_COLOR definition. (#99795, John Finlay)
Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect
masks in PACKED_COLOR definition. (#99795,
John Finlay)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gdk/gdkpixmap.c | 4 |
7 files changed, 39 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9196946b0..52878b0d3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9196946b0..52878b0d3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9196946b0..52878b0d3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9196946b0..52878b0d3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9196946b0..52878b0d3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Dec 6 17:50:57 2002 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpixmap.c (PACKED_COLOR): Fix incorrect + masks in PACKED_COLOR definition. (#99795, + John Finlay) + Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenu.c (gtk_menu_window_size_request): Use diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 259d568d2..d73647fbe 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -496,7 +496,9 @@ make_solid_mask (GdkScreen *screen, gint width, gint height) return bitmap; } -#define PACKED_COLOR(c) ((((c)->red & 0xff) << 8) | ((c)->green & 0xff) | ((c)->blue >> 8)) +#define PACKED_COLOR(c) ((((c)->red & 0xff00) << 8) | \ + ((c)->green & 0xff00) | \ + ((c)->blue >> 8)) static GdkPixmap * gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap, |