diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 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-- | gtk/theme-bits/decompose-bits.c | 6 |
8 files changed, 45 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fadcee3d5c..168b3164a9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fadcee3d5c..168b3164a9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fadcee3d5c..168b3164a9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fadcee3d5c..168b3164a9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fadcee3d5c..168b3164a9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fadcee3d5c..168b3164a9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Feb 19 20:56:32 2002 Soeren Sandmann <sandmann@daimi.au.dk> + + * gtk/theme-bits/decompose-bits.c (do_part): fix bug (skipping all + black pixels). + 2002-02-19 Sven Neumann <sven@gimp.org> * examples/*/*.c: finish conversion to g_signal_* functions by @@ -174,6 +179,7 @@ Sun Feb 17 21:30:49 2002 Owen Taylor <otaylor@redhat.com> * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, examples/paned/Makefile: Make the paned example deprecation-clean. +>>>>>>> 1.3035 2002-02-17 jacob berkman <jacob@ximian.com> * Makefile.am: remove the packer example files as they don't exist diff --git a/gtk/theme-bits/decompose-bits.c b/gtk/theme-bits/decompose-bits.c index 0a49bda11a..9de556acb9 100644 --- a/gtk/theme-bits/decompose-bits.c +++ b/gtk/theme-bits/decompose-bits.c @@ -58,9 +58,9 @@ do_part (GdkPixbuf *pixbuf, while (n--) { - if ((part1_index > 0 && memcmp (p, color1, n_channels) == 0) || - (part2_index > 0 && memcmp (p, color2, n_channels) == 0) || - (part3_index > 0 && memcmp (p, color3, n_channels) == 0)) + if ((part1_index >= 0 && memcmp (p, color1, n_channels) == 0) || + (part2_index >= 0 && memcmp (p, color2, n_channels) == 0) || + (part3_index >= 0 && memcmp (p, color3, n_channels) == 0)) byte |= bit; if (bit == 0x80) |