From: Adrian Robert Date: Mon, 12 Oct 2009 00:26:41 +0000 (+0000) Subject: (EmacsImage-setXBMColor:,-getPixelAtX:Y:): Use CGFloat where appropriate. X-Git-Tag: emacs-pretest-23.1.90~842 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31e88bd8e73b3c99c389fee295aba67e4bf12033;p=emacs.git (EmacsImage-setXBMColor:,-getPixelAtX:Y:): Use CGFloat where appropriate. --- diff --git a/src/nsimage.m b/src/nsimage.m index 9ef7ad37a0f..87499b0a232 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -329,7 +329,7 @@ static EmacsImage *ImageList = nil; NSSize s = [self size]; int len = (int) s.width * s.height; unsigned char *planes[5]; - float r, g, b, a; + CGFloat r, g, b, a; NSColor *rgbColor; if (bmRep == nil || color == nil) @@ -431,7 +431,7 @@ static EmacsImage *ImageList = nil; else if (onTiger) { NSColor *color = [bmRep colorAtX: x y: y]; - float r, g, b, a; + CGFloat r, g, b, a; [color getRed: &r green: &g blue: &b alpha: &a]; return ((int)(a * 255.0) << 24) | ((int)(r * 255.0) << 16) | ((int)(g * 255.0) << 8)