comparison Gui/skin/skin.c @ 2717:5fa8c079ee3c

fix small xshape bug

2716:5e10c7239819

   strcpy( tmp,path ); strcat( tmp,fname );
   if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
   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 ( 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; }
    }
    #ifdef DEBUG
     dbprintf( 3,"[skin]  mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
    #endif
   #else

2717:5fa8c079ee3c

   strcpy( tmp,path ); strcat( tmp,fname );
   if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
   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 ( 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 ( defList->main.Mask.Image != NULL )
      {
       txSample d;
       Convert1to32( &defList->main.Mask,&d );
       tgaWriteTexture( "debug.tga",&d );
      }
    }
    #ifdef DEBUG
     dbprintf( 3,"[skin]  mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
    #endif
   #else