From b48a7cce8f8fbc964693d59420fad17feac224ce Mon Sep 17 00:00:00 2001 From: William Skaggs Date: Mon, 19 Jul 2004 14:12:30 +0000 Subject: [PATCH] Bill Skaggs * app/core/gimpchannel-combine.c: put in two lines accidentally omitted in previous change, improve doc comment. --- ChangeLog | 5 +++++ app/core/gimpchannel-combine.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1376929439..2a3cf05310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-19 Bill Skaggs + + * app/core/gimpchannel-combine.c: put in two lines accidentally + omitted in previous change, improve doc comment. + 2004-07-19 Michael Natterer * libgimpbase/gimpwin32-io.h: added copyright header, added diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c index edc2f3e6e0..146926fc30 100644 --- a/app/core/gimpchannel-combine.c +++ b/app/core/gimpchannel-combine.c @@ -201,9 +201,9 @@ gimp_channel_combine_rect (GimpChannel *mask, * @h: height of ellipse bounding box * @antialias: if %TRUE, antialias the ellipse * - * Mainly used for elliptical selections. If @op is "replace" or - * "add", sets pixels within the ellipse to 255. If @op is - * "subtract", sets pixels within to zero. If antialiasing is + * Mainly used for elliptical selections. If @op is %GIMP_CHANNEL_OP_REPLACE or + * %GIMP_CHANNEL_OP_ADD, sets pixels within the ellipse to 255. If @op is + * %GIMP_CHANNEL_OP_SUBTRACT, sets pixels within to zero. If antialiasing is * turned on, a pixels that impinge on the edge of the ellipse * are set to intermediate values, depending on how much they * overlap. @@ -235,6 +235,9 @@ gimp_channel_combine_ellipse (GimpChannel *mask, if (!w || !h) return; + a = w / 2.; + b = h / 2.; + a_sqr = (w * w / 4.0); b_sqr = (h * h / 4.0); aob_sqr = a_sqr / b_sqr;