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/osgText/DefaultFont.cpp

    r12949 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{ 
     
    1111 
    1212 without even the implied warranty of 
    13  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1414 * OpenSceneGraph Public License for more details. 
    1515*/ 
     
    6262 
    6363    // new find the glyph for the required charcode. 
    64     GlyphMap& glyphmap = itr->second;     
     64    GlyphMap& glyphmap = itr->second; 
    6565    GlyphMap::iterator gitr = glyphmap.find(charcode); 
    66      
     66 
    6767    if (gitr!=glyphmap.end()) return gitr->second.get(); 
    6868    else return 0; 
     
    181181        {0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x00} 
    182182    }; 
    183      
     183 
    184184    unsigned int sourceWidth = 8; 
    185185    unsigned int sourceHeight = 12; 
    186      
     186 
    187187    FontResolution fontRes(sourceWidth,sourceHeight); 
    188188 
     
    191191    { 
    192192        osg::ref_ptr<Glyph> glyph = new Glyph(this, i); 
    193          
     193 
    194194        unsigned int dataSize = sourceWidth*sourceHeight; 
    195195        unsigned char* data = new unsigned char[dataSize]; 
     
    197197        // clear the image to zeros. 
    198198        for(unsigned char* p=data;p<data+dataSize;) { *p++ = 0; } 
    199          
     199 
    200200        glyph->setImage(sourceWidth,sourceHeight,1, 
    201201                        GL_ALPHA, 
     
    217217            (*data++)=((*ptr)&64)?value_on:value_off; 
    218218            (*data++)=((*ptr)&32)?value_on:value_off; 
    219             (*data++)=((*ptr)&16)?value_on:value_off;             
     219            (*data++)=((*ptr)&16)?value_on:value_off; 
    220220            (*data++)=((*ptr)&8)?value_on:value_off; 
    221221            (*data++)=((*ptr)&4)?value_on:value_off;