Mercurial > mplayer.hg

comparison gui/bitmap.c @ 29263:0f1b5b68af32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents b0a7b35b78d2
children f01023c524c3
comparison
equal deleted inserted replaced
29262:7d545a6b8aff 29263:0f1b5b68af32
32 int decode_ok; 32 int decode_ok;
33 void *data; 33 void *data;
34 int len; 34 int len;
35 AVCodecContext *avctx; 35 AVCodecContext *avctx;
36 AVFrame *frame; 36 AVFrame *frame;
37 37
38 FILE *fp=fopen( fname,"rb" ); 38 FILE *fp=fopen( fname,"rb" );
39 if ( !fp ) 39 if ( !fp )
40 { 40 {
41 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s )\n",fname ); 41 mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s )\n",fname );
42 return 1; 42 return 1;
43 } 43 }
44 44
106 } 106 }
107 107
108 static void Normalize( txSample * bf ) 108 static void Normalize( txSample * bf )
109 { 109 {
110 int i; 110 int i;
111 #ifndef WORDS_BIGENDIAN 111 #ifndef WORDS_BIGENDIAN
112 for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i+3]=0; 112 for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i+3]=0;
113 #else 113 #else
114 for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0; 114 for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0;
115 #endif 115 #endif
116 } 116 }
117 117
118 static unsigned char tmp[512]; 118 static unsigned char tmp[512];
119 119
144 144
145 int bpRead( char * fname, txSample * bf ) 145 int bpRead( char * fname, txSample * bf )
146 { 146 {
147 fname=fExist( fname ); 147 fname=fExist( fname );
148 if ( fname == NULL ) return -2; 148 if ( fname == NULL ) return -2;
149 if ( pngRead( fname,bf ) ) 149 if ( pngRead( fname,bf ) )
150 { 150 {
151 mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] unknown file type ( %s )\n",fname ); 151 mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] unknown file type ( %s )\n",fname );
152 return -5; 152 return -5;
153 } 153 }
154 if ( bf->BPP < 24 ) 154 if ( bf->BPP < 24 )