[Mplayer-cvslog] CVS: main/Gui/bitmap/png png.c,1.2,1.3

[Zoltan Ponekker]

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

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

Index: png.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/bitmap/png/png.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- png.c	18 Jan 2002 12:26:57 -0000	1.2
+++ png.c	23 Feb 2002 15:12:52 -0000	1.3
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 
 #include "./png.h"
-#include "../../error.h"
 #include <png.h>
 
 typedef struct
@@ -106,9 +105,7 @@
 
  if ( pngLoadRaw( fname,&raw ) )
   {
-   #ifdef DEBUG
-    dbprintf( 4,"[png] file read error ( %s ).\n",fname );
-   #endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s ).\n",fname );
    return 1;
   }
  bf->Width=raw.Width;
@@ -117,17 +114,13 @@
  bf->ImageSize=bf->Width * bf->Height * ( bf->BPP / 8 );
  if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL )
   {
-   #ifdef DEBUG
-    dbprintf( 4,"[png]  Not enough memory for image buffer.\n" );
-   #endif
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  Not enough memory for image buffer.\n" );
    return 2;
   }
  memcpy( bf->Image,raw.Data,bf->ImageSize );
  free( raw.Data );
- #ifdef DEBUG
-  dbprintf( 4,"[png] filename: %s.\n",fname );
-  dbprintf( 4,"[png]  size: %dx%d bits: %d\n",bf->Width,bf->Height,bf->BPP );
-  dbprintf( 4,"[png]  imagesize: %lu\n",bf->ImageSize );
- #endif
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] filename: %s.\n",fname );
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  size: %dx%d bits: %d\n",bf->Width,bf->Height,bf->BPP );
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  imagesize: %lu\n",bf->ImageSize );
  return 0;
 }