From 4163f15052a5a6cdf0908e3496b16d4d00cb13e1 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 6 Nov 2009 16:09:55 +0000
Subject: [PATCH] Fixed build with no automatic conversion of ref_ptr<> to C
 pointer

---
 src/osg/Texture1D.cpp        | 2 +-
 src/osg/Texture2D.cpp        | 2 +-
 src/osg/Texture2DArray.cpp   | 2 +-
 src/osg/Texture3D.cpp        | 2 +-
 src/osg/TextureCubeMap.cpp   | 2 +-
 src/osg/TextureRectangle.cpp | 2 +-
 src/osgUtil/SceneView.cpp    | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp
index 5ebc811b8..e5dbef39a 100644
--- a/src/osg/Texture1D.cpp
+++ b/src/osg/Texture1D.cpp
@@ -124,7 +124,7 @@ void Texture1D::apply(State& state) const
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
 
diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp
index fa852bd10..8e947b23a 100644
--- a/src/osg/Texture2D.cpp
+++ b/src/osg/Texture2D.cpp
@@ -137,7 +137,7 @@ void Texture2D::apply(State& state) const
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
 
diff --git a/src/osg/Texture2DArray.cpp b/src/osg/Texture2DArray.cpp
index 12ccb2184..a960ec61e 100644
--- a/src/osg/Texture2DArray.cpp
+++ b/src/osg/Texture2DArray.cpp
@@ -209,7 +209,7 @@ void Texture2DArray::apply(State& state) const
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
 
diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp
index 23d110adc..2ddd8ab31 100644
--- a/src/osg/Texture3D.cpp
+++ b/src/osg/Texture3D.cpp
@@ -196,7 +196,7 @@ void Texture3D::apply(State& state) const
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
 
diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp
index 03094336c..0e40c9bbe 100644
--- a/src/osg/TextureCubeMap.cpp
+++ b/src/osg/TextureCubeMap.cpp
@@ -197,7 +197,7 @@ void TextureCubeMap::apply(State& state) const
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
 
diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp
index 258a42eae..cf99212c6 100644
--- a/src/osg/TextureRectangle.cpp
+++ b/src/osg/TextureRectangle.cpp
@@ -161,7 +161,7 @@ void TextureRectangle::apply(State& state) const
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
 
-    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID);
+    Texture::TextureObjectManager* tom = Texture::getTextureObjectManager(contextID).get();
     ElapsedTime elapsedTime(&(tom->getApplyTime()));
     tom->getNumberApplied()++;
 
diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp
index 3e9766467..d943d3f63 100644
--- a/src/osgUtil/SceneView.cpp
+++ b/src/osgUtil/SceneView.cpp
@@ -1038,10 +1038,10 @@ void SceneView::draw()
     osg::State* state = _renderInfo.getState();
     state->initializeExtensionProcs();
 
-    osg::Texture::TextureObjectManager* tom = osg::Texture::getTextureObjectManager(state->getContextID());
+    osg::Texture::TextureObjectManager* tom = osg::Texture::getTextureObjectManager(state->getContextID()).get();
     tom->newFrame(state->getFrameStamp());
 
-    osg::GLBufferObjectManager* bom = osg::GLBufferObjectManager::getGLBufferObjectManager(state->getContextID());
+    osg::GLBufferObjectManager* bom = osg::GLBufferObjectManager::getGLBufferObjectManager(state->getContextID()).get();
     bom->newFrame(state->getFrameStamp());
 
     if (!_initCalled) init();