From 32c0bc3b39a81fddc83a2af5a95b3c59cfb82059 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 13 Dec 2012 17:35:27 +0000 Subject: [PATCH] From Lionel Lagarde, "Here is a correction on the PixelBufferObject getter methods of Image. The set method modify the buffer object of the BufferData while the get method returned the buffer object of the Image. I've also removed the _bufferObject member of Image (not used anymore)." --This line, Lionel Lagardeand those below, will be ignored-- M include/osg/Image --- include/osg/Image | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/osg/Image b/include/osg/Image index 67e524248..b6bdc928e 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -413,10 +413,10 @@ class OSG_EXPORT Image : public BufferData void setPixelBufferObject(PixelBufferObject* buffer) { setBufferObject(buffer); } /** Get the PixelBufferObject.*/ - PixelBufferObject* getPixelBufferObject() { return dynamic_cast(_bufferObject.get()); } + PixelBufferObject* getPixelBufferObject() { return dynamic_cast(getBufferObject()); } /** Get the const PixelBufferObject.*/ - const PixelBufferObject* getPixelBufferObject() const { return dynamic_cast(_bufferObject.get()); } + const PixelBufferObject* getPixelBufferObject() const { return dynamic_cast(getBufferObject()); } /** Return whether the update(NodeVisitor* nv) should be required on each frame to enable proper working of osg::Image.*/ virtual bool requiresUpdateCall() const { return false; } @@ -491,8 +491,6 @@ class OSG_EXPORT Image : public BufferData void setData(unsigned char* data,AllocationMode allocationMode); MipmapDataType _mipmapData; - - ref_ptr _bufferObject; DimensionsChangedCallbackVector _dimensionsChangedCallbacks; };