diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-06-23 16:14:41 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-06-23 16:14:41 +0200 |
commit | ce9ea5448007bd412485f457e89adc8eb44492b6 (patch) | |
tree | 00628d0f77be1bf1bb76ff0e8d29fd724ada2210 | |
parent | 8cf9283bd23a2824c16601eca10b38065374e012 (diff) | |
parent | ffc87da60b2262432d56f15332b3edd15b7e00b2 (diff) | |
download | nx-libs-ce9ea5448007bd412485f457e89adc8eb44492b6.tar.gz nx-libs-ce9ea5448007bd412485f457e89adc8eb44492b6.tar.bz2 nx-libs-ce9ea5448007bd412485f457e89adc8eb44492b6.zip |
Merge branch 'pr/anti-aliasing-rgba-crash' into 3.6.x
-rw-r--r-- | nx-X11/lib/Xrender/Color.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/Xrender/Color.c b/nx-X11/lib/Xrender/Color.c index 4f934f038..6875204e6 100644 --- a/nx-X11/lib/Xrender/Color.c +++ b/nx-X11/lib/Xrender/Color.c @@ -85,8 +85,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) def->blue = coreColor.blue; def->alpha = 0xffff; } - def->red = (def->red * def->alpha) / 65535; - def->green = (def->green * def->alpha) / 65535; - def->blue = (def->blue * def->alpha) / 65535; + def->red = (def->red * def->alpha) / 0xffffU; + def->green = (def->green * def->alpha) / 0xffffU; + def->blue = (def->blue * def->alpha) / 0xffffU; return 1; } |