Commit 20c4707d authored by Antoine Cellerier's avatar Antoine Cellerier

do everything with the stream functions (no more fopen)

parent 9cbb86d3
...@@ -205,23 +205,9 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, ...@@ -205,23 +205,9 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url,
{ {
block_t *p_block; block_t *p_block;
picture_t *p_pic; picture_t *p_pic;
FILE *file;
stream_t *p_stream = NULL; stream_t *p_stream = NULL;
int i_size; int i_size;
file = utf8_fopen( psz_url, "rb" );
if( file )
{
fseek( file, 0, SEEK_END );
i_size = ftell( file );
fseek( file, 0, SEEK_SET );
}
else
{
/*msg_Dbg( p_image->p_parent, "could not open file %s for reading",
psz_url );*/
/* if file couldn't be opened, try to open the url with the stream
* functions. Any url can be thus be opened. */
p_stream = stream_UrlNew( p_image->p_parent, psz_url ); p_stream = stream_UrlNew( p_image->p_parent, psz_url );
if( !p_stream ) if( !p_stream )
{ {
...@@ -229,24 +215,13 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url, ...@@ -229,24 +215,13 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url,
psz_url ); psz_url );
return NULL; return NULL;
} }
else
{
i_size = stream_Size( p_stream ); i_size = stream_Size( p_stream );
}
}
p_block = block_New( p_image->p_parent, i_size ); p_block = block_New( p_image->p_parent, i_size );
if( file )
{
fread( p_block->p_buffer, sizeof(char), i_size, file );
fclose( file );
}
else
{
stream_Read( p_stream, p_block->p_buffer, i_size ); stream_Read( p_stream, p_block->p_buffer, i_size );
stream_Delete( p_stream ); stream_Delete( p_stream );
}
if( !p_fmt_in->i_chroma ) if( !p_fmt_in->i_chroma )
{ {
......
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