From: Jon A. Cruz <jon@joncruz.org>
Date: Wed, 17 Mar 2010 14:40:30 +0000 (-0700)
Subject: Fix loading of non-PNG images.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a79b6d9f17bdb22a65e599444e073b2353fd377a;p=inkscape.git

Fix loading of non-PNG images.
---

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;