Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/vnc/ReaderWriterVNC.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/vnc/ReaderWriterVNC.cpp (modified) (21 diffs)

OpenSceneGraph/trunk/src/osgPlugins/vnc/ReaderWriterVNC.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1999-2008 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1999-2008 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software 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
  * include LICENSE.txt for more details.
 */
@@ -26 +26 @@
 {
     public:
-    
+
         LibVncImage();
 
@@ -32 +32 @@
 
         void close();
-        
+
         virtual bool sendPointerEvent(int x, int y, int buttonMask);
 
@@ -47 +47 @@
 
         static rfbBool resizeImage(rfbClient* client);
-        
+
         static void updateImage(rfbClient* client,int x,int y,int w,int h);
-        
+
         static void passwordCheck(rfbClient* client,const char* encryptedPassWord,int len);
         static char* getPassword(rfbClient* client);
@@ -56 +56 @@
         std::string                 _username;
         std::string                 _password;
-        
+
         double                      _timeOfLastUpdate;
         double                      _timeOfLastRender;
@@ -64 +64 @@
 
     protected:
-    
+
         virtual ~LibVncImage();
 
@@ -79 +79 @@
             {
                 _done = true;
-                while(isRunning()) 
+                while(isRunning())
                 {
                     OpenThreads::Thread::YieldCurrentThread();
@@ -90 +90 @@
                 {
                     if (_image->_active)
-                    {               
+                    {
                         int i=WaitForMessage(_client,5000);
                         if(i<0)
@@ -98 +98 @@
                         {
                             OSG_INFO<<"VNC Handling "<<i<<" messages"<<std::endl;
-                        
+
                             if(!HandleRFBServerMessage(_client))
                             return;
@@ -109 +109 @@
                         _image->_inactiveBlock->block();
                     }
-                    
-                    
+
+
                     double deltaTime = _image->getTimeOfLastRender() - _image->getTimeOfLastUpdate();
                     if (deltaTime<-0.01)
@@ -136 +136 @@
 
         osg::ref_ptr<RfbThread>     _rfbThread;
-      
+
 };
 
@@ -234 +234 @@
 
     rfbClientSetClientData(_client, 0, this);
-    
+
     _client->serverHost = strdup(hostname.c_str());
 
@@ -247 +247 @@
         _rfbThread = new RfbThread(_client, this);
         _rfbThread->startThread();
-        
+
         return true;
     }
@@ -253 +253 @@
     {
         close();
-        
+
         return false;
     }
@@ -278 +278 @@
 
 
-rfbBool LibVncImage::resizeImage(rfbClient* client) 
+rfbBool LibVncImage::resizeImage(rfbClient* client)
 {
     LibVncImage* image = (LibVncImage*)(rfbClientGetClientData(client, 0));
-    
+
     int width = client->width;
     int height = client->height;
@@ -295 +295 @@
         if (image->_optionString.find("swap")!=std::string::npos || image->_optionString.find("swop")!=std::string::npos) swap = true;
     }
-    
+
     GLenum gl_pixelFormat = swap ? GL_BGRA : GL_RGBA;
 
@@ -310 +310 @@
 
 
-    
+
     client->frameBuffer= (uint8_t*)(image->data());
-    
+
     return TRUE;
 }
@@ -359 +359 @@
 {
     public:
-    
+
         ReaderWriterVNC()
         {
             supportsExtension("vnc","VNC plugin");
-            
+
             supportsOption("swap","Swaps the pixel format order, exchanging the red and blue channels.");
             supportsOption("swop","American spelling, same effect as swap.");
@@ -371 +371 @@
             supportsOption("BGRA","Use BGRA pixel format for the vnc image");
         }
-        
+
         virtual const char* className() const { return "VNC plugin"; }
 
@@ -387 +387 @@
 
             std::string hostname = osgDB::getNameLessExtension(fileName);
-            
+
             OSG_NOTICE<<"Hostname = "<<hostname<<std::endl;
 
             osg::ref_ptr<LibVncImage> image = new LibVncImage;
-            image->setDataVariance(osg::Object::DYNAMIC);           
+            image->setDataVariance(osg::Object::DYNAMIC);
             image->setOrigin(osg::Image::TOP_LEFT);
 
@@ -420 +420 @@
                 return "Could not connect to "+hostname;
             }
-            
+
             return image.get();
         }
-        
+
         virtual osgDB::ReaderWriter::ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
         {
             osgDB::ReaderWriter::ReadResult result = readImage(fileName, options);
             if (!result.validImage()) return result;
-            
+
             osg::ref_ptr<osgWidget::VncClient> vncClient = new osgWidget::VncClient();
             if (vncClient->assign(dynamic_cast<osgWidget::VncImage*>(result.getImage())))