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

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgQt/QFontImplementation.cpp

    r12407 r13041  
    11/* -*-c++-*- OpenSceneGraph - Copyright (C) 2009-2010 Mathias Froehlich 
    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*/ 
     
    4545    unsigned int fontSize = fontRes.second; 
    4646    _font.setPixelSize(fontSize); 
    47      
     47 
    4848    float coord_scale = 1.0f/float(fontSize); 
    4949 
     
    8888        } 
    8989    } 
    90      
     90 
    9191    // the glyph texture in osg 
    9292    glyph->setImage(imageWidth, imageHeight, 1, 
     
    9797                    1); 
    9898    glyph->setInternalTextureFormat(GL_ALPHA); 
    99      
     99 
    100100    glyph->setWidth((float)imageWidth * coord_scale); 
    101101    glyph->setHeight((float)imageHeight * coord_scale); 
     
    115115    glyph->setVerticalBearing(topMiddle * coord_scale); 
    116116    glyph->setVerticalAdvance((rectF.height() + fontMetricsF.overlinePos() - fontMetricsF.xHeight()) * coord_scale); 
    117      
     117 
    118118    // ... ready 
    119119    //addGlyph(fontRes, charcode, glyph.get()); 
    120      
     120 
    121121    return glyph.release(); 
    122122}