X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ab1dc14b220747e527d507d40905a24ba5c692d9..4618713ae48aac51c6f1a2474cc981f32c2bbede:/src/nsimage.m diff --git a/src/nsimage.m b/src/nsimage.m index 884c0763fd..a1703272ad 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -1,6 +1,6 @@ /* Image support for the NeXT/Open/GNUstep and MacOSX window system. - Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2012 - Free Software Foundation, Inc. + Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2013 Free Software + Foundation, Inc. This file is part of GNU Emacs. @@ -334,7 +334,7 @@ static EmacsImage *ImageList = nil; { NSSize s = [self size]; unsigned char *planes[5]; - CGFloat r, g, b, a; + EmacsCGFloat r, g, b, a; NSColor *rgbColor; if (bmRep == nil || color == nil) @@ -437,7 +437,7 @@ static EmacsImage *ImageList = nil; else { NSColor *color = [bmRep colorAtX: x y: y]; - CGFloat r, g, b, a; + EmacsCGFloat 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)