Changeset 13041 for OpenSceneGraph/trunk/src/osgText/Font.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/osgText/Font.cpp (modified) (17 diffs)

OpenSceneGraph/trunk/src/osgText/Font.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.
 */
@@ -76 +76 @@
             s_FontFilePath.push_back(winFontPath);
         }
-    #elif defined(__APPLE__) 
-      osgDB::convertStringPathIntoFilePathList( 
+    #elif defined(__APPLE__)
+      osgDB::convertStringPathIntoFilePathList(
         ".:/usr/share/fonts/ttf:/usr/share/fonts/ttf/western:/usr/share/fonts/ttf/decoratives:/Library/Fonts:/System/Library/Fonts",
         s_FontFilePath);
@@ -104 +104 @@
 
     // Not found, return empty string
-    OSG_INFO<<"Warning: font file \""<<str<<"\" not found."<<std::endl;    
+    OSG_INFO<<"Warning: font file \""<<str<<"\" not found."<<std::endl;
     return std::string();
 }
@@ -115 +115 @@
     if (foundFile.empty())
         foundFile = filename;
-    
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getFontFileMutex());
 
@@ -157 +157 @@
     }
     if (!rr.validObject()) return 0;
-    
+
     osg::Object *object = rr.takeObject();
 
@@ -176 +176 @@
     if (foundFile.empty())
         foundFile = filename;
-    
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(getFontFileMutex());
 
@@ -216 +216 @@
     }
     if (!rr.validObject()) return 0;
-    
+
     // if the object is a font then return it.
     osgText::Font* font = dynamic_cast<osgText::Font*>(rr.getObject());
@@ -323 +323 @@
 {
     return _textureHeightHint;
-}    
+}
 
 
@@ -355 +355 @@
     FontResolution fontResUsed(0,0);
     if (_implementation->supportsMultipleFontResolutions()) fontResUsed = fontRes;
-        
+
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);
@@ -397 +397 @@
 {
    osg::Object::setThreadSafeRefUnref(threadSafe);
-    
+
     if (_texenv.valid()) _texenv->setThreadSafeRefUnref(threadSafe);
     if (_stateset.valid()) _stateset->setThreadSafeRefUnref(threadSafe);
@@ -406 +406 @@
     {
         (*itr)->setThreadSafeRefUnref(threadSafe);
-    }    
+    }
 }
 
@@ -418 +418 @@
     {
         (*itr)->resizeGLObjectBuffers(maxSize);
-    }    
+    }
 }
 
@@ -431 +431 @@
         (*itr)->releaseGLObjects(state);
     }
-    
+
     // const_cast<Font*>(this)->_glyphTextureList.clear();
     // const_cast<Font*>(this)->_sizeGlyphMap.clear();
@@ -455 +455 @@
 
     _sizeGlyphMap[fontRes][charcode]=glyph;
-    
+
     int posX=0,posY=0;
-    
+
     GlyphTexture* glyphTexture = 0;
     for(GlyphTextureList::iterator itr=_glyphTextureList.begin();
@@ -465 +465 @@
         if ((*itr)->getSpaceForGlyph(glyph,posX,posY)) glyphTexture = itr->get();
     }
-    
+
     if (glyphTexture)
     {
         //cout << "    found space for texture "<<glyphTexture<<" posX="<<posX<<" posY="<<posY<<endl;
     }
-    
+
     if (!glyphTexture)
     {
-        
+
         glyphTexture = new GlyphTexture;
-        
+
         static int numberOfTexturesAllocated = 0;
         ++numberOfTexturesAllocated;
@@ -488 +488 @@
         glyphTexture->setFilter(osg::Texture::MAG_FILTER,_magFilterHint);
         glyphTexture->setMaxAnisotropy(8);
-        
+
         _glyphTextureList.push_back(glyphTexture);
-        
+
         if (!glyphTexture->getSpaceForGlyph(glyph,posX,posY))
         {
@@ -497 +497 @@
         }
 
-    }    
-    
+    }
+
     // add the glyph into the texture.
     glyphTexture->addGlyph(glyph,posX,posY);
-    
-}
+
+}