[Dotgnu-pnet-commits] pnetlib/Xsharp XsharpSupport.c,1.21,1.22

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv21990/Xsharp

Modified Files:
        XsharpSupport.c 
Log Message:


Re-enable the 24bpp-MSBFirst optimization and fix the byte swapping.


Index: XsharpSupport.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/XsharpSupport.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** XsharpSupport.c     25 Nov 2003 22:24:45 -0000      1.21
--- XsharpSupport.c     26 Nov 2003 05:37:24 -0000      1.22
***************
*** 718,722 ****
  
  /*
!  * Write RGB data directly to an XImage, and perform a RGB-BGR byteswap.
   */
  static void Write_DirectSwap(Display *dpy, Colormap colormap, XImage *image,
--- 718,722 ----
  
  /*
!  * Write RGB data directly to an XImage, and perform an endian byteswap.
   */
  static void Write_DirectSwap(Display *dpy, Colormap colormap, XImage *image,
***************
*** 731,737 ****
                {
                        unsigned int value = (unsigned int)(*input++);
!                       value = ((value & 0x00FF0000) >> 16) |
!                                        (value & 0x0000FF00) |
!                                       ((value & 0x000000FF) << 16);
                        *output++ = value;
                }
--- 731,737 ----
                {
                        unsigned int value = (unsigned int)(*input++);
!                       value = ((value & 0x00FF0000) >> 8) |
!                                       ((value & 0x0000FF00) << 8) |
!                                       ((value & 0x000000FF) << 24);
                        *output++ = value;
                }
***************
*** 744,750 ****
                {
                        unsigned int value = (unsigned int)(*input++);
!                       value = ((value & 0x00FF0000) >> 16) |
!                                        (value & 0x0000FF00) |
!                                       ((value & 0x000000FF) << 16);
                        *output++ = (unsigned long)value;
                }
--- 744,750 ----
                {
                        unsigned int value = (unsigned int)(*input++);
!                       value = ((value & 0x00FF0000) >> 8) |
!                                       ((value & 0x0000FF00) << 8) |
!                                       ((value & 0x000000FF) << 24);
                        *output++ = (unsigned long)value;
                }
***************
*** 825,829 ****
                }
        }
- #if 0
        if(image->depth == 24 && image->red_mask == 0x00FF0000 &&
           image->green_mask == 0x0000FF00 && image->blue_mask == 0x000000FF &&
--- 825,828 ----
***************
*** 839,843 ****
                }
        }
- #endif
        if(image->depth == 16 && image->red_mask == 0x0000F800 &&
           image->green_mask == 0x000007E0 && image->blue_mask == 0x0000001F &&
--- 838,841 ----