Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeLibrary.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeLibrary.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeLibrary.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.
 */
@@ -25 +25 @@
 FreeTypeLibrary::FreeTypeLibrary()
 {
-    OSG_INFO << "FreeTypeLibrary::FreeTypeLibrary()" << std::endl; 
+    OSG_INFO << "FreeTypeLibrary::FreeTypeLibrary()" << std::endl;
     FT_Error error = FT_Init_FreeType( &_ftlibrary );
     if (error)
@@ -49 +49 @@
         else fontImplementation->_facade = 0;
     }
-    
+
     FT_Done_FreeType( _ftlibrary);
 }
@@ -76 +76 @@
         return false;
     }
-    
+
 #ifdef PRINT_OUT_FONT_DETAILS
 
@@ -85 +85 @@
         FT_SfntName names;
         FT_Error error = FT_Get_Sfnt_Name(face, i, &names);
-        
+
         std::string name((char*)names.string, (char*)names.string + names.string_len);
-        
+
         OSG_NOTICE<<"names "<<name<<std::endl;
     }
@@ -98 +98 @@
     //
     verifyCharacterMap(face);
-    
+
     return true;
 }
@@ -146 +146 @@
     //
     verifyCharacterMap(face);
-    
+
     return buffer;
 }
@@ -157 +157 @@
 
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getMutex());
-    
+
     FreeTypeFont* fontImp = new FreeTypeFont(fontfile,face,flags);
     osgText::Font* font = new osgText::Font(fontImp);
 
     _fontImplementationSet.insert(fontImp);
-    
+
     return font;
 }
@@ -171 +171 @@
     if (face == 0) return (0);
 
-    
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getMutex());
 
     FreeTypeFont* fontImp = new FreeTypeFont(buffer,face,flags);
     osgText::Font* font = new osgText::Font(fontImp);
-    
+
     _fontImplementationSet.insert(fontImp);
 
@@ -185 +185 @@
 {
     //
-    // GT: Verify the correct character mapping for MS windows 
+    // GT: Verify the correct character mapping for MS windows
     // as symbol fonts were being returned incorrectly
     //
@@ -191 +191 @@
     if (face->charmap == NULL)
     {
-        for (int n = 0; n < face->num_charmaps; n++) 
-        { 
-            charmap = face->charmaps[n]; 
-            if (charmap->platform_id == TT_PLATFORM_MICROSOFT) 
-            { 
+        for (int n = 0; n < face->num_charmaps; n++)
+        {
+            charmap = face->charmaps[n];
+            if (charmap->platform_id == TT_PLATFORM_MICROSOFT)
+            {
                 FT_Set_Charmap(face, charmap);
-                break; 
-            } 
+                break;
+            }
         }
     }