Changeset 13041 for OpenSceneGraph/trunk/src/osgViewer/PixelBufferX11.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/osgViewer/PixelBufferX11.cpp (modified) (17 diffs)

OpenSceneGraph/trunk/src/osgViewer/PixelBufferX11.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -38 +38 @@
 
     init();
-    
+
     if (valid())
     {
@@ -47 +47 @@
         {
             getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
-            incrementContextIDUsageCount( getState()->getContextID() );   
+            incrementContextIDUsageCount( getState()->getContextID() );
         }
         else
@@ -67 +67 @@
     typedef std::vector<int> Attributes;
     Attributes attributes;
-    
+
     attributes.push_back(GLX_USE_GL);
-    
+
     attributes.push_back(GLX_RGBA);
-    
+
     if (_traits->doubleBuffer) attributes.push_back(GLX_DOUBLEBUFFER);
-    
+
     attributes.push_back(GLX_RED_SIZE); attributes.push_back(_traits->red);
     attributes.push_back(GLX_GREEN_SIZE); attributes.push_back(_traits->green);
     attributes.push_back(GLX_BLUE_SIZE); attributes.push_back(_traits->blue);
     attributes.push_back(GLX_DEPTH_SIZE); attributes.push_back(_traits->depth);
-    
+
     if (_traits->alpha) { attributes.push_back(GLX_ALPHA_SIZE); attributes.push_back(_traits->alpha); }
-    
+
     if (_traits->stencil) { attributes.push_back(GLX_STENCIL_SIZE); attributes.push_back(_traits->stencil); }
 
@@ -93 +93 @@
     //  GLX_ACCUM_RED_SIZE
     //  GLX_ACCUM_GREEN_SIZE
-    
+
     attributes.push_back(None);
-    
+
     _visualInfo = glXChooseVisual( _display, _traits->screenNum, &(attributes.front()) );
 
@@ -110 +110 @@
         return;
     }
-    
+
     if (_traits->target != 0)
     {
@@ -120 +120 @@
 
     _display = XOpenDisplay(_traits->displayName().c_str());
-    
+
     unsigned int screen = _traits->screenNum;
 
@@ -195 +195 @@
     }
 
-    
+
     if (!createVisualInfo())
     {
-        _traits->red /= 2; 
-        _traits->green /= 2; 
-        _traits->blue /= 2; 
-        _traits->alpha /= 2; 
-        _traits->depth /= 2; 
-        
+        _traits->red /= 2;
+        _traits->green /= 2;
+        _traits->blue /= 2;
+        _traits->alpha /= 2;
+        _traits->depth /= 2;
+
         OSG_INFO<<"Relaxing traits"<<std::endl;
 
@@ -213 +213 @@
             _valid = false;
             return;
-        }    
-    }
-    
+        }
+    }
+
     // get any shared GLX contexts
     GraphicsHandleX11* graphicsHandleX11 = dynamic_cast<GraphicsHandleX11*>(_traits->sharedContext);
@@ -230 +230 @@
         return;
     }
-    
+
 #ifdef GLX_VERSION_1_3
     // First try the regular glx extension if we have a new enough version available.
@@ -245 +245 @@
                 {
                     typedef std::vector <int> AttributeList;
-                   
+
                     AttributeList attributes;
                     attributes.push_back( GLX_PBUFFER_WIDTH );
@@ -254 +254 @@
                     attributes.push_back( GL_TRUE );
                     attributes.push_back( 0L );
-                    
+
                     _pbuffer = glXCreatePbuffer(_display, fbconfigs[i], &attributes.front() );
                     _useGLX1_3 = true;
@@ -286 +286 @@
         GLXFBConfigSGIX fbconfig = glXGetFBConfigFromVisualSGIX( _display, _visualInfo );
         typedef std::vector <int> AttributeList;
-       
+
         AttributeList attributes;
         attributes.push_back( GLX_LARGEST_PBUFFER_SGIX );
         attributes.push_back( GL_TRUE );
         attributes.push_back( 0L );
-        
+
         _pbuffer = glXCreateGLXPbufferSGIX(_display, fbconfig, _traits->width, _traits->height,  &attributes.front() );
         if (_pbuffer)
@@ -299 +299 @@
             glXQueryGLXPbufferSGIX(_display, _pbuffer, GLX_WIDTH_SGIX , (unsigned int *)&iWidth);
             glXQueryGLXPbufferSGIX(_display, _pbuffer, GLX_HEIGHT_SGIX, (unsigned int *)&iHeight);
-                                                                                        
+
             if (_traits->width != iWidth || _traits->height != iHeight)
             {
@@ -340 +340 @@
             glXDestroyContext(_display, _context );
         }
-    
+
         if (_pbuffer)
         {
@@ -360 +360 @@
         XSync( _display,0 );
     }
-    
+
     _pbuffer = 0;
     _context = 0;
@@ -415 +415 @@
 
     if (!_initialized) init();
-    
+
     if (!_initialized) return false;