do everything with the stream functions (no more fopen)

diff --git a/src/misc/image.c b/src/misc/image.c
index da99798ac30b5c7e2c92dab4811dc8f560d461b8..f788a4d052338e0302e11d51ddbf5f7d0a499975 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -205,48 +205,23 @@ static picture_t *ImageReadUrl( image_handler_t *p_image, const char *psz_url,
 {
     block_t *p_block;
     picture_t *p_pic;
-    FILE *file;
     stream_t *p_stream = NULL;
     int i_size;
 
-    file = utf8_fopen( psz_url, "rb" );
-    if( file )
+    p_stream = stream_UrlNew( p_image->p_parent, psz_url );
+    if( !p_stream )
     {
-        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 );
-        if( !p_stream )
-        {
-            msg_Dbg( p_image->p_parent, "could not open %s for reading",
-                     psz_url );
-            return NULL;
-        }
-        else
-        {
-            i_size = stream_Size( p_stream );
-        }
+        msg_Dbg( p_image->p_parent, "could not open %s for reading",
+                 psz_url );
+        return NULL;
     }
 
+    i_size = stream_Size( p_stream );
+
     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_Delete( p_stream );
-    }
+    stream_Read( p_stream, p_block->p_buffer, i_size );
+    stream_Delete( p_stream );
 
     if( !p_fmt_in->i_chroma )
     {