[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.22,1.23 wsconv.c,1.3,1.4 wsconv.h,1.2,1.3

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/wm
In directory mplayer:/var/tmp.root/cvs-serv30236/Gui/wm

Modified Files:
	ws.c wsconv.c wsconv.h 
Log Message:
app michale's rgb32tobgr32

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ws.c	6 Nov 2001 12:32:27 -0000	1.22
+++ ws.c	9 Nov 2001 13:05:55 -0000	1.23
@@ -245,7 +245,8 @@
      #ifdef DEBUG
       fprintf( stderr,"rgb32 to bgr32\n" );
      #endif
-     wsConvFunc=BGR8880_to_BGR8880_c;
+//     wsConvFunc=BGR8880_to_BGR8880_c;
+     wsConvFunc=rgb32tobgr32;
      break;
    case wsRGB24:
      #ifdef DEBUG

Index: wsconv.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/wsconv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wsconv.c	6 Nov 2001 12:32:27 -0000	1.3
+++ wsconv.c	9 Nov 2001 13:05:55 -0000	1.4
@@ -18,7 +18,7 @@
 
 #define SWAP_RGB_24(src,dst) dst[1]=src[0];dst[1]=src[1];dst[2]=src[0]
 
-void BGR8880_to_RGB555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_RGB555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -31,7 +31,7 @@
   }
 }
 
-void BGR8880_to_BGR555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_BGR555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -44,7 +44,7 @@
   }
 }
 
-void BGR8880_to_RGB565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_RGB565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -57,7 +57,7 @@
   }
 }
 
-void BGR8880_to_BGR565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_BGR565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -70,7 +70,7 @@
   }
 }
 
-void BGR8880_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 {
  int i;
  for(i = 0; i < num_pixels / 4; i++)
@@ -81,7 +81,7 @@
   }
 }
 
-void BGR8880_to_BGR888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_BGR888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 {
  int i;
  for(i = 0; i < num_pixels / 4; i++)
@@ -92,7 +92,7 @@
   }
 }
 
-void BGR8880_to_BGR8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_BGR8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 {
  int i;
  for(i = 0; i < num_pixels / 4; i++)
@@ -103,7 +103,7 @@
   }
 }
 
-void BGR8880_to_RGB8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_RGB8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 { memcpy( out_pixels,in_pixels,num_pixels ); }
 
 /*
@@ -119,7 +119,7 @@
 #define RGB16_MIDDLE_MASK 0x07e0
 #define RGB16_UPPER_MASK  0xf800
 
-void RGB565_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels)
+void RGB565_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels)
 {
  unsigned short in_pixel;
  int i;
@@ -169,7 +169,7 @@
 static mmx_t lower_dword_mask; // Mask for the lower doublewords
 static mmx_t upper_dword_mask; // Mask for the upper doublewords
 
-void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,int num_pixels)
+void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,unsigned num_pixels)
 {
  int imax = num_pixels/4;
  int i;

Index: wsconv.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/wsconv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wsconv.h	4 Oct 2001 20:33:29 -0000	1.2
+++ wsconv.h	9 Nov 2001 13:05:55 -0000	1.3
@@ -16,23 +16,23 @@
                                 pixel<<=5;\
                                 pixel|=(r>>3)
 
-typedef void(*wsTConvFunc)( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+typedef void(*wsTConvFunc)( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
 extern wsTConvFunc wsConvFunc;
 
-extern void BGR8880_to_RGB555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_BGR555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_RGB565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_BGR565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
-extern void BGR8880_to_BGR888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
-extern void BGR8880_to_BGR8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
-extern void BGR8880_to_RGB8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
+extern void BGR8880_to_RGB555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
+extern void BGR8880_to_BGR555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_RGB565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_BGR565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_BGR888_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_BGR8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned  num_pixels );
+extern void BGR8880_to_RGB8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned  num_pixels );
 
 #ifdef xHAVE_MMX
- extern void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,int num_pixels);
+ extern void BGR8880_to_RGB888_mmx( const unsigned char * in_pixels,unsigned char * out_pixels,unsigned num_pixels);
 #endif
 
-extern void RGB565_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels);
+extern void RGB565_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels);
 
 extern void initConverter( void );