From Jannik Heller, typo fixes

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14882 16af8721-9629-0410-8352-f15c8da7e697

src/osg/BufferObject.cpp

@@ -71,12 +71,12 @@ GLBufferObject::GLBufferObject(unsigned int contextID, BufferObject* bufferObjec
         _extensions->glGenBuffers(1, &_glObjectID);
     }
 
-    // OSG_NOTICE<<"Constucting BufferObject "<<this<<std::endl;
+    // OSG_NOTICE<<"Constructing BufferObject "<<this<<std::endl;
 }
 
 GLBufferObject::~GLBufferObject()
 {
-    //OSG_NOTICE<<"Destucting BufferObject "<<this<<std::endl;
+    //OSG_NOTICE<<"Destructing BufferObject "<<this<<std::endl;
 }
 
 void GLBufferObject::setBufferObject(BufferObject* bufferObject)
@@ -529,7 +529,7 @@ void GLBufferObjectSet::flushDeletedGLBufferObjects(double /*currentTime*/, doub
     unsigned int sizeRequired = _parent->getCurrGLBufferObjectPoolSize() - _parent->getMaxGLBufferObjectPoolSize();
     unsigned int maxNumObjectsToDelete = static_cast<unsigned int>(ceil(double(sizeRequired) / double(_profile._size)));
     OSG_INFO<<"_parent->getCurrGLBufferObjectPoolSize()="<<_parent->getCurrGLBufferObjectPoolSize() <<" _parent->getMaxGLBufferObjectPoolSize()="<< _parent->getMaxGLBufferObjectPoolSize()<<std::endl;
-    OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedGLBufferObjects.size()<<" orhpans"<<std::endl;
+    OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedGLBufferObjects.size()<<" orphans"<<std::endl;
 
     ElapsedTime timer;
 
@@ -553,7 +553,7 @@ void GLBufferObjectSet::flushDeletedGLBufferObjects(double /*currentTime*/, doub
 
     _parent->setCurrGLBufferObjectPoolSize( _parent->getCurrGLBufferObjectPoolSize() - numDeleted*_profile._size );
 
-    // update the number of active and orphaned TextureOjects
+    // update the number of active and orphaned TextureObjects
     _parent->getNumberOrphanedGLBufferObjects() -= numDeleted;
     _parent->getNumberDeleted() += numDeleted;
 

src/osg/GraphicsContext.cpp

@@ -295,7 +295,7 @@ unsigned int GraphicsContext::createNewContextID()
     OSG_INFO<<"GraphicsContext::createNewContextID() creating contextID="<<contextID<<std::endl;
     OSG_INFO<<"Updating the MaxNumberOfGraphicsContexts to "<<contextID+1<<std::endl;
 
-    // update the the maximum number of graphics contexts,
+    // update the maximum number of graphics contexts,
     // to ensure that texture objects and display buffers are configured to the correct size.
     osg::DisplaySettings::instance()->setMaxNumberOfGraphicsContexts( contextID + 1 );
 
@@ -586,7 +586,7 @@ void GraphicsContext::close(bool callCloseImplementation)
 
 
     // now discard any deleted deleted OpenGL objects that the are still hanging around - such as due to
-    // the the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent
+    // the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent
     // does not work.
     if ( !sharedContextExists && _state.valid())
     {

src/osg/Notify.cpp

@@ -183,7 +183,7 @@ bool osg::initNotifyLevel()
     return true;
 }
 
-// Use a proxy to force the initialization of the the NotifySingleton during static initialization
+// Use a proxy to force the initialization of the NotifySingleton during static initialization
 OSG_INIT_SINGLETON_PROXY(NotifySingletonProxy, osg::initNotifyLevel())
 
 void osg::setNotifyLevel(osg::NotifySeverity severity)

src/osg/OperationThread.cpp

@@ -339,7 +339,7 @@ int OperationThread::cancel()
             if (_currentOperation.valid()) _currentOperation->release();
         }
 
-        // then wait for the the thread to stop running.
+        // then wait for the thread to stop running.
         while(isRunning())
         {
 

src/osg/Texture.cpp

@@ -579,7 +579,7 @@ void Texture::TextureObjectSet::discardAllDeletedTextureObjects()
     // update the TextureObjectManager's running total of current pool size
     _parent->getCurrTexturePoolSize() -= numDiscarded*_profile._size;
 
-    // update the number of active and orphaned TextureOjects
+    // update the number of active and orphaned TextureObjects
     _parent->getNumberOrphanedTextureObjects() -= numDiscarded;
     _parent->getNumberDeleted() += numDiscarded;
 
@@ -623,7 +623,7 @@ void Texture::TextureObjectSet::flushDeletedTextureObjects(double /*currentTime*
         _orphanedTextureObjects.size();
 
     OSG_INFO<<"_parent->getCurrTexturePoolSize()="<<_parent->getCurrTexturePoolSize() <<" _parent->getMaxTexturePoolSize()="<< _parent->getMaxTexturePoolSize()<<std::endl;
-    OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedTextureObjects.size()<<" orhpans"<<std::endl;
+    OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedTextureObjects.size()<<" orphans"<<std::endl;
 
     ElapsedTime timer;
 
@@ -650,7 +650,7 @@ void Texture::TextureObjectSet::flushDeletedTextureObjects(double /*currentTime*
 
     _parent->getCurrTexturePoolSize() -= numDeleted*_profile._size;
 
-    // update the number of active and orphaned TextureOjects
+    // update the number of active and orphaned TextureObjects
     _parent->getNumberOrphanedTextureObjects() -= numDeleted;
     _parent->getNumberDeleted() += numDeleted;
 
@@ -691,7 +691,7 @@ osg::ref_ptr<Texture::TextureObject> Texture::TextureObjectSet::takeFromOrphans(
     // assign to new texture
     to->setTexture(texture);
 
-    // update the number of active and orphaned TextureOjects
+    // update the number of active and orphaned TextureObjects
     _parent->getNumberOrphanedTextureObjects() -= 1;
     _parent->getNumberActiveTextureObjects() += 1;
 

src/osg/dxtctool.h

@@ -2,7 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2002 Tanguy Fautr<EFBFBD>.
+//  Copyright (C) 2002 Tanguy Fautr.
 //
 //  This software is provided 'as-is', without any express or implied
 //  warranty.  In no event will the authors be held liable for any damages
@@ -20,7 +20,7 @@
 //     misrepresented as being the original software.
 //  3. This notice may not be removed or altered from any source distribution.
 //
-//  Tanguy Fautr<EFBFBD>
+//  Tanguy Fautr
 //  softdev@telenet.be
 //
 //////////////////////////////////////////////////////////////////////
@@ -197,7 +197,7 @@ inline void dxtc_pixels::BVF_Color_H2(void * const pBlock) const {
 
 
 inline void dxtc_pixels::BVF_Color_H4(void * const pBlock) const {
-    // Swap the the first row of pixels with the last one, then the 2 middle row of pixels
+    // Swap the first row of pixels with the last one, then the 2 middle row of pixels
     dxtc_int8 * pP = ((dxtc_int8 *) pBlock) + 4;
 
     std::swap(pP[0], pP[3]);
@@ -232,7 +232,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT3_H2(void * const pBlock) const {
 
 
 inline void dxtc_pixels::BVF_Alpha_DXT3_H4(void * const pBlock) const {
-    // Swap the the first row of pixels with the last one, then the 2 middle row of pixels
+    // Swap the first row of pixels with the last one, then the 2 middle row of pixels
     dxtc_int16 * pP = (dxtc_int16 * ) pBlock;
 
     std::swap(pP[0], pP[3]);
@@ -268,7 +268,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const {
 
 
 inline void dxtc_pixels::BVF_Alpha_DXT5_H4(void * const pBlock) const {
-    // Swap the the first row of pixels with the last one, then the 2 middle row of pixels (tricky again)
+    // Swap the first row of pixels with the last one, then the 2 middle row of pixels (tricky again)
     dxtc_int64 * pB = (dxtc_int64 * ) pBlock;
 
     dxtc_int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF);

src/osgDB/FileUtils.cpp

@@ -1094,7 +1094,7 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths)
         FSRef     f;
         OSErr    errCode;
 
-        // Start with the the Bundle PlugIns directory.
+        // Start with the Bundle PlugIns directory.
 
         // Get the main bundle first. No need to retain or release it since
         //  we are not keeping a reference

src/osgDB/ImagePager.cpp

@@ -157,7 +157,7 @@ int ImagePager::ImageThread::cancel()
         // release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation.
         // _databasePagerThreadBlock->release();
 
-        // then wait for the the thread to stop running.
+        // then wait for the thread to stop running.
         join();
 
         // _startThreadCalled = false;

src/osgGA/StateSetManipulator.cpp

@@ -41,7 +41,7 @@ void StateSetManipulator::setStateSet(StateSet *stateset)
     // specify that this stateset is dynamic so it prevents
     // the draw and update phase from overlapping - good for
     // stability but breaks all the performance advantage of
-    // DrawThreadPerContex.
+    // DrawThreadPerContext.
     _stateset->setDataVariance(osg::Object::DYNAMIC);
 #endif
 }

src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -1418,7 +1418,7 @@ ReaderWriter3DS::StateSetInfo ReaderWriter3DS::ReaderObject::createStateSet(Lib3
     // Set back face culling state if single sided material applied.
     // This seems like a reasonable assumption given that the backface cull option
     // doesn't appear to be encoded directly in the 3DS format, and also because
-    // it mirrors the effect of code in 3DS writer which uses the the face culling
+    // it mirrors the effect of code in 3DS writer which uses the face culling
     // attribute to determine the state of the 'two_sided' 3DS material being written.
     if (!mat->two_sided)
     {

src/osgPlugins/ac/ac3d.cpp

@@ -1005,7 +1005,7 @@ class SurfaceBin : public PrimitiveBin {
             shadeModel->setMode(osg::ShadeModel::FLAT);
         stateSet->setAttribute(shadeModel);
 
-        // Set up the arrays, allways store texture coords, may be we need them later ...
+        // Set up the arrays, always store texture coords, may be we need them later ...
         osg::Geometry* geometry = new osg::Geometry;
         _geode->addDrawable(geometry);
         geometry->setDataVariance(osg::Object::STATIC);
@@ -1021,7 +1021,7 @@ class SurfaceBin : public PrimitiveBin {
             geometry->setTexCoordArray(0, texcoordArray);
         }
 
-        // At first handle the the polygons to tessellate, fix them and append the other polygons later
+        // At first handle the polygons to tessellate, fix them and append the other polygons later
         if (!_toTessellatePolygons.empty())
         {
             for (unsigned i = 0; i < _toTessellatePolygons.size(); ++i)

src/osgPlugins/cfg/RenderSurface.h

@@ -258,7 +258,7 @@ class RenderSurface : public osg::Referenced
           */
         static void shareAllGLContexts(bool);
 
-        /** Returns true or false indicating the the state flag for sharing contexts
+        /** Returns true or false indicating the state flag for sharing contexts
           * between RenderSurfaces
           */
         static bool allGLContextsAreShared();

src/osgPlugins/zip/unzip.cpp

@@ -3131,7 +3131,7 @@ unzFile unzOpenInternal(LUFILE *fin)
   uLong number_disk=0;          // number of the current dist, used for spanning ZIP, unsupported, always 0
   if (err==UNZ_OK && unzlocal_getShort(fin,&number_disk)!=UNZ_OK) err=UNZ_ERRNO;
   // number of the disk with the start of the central directory
-  uLong number_disk_with_CD=0;  // number the the disk with central dir, used for spaning ZIP, unsupported, always 0
+  uLong number_disk_with_CD=0;  // number the disk with central dir, used for spaning ZIP, unsupported, always 0
   if (err==UNZ_OK && unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK) err=UNZ_ERRNO;
   // total number of entries in the central dir on this disk
   if (err==UNZ_OK && unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK) err=UNZ_ERRNO;

src/osgPresentation/Timeout.cpp

@@ -228,7 +228,7 @@ void Timeout::traverse(osg::NodeVisitor& nv)
             cv->setCurrentRenderBin(previousRenderBin);
 
             // and the render to texture stage to the current stages
-            // dependancy list.
+            // dependency list.
             cv->getCurrentRenderBin()->getStage()->addPostRenderStage(rs.get(),0);
         }
     }

src/osgUtil/CullVisitor.cpp

@@ -1596,7 +1596,7 @@ void CullVisitor::apply(osg::Camera& camera)
             rtts->reset();
         }
 
