Changeset 13041 for OpenSceneGraph/trunk/src/osgViewer/PixelBufferWin32.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgViewer/PixelBufferWin32.cpp (modified) (21 diffs)

OpenSceneGraph/trunk/src/osgViewer/PixelBufferWin32.cpp

@@ -1 +1 @@
 /* -*-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.
  *
@@ -152 +152 @@
 #endif
 
-namespace 
+namespace
 {
 
@@ -167 +167 @@
                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
                      (LPTSTR) &lpMsgBuf,\
-                     0,NULL 
+                     0,NULL
                      );
 
@@ -180 +180 @@
         msgResult << "Error code " << err;
     }
-    
+
     return msgResult.str();
 }
@@ -206 +206 @@
 protected:
     ~TemporaryWindow();
-    
+
     TemporaryWindow(const TemporaryWindow &):
         _handle(0),
@@ -212 +212 @@
         _context(0),
         _instance(0) {}
-        
+
     TemporaryWindow &operator=(const TemporaryWindow &) { return *this; }
 
@@ -233 +233 @@
 
     _instance = GetModuleHandle(0);
-        
+
     WNDCLASS wndclass;
-            
-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; 
+
+    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
     wndclass.lpfnWndProc   = DefWindowProc;
     wndclass.cbClsExtra    = 0;
@@ -244 +244 @@
     wndclass.hIcon         = 0;
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
-    wndclass.lpszMenuName  = 0;                            
+    wndclass.lpszMenuName  = 0;
     wndclass.lpszClassName = _classname.c_str();
 
@@ -275 +275 @@
     }
 
-    PIXELFORMATDESCRIPTOR pfd = { 
+    PIXELFORMATDESCRIPTOR pfd = {
         sizeof(PIXELFORMATDESCRIPTOR),
-        1,                     
-        PFD_DRAW_TO_WINDOW |   
-        PFD_SUPPORT_OPENGL,      
-        PFD_TYPE_RGBA,         
-        24,                    
-        0, 0, 0, 0, 0, 0,      
-        0,                     
-        0,                     
-        0,                     
-        0, 0, 0, 0,            
+        1,
+        PFD_DRAW_TO_WINDOW |
+        PFD_SUPPORT_OPENGL,
+        PFD_TYPE_RGBA,
+        24,
+        0, 0, 0, 0, 0, 0,
+        0,
+        0,
+        0,
+        0, 0, 0, 0,
         16,
-        0,                     
-        0,                     
-        PFD_MAIN_PLANE,        
-        0,                     
-        0, 0, 0                
-    }; 
-
-    int visual_id = ChoosePixelFormat(_dc, &pfd); 
+        0,
+        0,
+        PFD_MAIN_PLANE,
+        0,
+        0, 0, 0
+    };
+
+    int visual_id = ChoosePixelFormat(_dc, &pfd);
 
     if (!SetPixelFormat(_dc, visual_id, &pfd))
@@ -422 +422 @@
 {
     HGLRC context = wglGetCurrentContext();
-    
+
     // Get wgl function pointers for the current graphics context, or if there is no
     // current context then use a temporary window.
@@ -467 +467 @@
         {
             getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
-            incrementContextIDUsageCount( getState()->getContextID() );   
+            incrementContextIDUsageCount( getState()->getContextID() );
         }
         else
@@ -480 +480 @@
     closeImplementation();
 }
-    
+
 void PixelBufferWin32::init()
 {
@@ -641 +641 @@
     }
 
-    _initialized = true;    
+    _initialized = true;
     _valid = true;
 
@@ -656 +656 @@
 
     if (!_initialized) init();
-    
+
     if (!_initialized) return false;
 
@@ -662 +662 @@
     {
         GraphicsHandleWin32* graphicsHandleWin32 = dynamic_cast<GraphicsHandleWin32*>(_traits->sharedContext);
-        if (graphicsHandleWin32) 
+        if (graphicsHandleWin32)
         {
             if ( !wglShareLists(graphicsHandleWin32->getWGLContext(), _hglrc) )
@@ -720 +720 @@
     // If the pbuffer is bound to a texture then release it.  This operation requires a current context, so
     // do it after the MakeCurrent.
-    
+
     if ( _boundBuffer!=0 )
     {
@@ -736 +736 @@
     return result;
 }
-        
+
 bool PixelBufferWin32::makeContextCurrentImplementation( GraphicsContext* readContext )
 {
@@ -748 +748 @@
 
     GraphicsHandleWin32* graphicsHandleWin32 = dynamic_cast<GraphicsHandleWin32*>(readContext);
-    if (graphicsHandleWin32) 
+    if (graphicsHandleWin32)
     {
         return wgle->wglMakeContextCurrentARB(_hdc, graphicsHandleWin32->getHDC(), _hglrc);
@@ -769 +769 @@
 {
     WGLExtensions* wgle = WGLExtensions::instance();
-    
+
     if ( !wgle || !wgle->wglBindTexImageARB )
     {
@@ -789 +789 @@
             bindBuffer = static_cast<int>(buffer);
     }
-    
+
     if ( bindBuffer != _boundBuffer )
     {
@@ -802 +802 @@
         }
         _boundBuffer = bindBuffer;
-    }       
-}
-
-void PixelBufferWin32::swapBuffersImplementation() 
+    }
+}
+
+void PixelBufferWin32::swapBuffersImplementation()
 {
     SwapBuffers( _hdc );