Merge branch 'pr/anti-aliasing-rgba-crash' into 3.6.x

ce9ea544 · Mike Gabriel · 8cf9283b · ffc87da6 · ce9ea544
Unverified Commit ce9ea544 authored Jun 23, 2015 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Color.c nx-X11/lib/Xrender/Color.c +3 -3

No files found.
--- 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;
 }