diff --git a/ChangeLog b/ChangeLog index 57d938e5f5..b448446791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1999-02-22 Jay Cox + + * app/channel.c: fixed bug in channel_bounds + Sun Feb 21 22:37:56 MET 1999 Sven Neumann * libgimp/Makefile.am diff --git a/app/channel.c b/app/channel.c index 948677d3fb..e04a88ed9c 100644 --- a/app/channel.c +++ b/app/channel.c @@ -654,10 +654,10 @@ channel_bounds (Channel *mask, int *x1, int *y1, int *x2, int *y2) } } } - if (x1 > x2) - x2 = x1; - if (y1 > y2) - y2 = y1; + if (*x1 > *x2) + *x2 = *x1; + if (*y1 > *y2) + *y2 = *y1; } *x2 = BOUNDS (*x2 + 1, 0, GIMP_DRAWABLE(mask)->width); diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c index 948677d3fb..e04a88ed9c 100644 --- a/app/core/gimpchannel-combine.c +++ b/app/core/gimpchannel-combine.c @@ -654,10 +654,10 @@ channel_bounds (Channel *mask, int *x1, int *y1, int *x2, int *y2) } } } - if (x1 > x2) - x2 = x1; - if (y1 > y2) - y2 = y1; + if (*x1 > *x2) + *x2 = *x1; + if (*y1 > *y2) + *y2 = *y1; } *x2 = BOUNDS (*x2 + 1, 0, GIMP_DRAWABLE(mask)->width); diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c index 948677d3fb..e04a88ed9c 100644 --- a/app/core/gimpchannel.c +++ b/app/core/gimpchannel.c @@ -654,10 +654,10 @@ channel_bounds (Channel *mask, int *x1, int *y1, int *x2, int *y2) } } } - if (x1 > x2) - x2 = x1; - if (y1 > y2) - y2 = y1; + if (*x1 > *x2) + *x2 = *x1; + if (*y1 > *y2) + *y2 = *y1; } *x2 = BOUNDS (*x2 + 1, 0, GIMP_DRAWABLE(mask)->width); diff --git a/app/gimpchannel.c b/app/gimpchannel.c index 948677d3fb..e04a88ed9c 100644 --- a/app/gimpchannel.c +++ b/app/gimpchannel.c @@ -654,10 +654,10 @@ channel_bounds (Channel *mask, int *x1, int *y1, int *x2, int *y2) } } } - if (x1 > x2) - x2 = x1; - if (y1 > y2) - y2 = y1; + if (*x1 > *x2) + *x2 = *x1; + if (*y1 > *y2) + *y2 = *y1; } *x2 = BOUNDS (*x2 + 1, 0, GIMP_DRAWABLE(mask)->width);