diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-03-17 14:40:30 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-03-17 14:40:30 +0000 |
| commit | bf5809630760682a6a6b8b3085e900eebfe36a41 (patch) | |
| tree | af1b0465f4dc041a506f91a2f23c1eeb4da1ab00 /src/sp-image.cpp | |
| parent | Follow-on cleanup for bug #271401. Isolates setjmp(), removes early return, a... (diff) | |
| download | inkscape-bf5809630760682a6a6b8b3085e900eebfe36a41.tar.gz inkscape-bf5809630760682a6a6b8b3085e900eebfe36a41.zip | |
Fix loading of non-PNG images.
(bzr r9197)
Diffstat (limited to 'src/sp-image.cpp')
| -rw-r--r-- | src/sp-image.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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; |
