Show
Ignore:
Timestamp:
08/03/15 21:14:11 (less than one hour ago)
Author:
robert
Message:

From Andy Skinner, "Someone was using our code on a system that does not seem to have the SGIX symbols used in osgViewer.cpp.


I used osgSetGLExtensionsFuncPtr to remove the symbols. I don't know how to test this path, but it did remove the symbols from libosgViewer.so. I have also not been able yet to see if that was sufficient for our customer.


I did this by looking at other cases, and I tried to follow some of the same practices in PixelBufferX11, like using _useSGIX in a similar way to the previous _useGLX1_3."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/View.cpp

    r13041 r13172  
    22182218 
    22192219 
     2220void View::addDevice(osgGA::Device* eventSource) 
     2221{ 
     2222    Devices::iterator itr = std::find( _eventSources.begin(), _eventSources.end(), eventSource ); 
     2223    if (itr==_eventSources.end()) 
     2224    { 
     2225        _eventSources.push_back(eventSource); 
     2226    } 
     2227} 
     2228 
     2229void View::removeDevice(osgGA::Device* eventSource) 
     2230{ 
     2231    Devices::iterator itr = std::find( _eventSources.begin(), _eventSources.end(), eventSource ); 
     2232    if (itr!=_eventSources.end()) 
     2233    { 
     2234        _eventSources.erase(itr); 
     2235    } 
     2236}