From bf5809630760682a6a6b8b3085e900eebfe36a41 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 17 Mar 2010 07:40:30 -0700 Subject: Fix loading of non-PNG images. (bzr r9197) --- src/sp-image.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/sp-image.cpp') diff --git a/src/sp-image.cpp b/src/sp-image.cpp index 93e7b4d65..bb867e969 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -460,18 +460,15 @@ static GdkPixbuf* pixbuf_new_from_file( const char *filename, time_t &modTime, g youme.offset = 0; youme.loader = loader; - bool dropOut = false; - while ( !feof(fp) && !dropOut ) + while ( !feof(fp) ) { if ( youme.readMore() ) { if ( youme.first ) { //g_message( "First data chunk" ); youme.first = FALSE; - if (!readPngAndHeaders(youme, dpiX, dpiY)) + if (readPngAndHeaders(youme, dpiX, dpiY)) { - // We failed to read the PNG headers and info. - // The GDK pixbuf loader may still get something. - dropOut = true; + // TODO set the dpi to be read elsewhere } } else if ( !latter ) { latter = TRUE; -- cgit v1.2.3