[Mplayer-cvslog] CVS: main/Gui/skin skin.c,1.8,1.9

Zoltan Ponekker pontscho at mplayer.dev.hu
Fri Nov 9 13:58:47 CET 2001


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

Modified Files:
	skin.c 
Log Message:
uuupsz ... 1l cola ;)

Index: skin.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/skin/skin.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- skin.c	5 Nov 2001 17:00:42 -0000	1.8
+++ skin.c	9 Nov 2001 12:58:43 -0000	1.9
@@ -132,27 +132,8 @@
    defList->main.width=defList->main.Bitmap.Width;
    defList->main.height=defList->main.Bitmap.Height;
    #ifdef HAVE_XSHAPE
-/*
-    defList->main.Mask.Width=defList->main.Bitmap.Width;
-    defList->main.Mask.Height=defList->main.Bitmap.Height;
-    defList->main.Mask.BPP=1;
-    defList->main.Mask.ImageSize=defList->main.Mask.Width * defList->main.Mask.Height / 8;
-    defList->main.Mask.Image=(char *)calloc( 1,defList->main.Mask.ImageSize );
-    if ( defList->main.Mask.Image == NULL ) message( True,MSGTR_NEMFMM );
-    {
-     int i,b,c=0; unsigned long * buf = NULL; unsigned char tmp = 0; int nothaveshape = 1;
-     buf=(unsigned long *)defList->main.Bitmap.Image;
-     for ( b=0,i=0;i < defList->main.Mask.Width * defList->main.Mask.Height;i++ )
-      {
-       if ( buf[i] != 0x00ff00ff ) tmp=( tmp >> 1 )|128;
-        else { tmp=tmp >> 1; buf[i]=nothaveshape=0; }
-       if ( b++ == 7 ) { defList->main.Mask.Image[c++]=tmp; tmp=b=0; }
-      }
-     if ( b ) defList->main.Mask.Image[c]=tmp;
-//     if ( nothaveshape ) { free( defList->main.Mask.Image ); defList->main.Mask.Image=NULL; }
-    }
-*/
     Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff );
+#if 0    
     {
      if ( defList->main.Mask.Image != NULL )
       {
@@ -161,6 +142,7 @@
        tgaWriteTexture( "debug.tga",&d );
       }
     }
+#endif
     #ifdef DEBUG
      dbprintf( 3,"[skin]  mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
     #endif




More information about the MPlayer-cvslog mailing list