Changeset 10891

Show
Ignore:
Timestamp:
12/15/09 10:16:20 (3 years ago)
Author:
robert
Message:

Changed GL_BGRA_EXT to GL_BGRA and added include of include/osg/Image to make sure define is declared

Location:
OpenSceneGraph/trunk/src/osgPlugins/quicktime
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgPlugins/quicktime/MovieData.cpp

    r9932 r10891  
    99#include <osg/GL> 
    1010#include <osg/Endian> 
     11#include <osg/Image> 
    1112#include <osgDB/FileNameUtils> 
    1213 
    … …  
    159160    image->setImage(_textureWidth,_textureHeight,1, 
    160161                   (GLint) GL_RGBA8, 
    161                    (GLenum)GL_BGRA_EXT, 
     162                   (GLenum)GL_BGRA, 
    162163                   internalFormat, 
    163164                   (unsigned char*) buffer,osg::Image::NO_DELETE,4); 

  • OpenSceneGraph/trunk/src/osgPlugins/quicktime/QTImportExport.cpp

    r9769 r10891  
    1313 
    1414#include <osgDB/FileNameUtils> 
     15#include <osg/Image> 
    1516 
    1617 
    … …  
    152153                    break; 
    153154                 
    154                 case GL_BGRA_EXT: 
     155                case GL_BGRA: 
    155156                    aoffset = 0; 
    156157                    roffset = 1; 

  • OpenSceneGraph/trunk/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp

    r7586 r10891  
    1515 
    1616#include <osg/Notify> 
     17#include <osg/Image> 
    1718#include <osg/Timer> 
    1819#include <osg/ref_ptr> 
    … …  
    114115 
    115116    setImage(m_videoRectWidth,m_videoRectHeight,1, 
    116             (GLint) GL_RGBA8, (GLenum)GL_BGRA_EXT, internalFormat, 
     117            (GLint) GL_RGBA8, (GLenum)GL_BGRA, internalFormat, 
    117118            (unsigned char*)buffer,osg::Image::NO_DELETE,4); 
    118119}