From ce2459a539f44f721a0a0cb49bf55e3a6e544476 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 15 Dec 2009 09:16:20 +0000
Subject: [PATCH] Changed GL_BGRA_EXT to GL_BGRA and added include of
 include/osg/Image to make sure define is declared

---
 src/osgPlugins/quicktime/MovieData.cpp                | 3 ++-
 src/osgPlugins/quicktime/QTImportExport.cpp           | 3 ++-
 src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/quicktime/MovieData.cpp b/src/osgPlugins/quicktime/MovieData.cpp
index e793a8841..89fb0156b 100644
--- a/src/osgPlugins/quicktime/MovieData.cpp
+++ b/src/osgPlugins/quicktime/MovieData.cpp
@@ -8,6 +8,7 @@
  */
 #include <osg/GL>
 #include <osg/Endian>
+#include <osg/Image>
 #include <osgDB/FileNameUtils>
 
 #include "MovieData.h"
@@ -158,7 +159,7 @@ void MovieData::_initImage(osg::Image* image)
 
     image->setImage(_textureWidth,_textureHeight,1,
                    (GLint) GL_RGBA8,
-                   (GLenum)GL_BGRA_EXT,
+                   (GLenum)GL_BGRA,
                    internalFormat,
                    (unsigned char*) buffer,osg::Image::NO_DELETE,4);
 
diff --git a/src/osgPlugins/quicktime/QTImportExport.cpp b/src/osgPlugins/quicktime/QTImportExport.cpp
index 24b67ebfb..6d98362bd 100644
--- a/src/osgPlugins/quicktime/QTImportExport.cpp
+++ b/src/osgPlugins/quicktime/QTImportExport.cpp
@@ -12,6 +12,7 @@
 #include "QTUtils.h"
 
 #include <osgDB/FileNameUtils>
+#include <osg/Image>
 
 
 /** small exception class bundling a error-message */
@@ -151,7 +152,7 @@ unsigned char* QuicktimeImportExport::prepareBufferForQuicktime(unsigned char* b
                     boffset = 2;
                     break;
                 
-                case GL_BGRA_EXT:
+                case GL_BGRA:
                     aoffset = 0;
                     roffset = 1;
                     goffset = 2;
diff --git a/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp b/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp
index a802f45fd..6190afa26 100644
--- a/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp
+++ b/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp
@@ -14,6 +14,7 @@
 #include <cstdlib>
 
 #include <osg/Notify>
+#include <osg/Image>
 #include <osg/Timer>
 #include <osg/ref_ptr>
 #include <osg/Referenced>
@@ -113,7 +114,7 @@ void QuicktimeLiveImageStream::createImage()
                               GL_UNSIGNED_INT_8_8_8_8;
 
     setImage(m_videoRectWidth,m_videoRectHeight,1,
-            (GLint) GL_RGBA8, (GLenum)GL_BGRA_EXT, internalFormat,
+            (GLint) GL_RGBA8, (GLenum)GL_BGRA, internalFormat,
             (unsigned char*)buffer,osg::Image::NO_DELETE,4);
 }