← Back to branch summary

~ubuntu-branches/debian/sid/inkscape/sid

« back to all changes in this revision

Viewing changes to src/xml/repr-io.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-06-21 15:13:32 UTC
  • mfrom: (10.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20130621151332-uo22shomzjut843h
Tags: 0.48.4-1
http://bugs.debian.org/701297
* Upload to unstable
* debian/control: added myself to Uploaders
* debian/patches/: patchset updated
  - 04-Fix_FTBFS_on_gcc-4.8.patch added (Closes: #701297)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xml/repr-io.cpp
289
289
        XmlSource src;
290
290
 
291
291
        if ( (src.setFile(filename) == 0) ) {
 
292
            int parse_options = XML_PARSE_HUGE; // do not use XML_PARSE_NOENT ! see bug lp:1025185
 
293
            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
294
            bool allowNetAccess = prefs->getBool("/options/externalresources/xml/allow_net_access", false);
 
295
            if (!allowNetAccess) {
 
296
                parse_options |= XML_PARSE_NONET;
 
297
            }
292
298
            doc = xmlReadIO( XmlSource::readCb,
293
299
                             XmlSource::closeCb,
294
300
                             &src,
295
301
                             localFilename,
296
302
                             src.getEncoding(),
297
 
                             XML_PARSE_NOENT );
 
303
                             parse_options);
298
304
        }
299
305
    }
300
306