← Back to branch summary

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

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgPlugins/osg/Camera.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/osg/Camera.cpp
328
328
    else if (strcmp(str,"COLOR_BUFFER5")==0)            buffer = osg::Camera::COLOR_BUFFER5;
329
329
    else if (strcmp(str,"COLOR_BUFFER6")==0)            buffer = osg::Camera::COLOR_BUFFER6;
330
330
    else if (strcmp(str,"COLOR_BUFFER7")==0)            buffer = osg::Camera::COLOR_BUFFER7;
 
331
    else if (strcmp(str,"COLOR_BUFFER8")==0)            buffer = osg::Camera::COLOR_BUFFER8;
 
332
    else if (strcmp(str,"COLOR_BUFFER9")==0)            buffer = osg::Camera::COLOR_BUFFER9;
 
333
    else if (strcmp(str,"COLOR_BUFFER10")==0)           buffer = osg::Camera::COLOR_BUFFER10;
 
334
    else if (strcmp(str,"COLOR_BUFFER11")==0)           buffer = osg::Camera::COLOR_BUFFER11;
 
335
    else if (strcmp(str,"COLOR_BUFFER12")==0)           buffer = osg::Camera::COLOR_BUFFER12;
 
336
    else if (strcmp(str,"COLOR_BUFFER13")==0)           buffer = osg::Camera::COLOR_BUFFER13;
 
337
    else if (strcmp(str,"COLOR_BUFFER14")==0)           buffer = osg::Camera::COLOR_BUFFER14;
 
338
    else if (strcmp(str,"COLOR_BUFFER15")==0)           buffer = osg::Camera::COLOR_BUFFER15;
331
339
    else return false;
332
340
    return true;
333
341
}
338
346
        case (osg::Camera::DEPTH_BUFFER)             : return "DEPTH_BUFFER";
339
347
        case (osg::Camera::STENCIL_BUFFER)           : return "STENCIL_BUFFER";
340
348
        case (osg::Camera::COLOR_BUFFER)             : return "COLOR_BUFFER";
 
349
        case (osg::Camera::COLOR_BUFFER0)            : return "COLOR_BUFFER0";
341
350
        case (osg::Camera::COLOR_BUFFER1)            : return "COLOR_BUFFER1";
342
351
        case (osg::Camera::COLOR_BUFFER2)            : return "COLOR_BUFFER2";
343
352
        case (osg::Camera::COLOR_BUFFER3)            : return "COLOR_BUFFER3";
345
354
        case (osg::Camera::COLOR_BUFFER5)            : return "COLOR_BUFFER5";
346
355
        case (osg::Camera::COLOR_BUFFER6)            : return "COLOR_BUFFER6";
347
356
        case (osg::Camera::COLOR_BUFFER7)            : return "COLOR_BUFFER7";
348
 
        default                                          : return "UnknownBufferComponent";
 
357
        case (osg::Camera::COLOR_BUFFER8)            : return "COLOR_BUFFER8";
 
358
        case (osg::Camera::COLOR_BUFFER9)            : return "COLOR_BUFFER9";
 
359
        case (osg::Camera::COLOR_BUFFER10)           : return "COLOR_BUFFER10";
 
360
        case (osg::Camera::COLOR_BUFFER11)           : return "COLOR_BUFFER11";
 
361
        case (osg::Camera::COLOR_BUFFER12)           : return "COLOR_BUFFER12";
 
362
        case (osg::Camera::COLOR_BUFFER13)           : return "COLOR_BUFFER13";
 
363
        case (osg::Camera::COLOR_BUFFER14)           : return "COLOR_BUFFER14";
 
364
        case (osg::Camera::COLOR_BUFFER15)           : return "COLOR_BUFFER15";
 
365
        default                                      : return "UnknownBufferComponent";
349
366
    }
350
367
}
351
368