Remove unused XPM-loading function pixbuf_load_xpm() from spuenc.c.

Remove unused function pixbuf_delete() from spuenc.[ch].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30601 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar committed 2010-02-16 19:34:41 +00:00
1 parent ff8c044318
commit 091e2a4313
2 files changed
-48

No files matched your search

-47
View File
@@ -229,50 +229,3 @@ pixbuf_encode_rle(int x, int y, int w, int h, char *inbuf, int stride,encodedat
}
encode_do_control(x,y, ed, &pb);
}
static void
pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) {
int colors, chrs, l, n;
char c[4], table[256];
unsigned char *b, *i;
sscanf( xpm[0], "%d %d %d %d", &pb->x, &pb->y, &colors, &chrs);
if( colors > 4 ) {
fprintf( stderr, "the pixmap MUST be 4 colors or less\n");
exit (-1);
}
if( chrs != 1 ) {
fprintf( stderr, "the XPM format MUST be 1 char per pixel\n");
exit (-1);
}
if( pb->x > 0xFFF || pb->y > 0xFFF ) {
fprintf( stderr, "the size is excesive\n");
exit (-1);
}
for( l=0; l<colors; l++ ) {
n= sscanf( xpm[l+1], "%c c #%x", &c[l], &pb->rgb[l]);
if( n < 2 ) {
/* this one is transparent */
pb->rgb[l]=0xff000000;
}
table[(int)c[l]]=l;
}
pb->pixels= malloc( pb->x * pb->y );
b= pb->pixels;
for( l= colors+1; l <= pb->y + colors; l++ ) {
i= xpm[l];
while( (int)*i) {
*b++ = table[*i++];
}
}
}
static void
pixbuf_delete( pixbuf* pb ) {
free( pb->pixels );
}
-1
View File
@@ -41,6 +41,5 @@ typedef struct {
} encodedata;
void pixbuf_encode_rle(int x, int y, int w, int h, char *inbuf, int stride, encodedata *ed);
void pixbuf_delete(pixbuf* pb);
#endif /* MPLAYER_SPUENC_H */