Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/cfg/VisualChooser.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/cfg/VisualChooser.cpp (modified) (18 diffs)

OpenSceneGraph/trunk/src/osgPlugins/cfg/VisualChooser.cpp

@@ -166 +166 @@
 }
 
-void VisualChooser::setVisualID( unsigned int id ) 
-{ 
-    _visual_id = id; 
+void VisualChooser::setVisualID( unsigned int id )
+{
+    _visual_id = id;
 }
 
@@ -180 +180 @@
 }
 
-void VisualChooser::clear() 
+void VisualChooser::clear()
 {
     _visual_attributes.clear();
@@ -242 +242 @@
       if((*_vinfo) && (aglDescribePixelFormat(*_vinfo, AGL_NO_RECOVERY, &val))) return _vinfo;
     }
-    else 
+    else
     {
       // Use malloc() since new() causes a bus error
@@ -285 +285 @@
     {
       std::cerr<< "aglChoosePixelFormat failed: " << aglGetError() << std::endl;
-      for(i=va.begin(); i!=va.end(); ++i) 
+      for(i=va.begin(); i!=va.end(); ++i)
       {
         std::cerr << (*i) << ", ";
@@ -342 +342 @@
       // If VisualInfo exists, then we may be able to reuse it
       GLint val;
-      if(!CGLDescribePixelFormat(*_vinfo, 0L, kCGLPFANoRecovery, &val)) 
+      if(!CGLDescribePixelFormat(*_vinfo, 0L, kCGLPFANoRecovery, &val))
         return _vinfo;
     }
@@ -373 +373 @@
       std::cerr<< "CGLChoosePixelFormat failed: " << CGLErrorString(err) << std::endl;
       std::vector<int>::iterator i;
-      for(i=va.begin(); i!=va.end(); ++i) 
+      for(i=va.begin(); i!=va.end(); ++i)
       {
         std::cerr << (*i) << ", ";
@@ -470 +470 @@
     {
         p = _visual_attributes.end() - 1;
-    
+
         while( _vinfo == NULL && va.size() > 0)
         {
@@ -476 +476 @@
         if( _vinfo == NULL && va.size() > 0 )
         {
-            
+
                 // should we report an message that we're relaxing constraints here?
                 // std::cout << "Popping attributes"<<std::endl;
@@ -515 +515 @@
         attribs.push_back(1);
         attribs.push_back(WGL_ACCELERATION_ARB);
-        attribs.push_back(WGL_FULL_ACCELERATION_ARB);        
+        attribs.push_back(WGL_FULL_ACCELERATION_ARB);
         return;
     }
@@ -536 +536 @@
     switch (va.attribute())
     {
-        case Level:          return;    
-        case BufferSize:     attr.first = WGL_COLOR_BITS_ARB; break;        
+        case Level:          return;
+        case BufferSize:     attr.first = WGL_COLOR_BITS_ARB; break;
         case RGBA:           attr.first = WGL_PIXEL_TYPE_ARB; attr.second = WGL_TYPE_RGBA_ARB; break;
         case Stereo:         attr.first = WGL_STEREO_ARB; attr.second = 1;  break;
@@ -570 +570 @@
         setSimpleConfiguration();
 
-    int vid;    
+    int vid;
     bool failed = false;
 
@@ -587 +587 @@
             if (failed)
             {
-                // **** DRIVER BUG? It seems that some ATI cards don't support 
+                // **** DRIVER BUG? It seems that some ATI cards don't support
                 // **** the WGL_SWAP_METHOD_ARB attribute. Now we try to remove
                 // **** it from the attribute list and choose a pixel format again.
@@ -593 +593 @@
                 {
                     if (*k == WGL_SWAP_METHOD_ARB)
-                    {   
+                    {
                         // attribute come in sequential attribute,parameter pairs
                         // as WGL specifications so we need to delete two entries
@@ -656 +656 @@
             {
               // Is this additional check neccessary ?
-              // Did anyone encountered a situation where 
+              // Did anyone encountered a situation where
               // ChoosePixelFormat returned PXIELFORMAT worse than required ?
               _visual_id = static_cast<unsigned int>(vid);
@@ -682 +682 @@
               }
               if ( !boolOK )
-                vid = 0;             
+                vid = 0;
             }
-            
+
             if( vid == 0 )
             {
@@ -696 +696 @@
 
         } while (failed);
-        
+
     }
 
@@ -711 +711 @@
     // than by descriptor.
     _vinfo = new VisualInfo;
-    DescribePixelFormat(*dpy, _visual_id, sizeof(PIXELFORMATDESCRIPTOR), _vinfo); 
+    DescribePixelFormat(*dpy, _visual_id, sizeof(PIXELFORMATDESCRIPTOR), _vinfo);
 
     return _vinfo;
@@ -738 +738 @@
 {
     for (std::vector<VisualAttribute>::const_iterator i=_visual_attributes.begin(); i!=_visual_attributes.end(); ++i)
-        if (i->attribute() == DoubleBuffer) 
+        if (i->attribute() == DoubleBuffer)
             return true;