Ken Thomases : winemac: Rename create_cgimage_from_icon() to create_cgimage_from_icon_bitmaps().
Alexandre Julliard
julliard at winehq.org
Mon Mar 25 14:19:38 CDT 2013
Module: wine
Branch: master
Commit: 322ce433d5fbb3d1354c6e2ac7fa8943f21923c6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=322ce433d5fbb3d1354c6e2ac7fa8943f21923c6
Author: Ken Thomases <ken at codeweavers.com>
Date: Sun Mar 17 22:40:38 2013 -0500
winemac: Rename create_cgimage_from_icon() to create_cgimage_from_icon_bitmaps().
---
dlls/winemac.drv/mouse.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c
index 66214fe..d8c97b6 100644
--- a/dlls/winemac.drv/mouse.c
+++ b/dlls/winemac.drv/mouse.c
@@ -467,12 +467,12 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width,
/***********************************************************************
- * create_cgimage_from_icon
+ * create_cgimage_from_icon_bitmaps
*/
-static CGImageRef create_cgimage_from_icon(HDC hdc, HANDLE icon, HBITMAP hbmColor,
- unsigned char *color_bits, int color_size, HBITMAP hbmMask,
- unsigned char *mask_bits, int mask_size, int width,
- int height, int istep)
+static CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmColor,
+ unsigned char *color_bits, int color_size, HBITMAP hbmMask,
+ unsigned char *mask_bits, int mask_size, int width,
+ int height, int istep)
{
int i, has_alpha = FALSE;
DWORD *ptr;
@@ -655,8 +655,8 @@ static CFDictionaryRef create_cursor_frame(HDC hdc, const ICONINFOEXW *iinfo, HA
CFDictionarySetValue(frame, CFSTR("duration"), duration_number);
CFRelease(duration_number);
- cgimage = create_cgimage_from_icon(hdc, icon, hbmColor, color_bits, color_size,
- hbmMask, mask_bits, mask_size, width, height, istep);
+ cgimage = create_cgimage_from_icon_bitmaps(hdc, icon, hbmColor, color_bits, color_size,
+ hbmMask, mask_bits, mask_size, width, height, istep);
if (!cgimage)
{
CFRelease(frame);
More information about the wine-cvs
mailing list