Changeset 13191 for OpenSceneGraph/trunk/include/osgDB/ImagePager

Timestamp:

06/18/13 21:09:33 (14 hours ago)

Author:

robert

Message:

Added #define OSG_USE_DEPRECATED_GEOMETRY_METHODS usage into code to allow code to compile enen when CMake configuration has set the #define to off in include/osg/Config.

Files:

• OpenSceneGraph/trunk/include/osgDB/ImagePager (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgDB/ImagePager

@@ -61 +61 @@
             virtual ~ImageThread();
 
-            bool            _done;
-            Mode            _mode;
-            ImagePager*     _pager;
-            std::string     _name;
+            bool                                _done;
+            Mode                                _mode;
+            ImagePager*                         _pager;
+            std::string                         _name;
         };
 
@@ -80 +80 @@
         virtual osg::Image* readImageFile(const std::string& fileName);
 
-        virtual void requestImageFile(const std::string& fileName,osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp* framestamp);
-
+        virtual void requestImageFile(const std::string& fileName, osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp* framestamp, osg::ref_ptr<osg::Referenced>& imageRequest, const osg::Referenced* options);
 
         /** Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). */
@@ -114 +113 @@
             osg::ref_ptr<osg::Image>            _loadedImage;
             RequestQueue*                       _requestQueue;
+            osg::ref_ptr<osgDB::Options>        _readOptions;
 
         };