comparison src/glyphs-msw.c @ 5936:574f0cded429 cygwin

try to replace all nnnL or nnnUL constants with EMACS_[U]INT
author Henry Thompson <ht@markup.co.uk>
date Sun, 13 Dec 2015 13:22:58 +0000
parents e2fae7783046
children
comparison
equal deleted inserted replaced
5935:d5eb0914ca1f 5936:574f0cded429
150 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = 150 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) =
151 IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT (ii); 151 IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT (ii);
152 } 152 }
153 } 153 }
154 154
155 #define BPLINE(width) ((int)(~3UL & (unsigned long)((width) +3))) 155 #define BPLINE(width) ((int)(~((EMACS_UINT)3) & (unsigned long)((width) +3)))
156 156
157 /************************************************************************/ 157 /************************************************************************/
158 /* convert from a series of RGB triples to a BITMAPINFO formated for the*/ 158 /* convert from a series of RGB triples to a BITMAPINFO formated for the*/
159 /* proper display */ 159 /* proper display */
160 /************************************************************************/ 160 /************************************************************************/
835 } 835 }
836 } 836 }
837 837
838 *width = xpmimage.width; 838 *width = xpmimage.width;
839 *height = xpmimage.height; 839 *height = xpmimage.height;
840 maskbpline = BPLINE ((~7UL & (unsigned long)(*width + 7)) / 8); 840 maskbpline = BPLINE ((~((EMACS_UINT)7) & (unsigned long)(*width + 7)) / 8);
841 841
842 *data = xnew_array_and_zero (Binbyte, *width * *height * 3); 842 *data = xnew_array_and_zero (Binbyte, *width * *height * 3);
843 843
844 if (!*data) 844 if (!*data)
845 { 845 {