Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp

    r12292 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    8888    { 
    8989        sort(); 
    90      
     90 
    9191        databaseRequest = _requestList.front(); 
    9292        databaseRequest->_requestQueue = 0; 
     
    127127    if( isRunning() ) 
    128128    { 
    129      
     129 
    130130        _done = true; 
    131          
     131 
    132132        switch(_mode) 
    133133        { 
     
    154154            OpenThreads::Thread::YieldCurrentThread(); 
    155155        } 
    156          
     156 
    157157        // _startThreadCalled = false; 
    158158    } 
     
    167167 
    168168    osg::ref_ptr<ImagePager::ReadQueue> read_queue; 
    169      
     169 
    170170    switch(_mode) 
    171171    { 
     
    187187        osg::ref_ptr<ImageRequest> imageRequest; 
    188188        read_queue->takeFirst(imageRequest); 
    189                  
     189 
    190190        if (imageRequest.valid()) 
    191191        { 
     
    219219            OpenThreads::Thread::YieldCurrentThread(); 
    220220        } 
    221          
    222          
     221 
     222 
    223223        // go to sleep till our the next time our thread gets scheduled. 
    224224 
    225225        if (firstTime) 
    226226        { 
    227             // do a yield to get round a peculiar thread hang when testCancel() is called  
     227            // do a yield to get round a peculiar thread hang when testCancel() is called 
    228228            // in certain circumstances - of which there is no particular pattern. 
    229229            YieldCurrentThread(); 
     
    246246    _startThreadCalled = false; 
    247247    _databasePagerThreadPaused = false; 
    248      
     248 
    249249    _readQueue = new ReadQueue(this,"Image Queue"); 
    250250    _completedQueue = new RequestQueue; 
     
    305305    request->_attachmentIndex = attachmentIndex; 
    306306    request->_requestQueue = _readQueue.get(); 
    307     
     307 
    308308    _readQueue->add(request.get()); 
    309309 
     
    311311    { 
    312312        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_run_mutex); 
    313          
     313 
    314314        if (!_startThreadCalled) 
    315315        { 
    316316            _startThreadCalled = true; 
    317317            _done = false; 
    318              
     318 
    319319            for(ImageThreads::iterator itr = _imageThreads.begin(); 
    320320                itr != _imageThreads.end(); 
     
    323323                (*itr)->startThread(); 
    324324            } 
    325              
     325 
    326326        } 
    327327    } 
     
    354354        } 
    355355    } 
    356      
     356 
    357357    _completedQueue->_requestList.clear(); 
    358358}