ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.67 by sasha, Tue Aug 14 14:06:51 2007 UTC vs.
Revision 1.68 by sasha, Wed Aug 15 17:05:07 2007 UTC

891 { 891 {
892 ShadingInfo as_shade; 892 ShadingInfo as_shade;
893 as_shade.shading = (shade == 0) ? 100 : shade; 893 as_shade.shading = (shade == 0) ? 100 : shade;
894 894
895 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 895 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
896 if (flags & tintSet)
896 tint.get (c); 897 tint.get (c);
897 as_shade.tintColor.red = c.r; 898 as_shade.tintColor.red = c.r;
898 as_shade.tintColor.green = c.g; 899 as_shade.tintColor.green = c.g;
899 as_shade.tintColor.blue = c.b; 900 as_shade.tintColor.blue = c.b;
900 901
901 as_tint = shading2tint32 (&as_shade); 902 as_tint = shading2tint32 (&as_shade);
914 { 915 {
915 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 916 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
916 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 917 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
917 { 918 {
918 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 919 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
920 if (flags & tintSet)
919 tint.get (c); 921 tint.get (c);
920 ShadeXImage (target, result, shade, c.r, c.g, c.b); 922 ShadeXImage (target, result, shade, c.r, c.g, c.b);
921 } 923 }
922 } 924 }
923# endif 925# endif
924 if (result != NULL) 926 if (result != NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines