[SCM] osgearth branch, master, updated. debian/1.4.1-1-71-gecb0256

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 8981fa2eeb0483c15756a3d31ad6a0a4e2b7e578
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 13 16:19:25 2013 +0200

    Add patch to fix 'becuase' typo.

diff --git a/debian/changelog b/debian/changelog
index e7b9e33..ce97169 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osgearth (2.4.0+dfsg-4) UNRELEASED; urgency=low
   * Remove duplicate section from binary package osgearth-data.
   * Use canonical URLs for Vcs-* fields.
   * Add DEP3 headers to soversion.patch.
+  * Add patch to fix 'becuase' typo.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 13 Sep 2013 15:14:27 +0200
 
diff --git a/debian/patches/becuase-typo.patch b/debian/patches/becuase-typo.patch
new file mode 100644
index 0000000..ffeefff
--- /dev/null
+++ b/debian/patches/becuase-typo.patch
@@ -0,0 +1,49 @@
+Description: Fix 'becuase' typo.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug: https://github.com/gwaldron/osgearth/pull/366
+Applied-Upstream: https://github.com/gwaldron/osgearth/commit/6e50453c225d95e9adccae1a60f5e4d941de3243
+Last-Update: 2013-09-13
+--- a/src/osgEarth/ImageLayer.cpp
++++ b/src/osgEarth/ImageLayer.cpp
+@@ -190,7 +190,7 @@ ImageLayerTileProcessor::process( osg::r
+     }
+ 
+     // If this is a compressed image, uncompress it IF the image is not already in the
+-    // target profile...becuase if it's not in the target profile, we will have to do
++    // target profile...because if it's not in the target profile, we will have to do
+     // some mosaicing...and we can't mosaic a compressed image.
+     if (!_layerInTargetProfile &&
+         ImageUtils::isCompressed(image.get()) &&
+--- a/src/osgEarth/TextureCompositor.cpp
++++ b/src/osgEarth/TextureCompositor.cpp
+@@ -381,7 +381,7 @@ TextureCompositor::applyMapModelChange(
+     if ( disableLODBlending && layer->getImageLayerOptions().lodBlending() == true )
+     {
+         OE_WARN << LC << "LOD blending disabled for layer \"" << layer->getName()
+-            << "\" becuase it uses Mercator fast-path rendering" << std::endl;
++            << "\" because it uses Mercator fast-path rendering" << std::endl;
+     }
+ 
+     _layout.applyMapModelChange(
+--- a/src/osgEarthDrivers/engine_osgterrain/OSGTerrainEngineNode.cpp
++++ b/src/osgEarthDrivers/engine_osgterrain/OSGTerrainEngineNode.cpp
+@@ -833,7 +833,7 @@ OSGTerrainEngineNode::traverse( osg::Nod
+         if ( nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR )
+         {
+             // update the cull-thread map frame if necessary. (We don't need to sync the
+-            // update_mapf becuase that happens in response to a map callback.)
++            // update_mapf because that happens in response to a map callback.)
+ 
+             // TODO: address the fact that this can happen from multiple threads.
+             // Really we need a _cull_mapf PER view. -gw
+--- a/src/osgEarthUtil/Controls.cpp
++++ b/src/osgEarthUtil/Controls.cpp
+@@ -782,7 +782,7 @@ LabelControl::calcSize(const ControlCont
+ #endif
+ 
+         t->setText( _text, _encoding );
+-        // yes, object coords. screen coords won't work becuase the bounding box will be wrong.
++        // yes, object coords. screen coords won't work because the bounding box will be wrong.
+         t->setCharacterSizeMode( osgText::Text::OBJECT_COORDS );
+         t->setCharacterSize( _fontSize );
+         // always align to top. layout alignment gets calculated layer in Control::calcPos().
diff --git a/debian/patches/series b/debian/patches/series
index 8ab01fc..9391bea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 soversion.patch
 MPGeometry-OpenSceneGraph-3.1.8.patch
+becuase-typo.patch

-- 
osgEarth terrain rendering toolkit