Commit 0f6f58c6 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* don't convert UTF-8 -> UTF-8 because we found a BOM.

parent a5e04c86
...@@ -1428,20 +1428,27 @@ char * stream_ReadLine( stream_t *s ) ...@@ -1428,20 +1428,27 @@ char * stream_ReadLine( stream_t *s )
s->i_char_width = 2; s->i_char_width = 2;
i_bom_size = 2; i_bom_size = 2;
} }
/* Seek past the offset */
/* Seek past the BOM */
if( i_bom_size )
{
stream_Seek( s, i_bom_size ); stream_Seek( s, i_bom_size );
p_data += i_bom_size; p_data += i_bom_size;
i_data -= i_bom_size; i_data -= i_bom_size;
}
/* Open the converter if we need it */ /* Open the converter if we need it */
if( psz_encoding != NULL ) if( psz_encoding != NULL )
{ {
msg_Dbg( s, "%s BOM detected", psz_encoding ); msg_Dbg( s, "%s BOM detected", psz_encoding );
if( s->i_char_width > 1 )
{
s->conv = vlc_iconv_open( "UTF-8", psz_encoding ); s->conv = vlc_iconv_open( "UTF-8", psz_encoding );
if( s->conv == (vlc_iconv_t)-1 ) if( s->conv == (vlc_iconv_t)-1 )
{ {
msg_Err( s, "iconv_open failed" ); msg_Err( s, "iconv_open failed" );
} }
}
if( psz_encoding ) free( psz_encoding ); if( psz_encoding ) free( psz_encoding );
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment