Changeset 13041 for OpenSceneGraph/trunk/src/osgDB/ImagePager.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/osgDB/ImagePager.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/src/osgDB/ImagePager.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.
 */
@@ -88 +88 @@
     {
         sort();
-    
+
         databaseRequest = _requestList.front();
         databaseRequest->_requestQueue = 0;
@@ -127 +127 @@
     if( isRunning() )
     {
-    
+
         _done = true;
-        
+
         switch(_mode)
         {
@@ -154 +154 @@
             OpenThreads::Thread::YieldCurrentThread();
         }
-        
+
         // _startThreadCalled = false;
     }
@@ -167 +167 @@
 
     osg::ref_ptr<ImagePager::ReadQueue> read_queue;
-    
+
     switch(_mode)
     {
@@ -187 +187 @@
         osg::ref_ptr<ImageRequest> imageRequest;
         read_queue->takeFirst(imageRequest);
-                
+
         if (imageRequest.valid())
         {
@@ -219 +219 @@
             OpenThreads::Thread::YieldCurrentThread();
         }
-        
-        
+
+
         // go to sleep till our the next time our thread gets scheduled.
 
         if (firstTime)
         {
-            // do a yield to get round a peculiar thread hang when testCancel() is called 
+            // do a yield to get round a peculiar thread hang when testCancel() is called
             // in certain circumstances - of which there is no particular pattern.
             YieldCurrentThread();
@@ -246 +246 @@
     _startThreadCalled = false;
     _databasePagerThreadPaused = false;
-    
+
     _readQueue = new ReadQueue(this,"Image Queue");
     _completedQueue = new RequestQueue;
@@ -305 +305 @@
     request->_attachmentIndex = attachmentIndex;
     request->_requestQueue = _readQueue.get();
-   
+
     _readQueue->add(request.get());
 
@@ -311 +311 @@
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_run_mutex);
-        
+
         if (!_startThreadCalled)
         {
             _startThreadCalled = true;
             _done = false;
-            
+
             for(ImageThreads::iterator itr = _imageThreads.begin();
                 itr != _imageThreads.end();
@@ -323 +323 @@
                 (*itr)->startThread();
             }
-            
+
         }
     }
@@ -354 +354 @@
         }
     }
-    
+
     _completedQueue->_requestList.clear();
 }