-        // set up clera masks/values
+        // set up clear masks/values
         rtts->setClearDepth(camera.getClearDepth());
         rtts->setClearAccum(camera.getClearAccum());
         rtts->setClearStencil(camera.getClearStencil());
@@ -1664,7 +1664,7 @@ void CullVisitor::apply(osg::Camera& camera)
 
 
         // and the render to texture stage to the current stages
-        // dependancy list.
+        // dependency list.
         switch(camera.getRenderOrder())
         {
             case osg::Camera::PRE_RENDER:

src/osgUtil/IntersectVisitor.cpp

@@ -205,7 +205,7 @@ void IntersectVisitor::reset()
 {
     _intersectStateStack.clear();
 
-    // create a empty IntersectState on the the intersectStateStack.
+    // create a empty IntersectState on the intersectStateStack.
     _intersectStateStack.push_back(new IntersectState);
 
     _segHitList.clear();

src/osgUtil/RenderBin.cpp

@@ -54,7 +54,7 @@ static RenderBinPrototypeList* renderBinPrototypeList()
     return s_renderBinPrototypeList.get();
 }
 
-// Use a proxy to force the initialization of the the RenderBinPrototypeListSingleton during static initialization
+// Use a proxy to force the initialization of the RenderBinPrototypeListSingleton during static initialization
 OSG_INIT_SINGLETON_PROXY(RenderBinSingletonProxy, renderBinPrototypeList())
 
 

src/osgUtil/SceneView.cpp

@@ -998,7 +998,7 @@ void SceneView::draw()
         flushDeletedGLObjects(availableTime);
     }
 
-    // assume the the draw which is about to happen could generate GL objects that need flushing in the next frame.
+    // assume the draw which is about to happen could generate GL objects that need flushing in the next frame.
     _requiresFlush = _automaticFlush;
 
     RenderLeaf* previous = NULL;