← Back to branch summary

~ubuntu-branches/ubuntu/trusty/openscenegraph/trusty

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgPlugins/osga/ReaderWriterOSGA.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2008-07-29 04:34:38 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080729043438-no1h9h0dpsrlzp1y
http://bugs.debian.org/477353
http://bugs.debian.org/482239
* Non-maintainer upload.
* No longer try to detect (using /proc/cpuinfo when available) how many
  CPUs are available, fixing the FTBFS (due to -j0) on various platforms
  (Closes: #477353). The right way to do it is to support parallel=n in
  DEB_BUILD_OPTIONS (see Debian Policy §4.9.1), and adequate support has
  been implemented.
* Add patch to fix FTBFS due to the build system now refusing to handle
  whitespaces (Policy CMP0004 say the logs), thanks to Andreas Putzo who
  provided it (Closes: #482239):
   - debian/patches/fix-cmp0004-build-failure.dpatch
* Remove myself from Uploaders, as requested a while ago, done by Luk in
  his 2.2.0-2.1 NMU, which was never acknowledged.

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgPlugins/osga/ReaderWriterOSGA.cpp
58
58
        if (!result.validArchive()) return result;
59
59
 
60
60
 
61
 
        osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = new osgDB::ReaderWriter::Options;
 
61
        // copy the incoming options if possible so that plugin options can be applied to files
 
62
        // inside the archive
 
63
        osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = 
 
64
            options?
 
65
            new osgDB::ReaderWriter::Options( *options ) :
 
66
            new osgDB::ReaderWriter::Options;
 
67
 
62
68
        local_options->setDatabasePath(file);
63
69
 
64
70
        ReadResult result_2 = result.getArchive()->readImage(result.getArchive()->getMasterFileName(),local_options.get());
80
86
        if (!result.validArchive()) return result;
81
87
 
82
88
 
83
 
        osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = new osgDB::ReaderWriter::Options;
 
89
        // copy the incoming options if possible so that plugin options can be applied to files
 
90
        // inside the archive
 
91
        osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = 
 
92
            options?
 
93
            new osgDB::ReaderWriter::Options( *options ) :
 
94
            new osgDB::ReaderWriter::Options;
 
95
 
84
96
        local_options->setDatabasePath(file);
85
97
 
86
98
        ReadResult result_2 = result.getArchive()->readNode(result.getArchive()->getMasterFileName(),local_options.get());