← Back to branch summary

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

« back to all changes in this revision

Viewing changes to OpenSceneGraph/include/osgDB/Input

  • 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/include/osgDB/Input
15
15
#define OSGDB_INPUT 1
16
16
 
17
17
#include <osg/Image>
 
18
#include <osg/Shader>
18
19
#include <osg/Node>
19
20
#include <osg/Drawable>
20
21
#include <osg/StateAttribute>
50
51
        virtual osg::StateAttribute* readStateAttribute();
51
52
        virtual osg::Uniform*        readUniform();
52
53
        virtual osg::Node*           readNode();
 
54
        virtual osg::Shader*         readShader();
53
55
 
54
56
        virtual osg::Object*         readObject(const std::string& fileName);
55
57
        virtual osg::Image*          readImage(const std::string& fileName);
56
58
        virtual osg::Node*           readNode(const std::string& fileName);
 
59
        virtual osg::Shader*         readShader(const std::string& fileName);
57
60
        
58
61
        virtual osg::Object*         getObjectForUniqueID(const std::string& uniqueID);
59
62
        virtual void                 registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj);