X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=620848b043aac592c7a4091e1be8d9e9361c3911;hb=8612fcfb99f4ed97f49c3617fd2ae291877c8c8e;hp=d2cb6814cc9336b792e19e9a3ce5e01807d15c1d;hpb=766e7ae9bfeb1dc0454d7b5b37296b91859831cb;p=chaz%2Fopenbox diff --git a/render/gradient.c b/render/gradient.c index d2cb6814..620848b0 100644 --- a/render/gradient.c +++ b/render/gradient.c @@ -371,6 +371,9 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) RrPixel32 current; RrColor *primary_light, *secondary_light; + VARS(y1); + VARS(y3); + r = sf->primary->r; r += r >> 2; g = sf->primary->g; @@ -393,10 +396,7 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) if (b > 0xFF) b = 0xFF; secondary_light = RrColorNew(a->inst, r, g, b); - VARS(y1); SETUP(y1, primary_light, sf->primary, (h / 2) -1); - - VARS(y3); SETUP(y3, sf->secondary, secondary_light, (h / 2) -1); for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */ @@ -458,28 +458,30 @@ static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h) VARS(x); SETUP(x, sf->primary, sf->secondary, w/2); - for (x = w - 1; x > w/2-1; --x) { /* 0 -> w-1 */ - current = COLOR(x); - datav = data; - for (y = h - 1; y >= 0; --y) { /* 0 -> h */ - *datav = current; - datav += w; - } - ++data; + if (w > 1) { + for (x = w - 1; x > w/2-1; --x) { /* 0 -> w-1 */ + current = COLOR(x); + datav = data; + for (y = h - 1; y >= 0; --y) { /* 0 -> h */ + *datav = current; + datav += w; + } + ++data; - NEXT(x); - } - SETUP(x, sf->secondary, sf->primary, w/2); - for (x = w/2 - 1; x > 0; --x) { /* 0 -> w-1 */ - current = COLOR(x); - datav = data; - for (y = h - 1; y >= 0; --y) { /* 0 -> h */ - *datav = current; - datav += w; + NEXT(x); } - ++data; + SETUP(x, sf->secondary, sf->primary, w/2); + for (x = w/2 - 1; x > 0; --x) { /* 0 -> w-1 */ + current = COLOR(x); + datav = data; + for (y = h - 1; y >= 0; --y) { /* 0 -> h */ + *datav = current; + datav += w; + } + ++data; - NEXT(x); + NEXT(x); + } } current = COLOR(x); for (y = h - 1; y >= 0; --y) /* 0 -> h */