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/osgPlugins/freetype/FreeTypeLibrary.cpp

    r12577 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*/ 
     
    2525FreeTypeLibrary::FreeTypeLibrary() 
    2626{ 
    27     OSG_INFO << "FreeTypeLibrary::FreeTypeLibrary()" << std::endl;  
     27    OSG_INFO << "FreeTypeLibrary::FreeTypeLibrary()" << std::endl; 
    2828    FT_Error error = FT_Init_FreeType( &_ftlibrary ); 
    2929    if (error) 
     
    4949        else fontImplementation->_facade = 0; 
    5050    } 
    51      
     51 
    5252    FT_Done_FreeType( _ftlibrary); 
    5353} 
     
    7676        return false; 
    7777    } 
    78      
     78 
    7979#ifdef PRINT_OUT_FONT_DETAILS 
    8080 
     
    8585        FT_SfntName names; 
    8686        FT_Error error = FT_Get_Sfnt_Name(face, i, &names); 
    87          
     87 
    8888        std::string name((char*)names.string, (char*)names.string + names.string_len); 
    89          
     89 
    9090        OSG_NOTICE<<"names "<<name<<std::endl; 
    9191    } 
     
    9898    // 
    9999    verifyCharacterMap(face); 
    100      
     100 
    101101    return true; 
    102102} 
     
    146146    // 
    147147    verifyCharacterMap(face); 
    148      
     148 
    149149    return buffer; 
    150150} 
     
    157157 
    158158    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getMutex()); 
    159      
     159 
    160160    FreeTypeFont* fontImp = new FreeTypeFont(fontfile,face,flags); 
    161161    osgText::Font* font = new osgText::Font(fontImp); 
    162162 
    163163    _fontImplementationSet.insert(fontImp); 
    164      
     164 
    165165    return font; 
    166166} 
     
    171171    if (face == 0) return (0); 
    172172 
    173      
     173 
    174174    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getMutex()); 
    175175 
    176176    FreeTypeFont* fontImp = new FreeTypeFont(buffer,face,flags); 
    177177    osgText::Font* font = new osgText::Font(fontImp); 
    178      
     178 
    179179    _fontImplementationSet.insert(fontImp); 
    180180 
     
    185185{ 
    186186    // 
    187     // GT: Verify the correct character mapping for MS windows  
     187    // GT: Verify the correct character mapping for MS windows 
    188188    // as symbol fonts were being returned incorrectly 
    189189    // 
     
    191191    if (face->charmap == NULL) 
    192192    { 
    193         for (int n = 0; n < face->num_charmaps; n++)  
    194         {  
    195             charmap = face->charmaps[n];  
    196             if (charmap->platform_id == TT_PLATFORM_MICROSOFT)  
    197             {  
     193        for (int n = 0; n < face->num_charmaps; n++) 
     194        { 
     195            charmap = face->charmaps[n]; 
     196            if (charmap->platform_id == TT_PLATFORM_MICROSOFT) 
     197            { 
    198198                FT_Set_Charmap(face, charmap); 
    199                 break;  
    200             }  
     199                break; 
     200            } 
    201201        } 
    202202    }