X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=utils%2Fxft.c;h=92457527ee29e8e26198558e8d53b70af77afae6;hp=bdfbdb43e750d0850e41f8a80b26f72190151939;hb=refs%2Fheads%2Fmaster;hpb=78add6e627ee5f10e1fa6f3852602ea5066eee5a diff --git a/utils/xft.c b/utils/xft.c index bdfbdb43..92457527 100644 --- a/utils/xft.c +++ b/utils/xft.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2014-2016 Jamie Zawinski +/* xscreensaver, Copyright (c) 2014-2018 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -194,16 +194,12 @@ XftColorAllocValue (Display *dpy, if (!dpy || !visual || !color || !result) abort(); if (visual->class == TrueColor) { - int red_shift, red_len; - int green_shift, green_len; - int blue_shift, blue_len; - - red_shift = maskbase (visual->rgba_masks[0]); - red_len = masklen (visual->rgba_masks[0]); - green_shift = maskbase (visual->rgba_masks[1]); - green_len = masklen (visual->rgba_masks[1]); - blue_shift = maskbase (visual->rgba_masks[2]); - blue_len = masklen (visual->rgba_masks[2]); + int red_shift = maskbase (visual->red_mask); + int red_len = masklen (visual->red_mask); + int green_shift = maskbase (visual->green_mask); + int green_len = masklen (visual->green_mask); + int blue_shift = maskbase (visual->blue_mask); + int blue_len = masklen (visual->blue_mask); result->pixel = (((color->red >> (16 - red_len)) << red_shift) | ((color->green >> (16 - green_len)) << green_shift) | ((color->blue >> (16 - blue_len)) << blue_shift));