[Mplayer-cvslog] CVS: main/Gui/bitmap/bmp bmp.c,1.3,1.4

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/bitmap/bmp
In directory mplayer:/var/tmp.root/cvs-serv25081/Gui/bitmap/bmp

Modified Files:
	bmp.c 
Log Message:
new gui interface, and gtk moved into mplayer process. fork ... bleh :)

Index: bmp.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/bitmap/bmp/bmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bmp.c	4 Oct 2001 20:33:28 -0000	1.3
+++ bmp.c	23 Feb 2002 15:12:51 -0000	1.4
@@ -27,7 +27,6 @@
 
 #include "bmp.h"
 #include "../bitmap.h"
-#include "../../error.h"
 
 int bmpRead( unsigned char * fname,txSample * bF )
 {
@@ -40,16 +39,12 @@
 
  if ( (BMP=fopen( fname,"rt" )) == NULL )
   {
-#ifdef DEBUG
-   dbprintf( 4,"[bmp] File not found ( %s ).\n",fname );
-#endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp] File not found ( %s ).\n",fname );
    return 1;
   }
  if ( (i=fread( bmpHeader,54,1,BMP )) != 1 )
   {
-#ifdef DEBUG
-   dbprintf( 4,"[bmp] Header read error ( %s ).\n",fname );
-#endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp] Header read error ( %s ).\n",fname );
    return 2;
   }
 // memcpy( &bF->Size,&bmpHeader[2],4 );
@@ -61,31 +56,23 @@
 
  if ( bF->BPP < 24 )
   {
-   #ifdef DEBUG
-    dbprintf( 4,"[bmp] Sorry, this loader not supported 16 bit or less ...\n" );
-   #endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp] Sorry, this loader not supported 16 bit or less ...\n" );
    return 3;
   }
 
-#ifdef DEBUG
- dbprintf( 4,"[bmp] filename: %s\n",fname );
- dbprintf( 4,"[bmp]  size: %dx%d bits: %d\n",bF->Width,bF->Height,bF->BPP );
- dbprintf( 4,"[bmp]  imagesize: %lu\n",bF->ImageSize );
-#endif
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp] filename: %s\n",fname );
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp]  size: %dx%d bits: %d\n",bF->Width,bF->Height,bF->BPP );
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp]  imagesize: %lu\n",bF->ImageSize );
 
  if ( ( bF->Image=malloc( bF->ImageSize ) ) == NULL )
   {
-   #ifdef DEBUG
-    dbprintf( 4,"[bmp]  Not enough memory for image buffer.\n" );
-   #endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp]  Not enough memory for image buffer.\n" );
    return 4;
   }
 
  if ( (i=fread( bF->Image,bF->ImageSize,1,BMP )) != 1 )
    {
-   #ifdef DEBUG
-    dbprintf( 4,"[bmp]  Image read error.\n" );
-   #endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp]  Image read error.\n" );
    return 5;
   }
 
@@ -94,9 +81,7 @@
  linesize=bF->Width * ( bF->BPP / 8 );
  if ( (line=malloc( linesize )) == NULL )
   {
-   #ifdef DEBUG
-    dbprintf( 4,"[bmp] Not enough memory for flipping.\n" );
-   #endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bmp] Not enough memory for flipping.\n" );
    return 6;
   }