pulling in changes from xorg-server-1.2-apple branch

This commit is contained in:
Ben Byer
2007-11-04 05:13:19 -08:00
parent 181468db92
commit ff9929ed48
7 changed files with 34 additions and 32 deletions

View File

@@ -2,8 +2,6 @@
*
* Xplugin cursor support
*
**************************************************************/
/*
* Copyright (c) 2001 Torrey T. Lyons and Greg Parker.
* Copyright (c) 2002 Apple Computer, Inc.
* All Rights Reserved.
@@ -84,8 +82,17 @@ load_cursor(CursorPtr src, int screen)
#ifdef ARGB_CURSOR
if (src->bits->argb != NULL)
{
rowbytes = src->bits->width * sizeof(CARD32);
#if BITMAP_BIT_ORDER == MSBFirst
rowbytes = src->bits->width * sizeof (CARD32);
data = (uint32_t *) src->bits->argb;
#else
const uint32_t *be_data=(uint32_t *) src->bits->argb;
unsigned i;
rowbytes = src->bits->width * sizeof (CARD32);
data=alloca (rowbytes * src->bits->height);
for(i=0;i<(src->bits->width*src->bits->height);i++)
data[i]=ntohl(be_data[i]);
#endif
}
else
#endif