Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont.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/FreeTypeFont.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont.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.
 */
@@ -231 +231 @@
             // not dangling pointers remain
             freeTypeLibrary->removeFontImplmentation(this);
-        
+
             // free the freetype font face itself
             FT_Done_Face(_face);
@@ -272 +272 @@
     {
         OSG_WARN<<"Warning: FreeTypeFont::setSize("<<width<<","<<height<<") sizes too large,"<<std::endl;
-    
+
         width = _facade->getTextureWidthHint()-2*margin;
         height = _facade->getTextureHeightHint()-2*margin;
@@ -303 +303 @@
 
     //
-    // GT: fix for symbol fonts (i.e. the Webdings font) as the wrong character are being  
-    // returned, for symbol fonts in windows (FT_ENCONDING_MS_SYMBOL in freetype) the correct 
-    // values are from 0xF000 to 0xF0FF not from 0x000 to 0x00FF (0 to 255) as you would expect.  
+    // GT: fix for symbol fonts (i.e. the Webdings font) as the wrong character are being
+    // returned, for symbol fonts in windows (FT_ENCONDING_MS_SYMBOL in freetype) the correct
+    // values are from 0xF000 to 0xF0FF not from 0x000 to 0x00FF (0 to 255) as you would expect.
     // Microsoft uses a private field for its symbol fonts
     //
@@ -332 +332 @@
     unsigned int sourceWidth = glyphslot->bitmap.width;;
     unsigned int sourceHeight = glyphslot->bitmap.rows;
-    
+
     unsigned int width = sourceWidth;
     unsigned int height = sourceHeight;
 
     osg::ref_ptr<osgText::Glyph> glyph = new osgText::Glyph(_facade, charcode);
-    
+
     unsigned int dataSize = width*height;
     unsigned char* data = new unsigned char[dataSize];
-    
+
 
     // clear the image to zeros.
@@ -354 +354 @@
     glyph->setInternalTextureFormat(GL_ALPHA);
 
-    // copy image across to osgText::Glyph image.     
+    // copy image across to osgText::Glyph image.
     switch(glyphslot->bitmap.pixel_mode)
     {
@@ -368 +368 @@
             break;
 
-        
+
         case FT_PIXEL_MODE_GRAY:
             for(int r=sourceHeight-1;r>=0;--r)
@@ -379 +379 @@
             }
             break;
-            
+
         default:
             OSG_WARN << "FT_Load_Char(...) returned bitmap with unknown pixel_mode " << glyphslot->bitmap.pixel_mode << std::endl;
@@ -405 +405 @@
     OSG_NOTICE<<"   _face->units_per_EM = "<<_face->units_per_EM<<", scale="<<1.0f/float(_face->units_per_EM)<<std::endl;
 #endif
-    
+
 //    cout << "      in getGlyph() implementation="<<this<<"  "<<_filename<<"  facade="<<_facade<<endl;
 
@@ -525 +525 @@
     FT_UInt left = FT_Get_Char_Index( _face, leftcharcode );
     FT_UInt right = FT_Get_Char_Index( _face, rightcharcode );
-    
-    // get the kerning distances.   
+
+    // get the kerning distances.
     FT_Vector  kerning;
 
@@ -573 +573 @@
     return true;
 #endif
-} 
+}
 
 float FreeTypeFont::getCoordScale() const