From c0e5a4c74940bde34626817dd299f16c2a71a9a7 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 24 Jul 2003 11:10:47 +0000 Subject: [PATCH] fixed build rules. There must not be a dependency that causes 2003-07-24 Sven Neumann * app/composite/Makefile.am: fixed build rules. There must not be a dependency that causes gimp-composite-dispatch.[ch] to be regenerated since we don't want to depend on Python for our build. * app/core/gimpdrawable-blend.c (gradient_fill_region) (gradient_put_pixel): fixed a problem with the new gradient dithering on grayscale drawables (bug #118141). --- ChangeLog | 10 ++++++++++ app/composite/Makefile.am | 16 +++++++++++----- app/core/gimpdrawable-blend.c | 2 ++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b9c57c05b..38de0b3f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-07-24 Sven Neumann + + * app/composite/Makefile.am: fixed build rules. There must not be + a dependency that causes gimp-composite-dispatch.[ch] to be + regenerated since we don't want to depend on Python for our build. + + * app/core/gimpdrawable-blend.c (gradient_fill_region) + (gradient_put_pixel): fixed a problem with the new gradient + dithering on grayscale drawables (bug #118141). + 2003-07-24 Helvetix Victorinox * app/composite/gimp-composite-dispatch.[ch]: regenerated new code diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am index 7a60b33f9f..77bb47613b 100644 --- a/app/composite/Makefile.am +++ b/app/composite/Makefile.am @@ -36,7 +36,7 @@ libappcomposite_a_built_sources = \ libappcomposite_a_SOURCES = $(libappcomposite_a_built_sources) $(libappcomposite_a_sources) -gimp-composite-dispatch.c: make-gimp-composite-dispatch.py gimp-composite-generic.o +gimp-composite-dispatch.c: make-gimp-composite-dispatch.py $(srcdir)/make-gimp-composite-dispatch.py gimp-composite-generic.o gimp-composite-dispatch.h: gimp-composite-dispatch.c @@ -54,20 +54,26 @@ EXTRA_PROGRAMS = test-composite gimp-composite-test TESTS = test-composite gimp-composite-test -test_composite_DEPENDENCIES = $(gimpcomposite_dependencies) gimp-composite-regression.o +test_composite_SOURCES = \ + gimp-composite-regression.c \ + test-composite.c + +test_composite_DEPENDENCIES = $(gimpcomposite_dependencies) test_composite_LDADD = \ libappcomposite.a \ - gimp-composite-regression.o \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(GLIB_LIBS) -gimp_composite_test_DEPENDENCIES = $(gimpcomposite_dependencies) gimp-composite-regression.o +gimp_composite_test_SOURCES = \ + gimp-composite-regression.c \ + gimp-composite-test.c + +gimp_composite_test_DEPENDENCIES = $(gimpcomposite_dependencies) gimp_composite_test_LDADD = \ libappcomposite.a \ - gimp-composite-regression.o \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(GLIB_LIBS) diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c index 1fd993249a..fa8e9ac771 100644 --- a/app/core/gimpdrawable-blend.c +++ b/app/core/gimpdrawable-blend.c @@ -872,6 +872,7 @@ gradient_put_pixel (int x, if (g_rand_double (ppd->dither_rand) < dither_prob) color->a += (1.0 / 255.0); + if (gray > 1.0) gray = 1.0; if (color->a > 1.0) color->a = 1.0; } @@ -1147,6 +1148,7 @@ gradient_fill_region (GimpImage *gimage, if (g_rand_double (dither_rand) < dither_prob) color.a += (1.0 / 255.0); + if (gray > 1.0) gray = 1.0; if (color.a > 1.0) color.a = 1.0; }