This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osgearth.

commit f25aafbfe1daa79175d1e549fb29f5487c0e5115
Merge: 55e1bf8 fb50a43
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Mon Oct 13 20:59:29 2014 +0200

    Merge tag 'upstream/2.6.0+dfsg'
    
    Upstream version 2.6.0+dfsg

 CMakeLists.txt                                     |    45 +-
 CMakeModules/FindDuktape.cmake                     |    68 +
 CMakeModules/FindGEOS.cmake                        |     6 +-
 CMakeModules/FindJavaScriptCore.cmake              |     2 +-
 CMakeModules/FindLevelDB.cmake                     |    86 +
 CMakeModules/FindLibNoise.cmake                    |     2 +-
 CMakeModules/FindOSG.cmake                         |     8 +-
 CMakeModules/FindOsgEarth.cmake                    |    91 +
 CMakeModules/FindSilverLining.cmake                |   116 +
 CMakeModules/FindTriton.cmake                      |   116 +
 CMakeModules/FindV8.cmake                          |   213 +-
 CMakeModules/GetGitRevisionDescription.cmake       |     8 +-
 CMakeModules/OsgEarthMacroUtils.cmake              |     6 +-
 LICENSE.txt                                        |     2 +-
 README.txt                                         |     2 +-
 data/resources/textures_us/catalog.xml             |    15 +-
 .../commercial/10storymodernconcrete.jpg           |   Bin 16585 -> 20491 bytes
 .../textures_us/commercial/12storygovtmodern.jpg   |   Bin 21473 -> 22644 bytes
 .../commercial/15storybrownconcroffice2.jpg        |   Bin 25480 -> 20374 bytes
 .../commercial/15storyltbrownconcroffice3.jpg      |   Bin 27095 -> 21745 bytes
 .../commercial/16storyconcrglassgreymodern4.jpg    |   Bin 15728 -> 12318 bytes
 .../commercial/18storyconcrbrownoffice2.jpg        |   Bin 7662 -> 8286 bytes
 .../textures_us/commercial/18storyoffice.jpg       |   Bin 33012 -> 24905 bytes
 .../commercial/20storygreycncrglassmodern.jpg      |   Bin 19166 -> 16949 bytes
 .../textures_us/commercial/25storyBrownWide1.jpg   |   Bin 31227 -> 42743 bytes
 .../textures_us/commercial/30storyconcrbrown4.jpg  |   Bin 25146 -> 21841 bytes
 .../3storyIndustrial_concrglasswhite1.jpg          |   Bin 4562 -> 5811 bytes
 .../textures_us/commercial/40storymodern.jpg       |   Bin 21405 -> 32468 bytes
 .../textures_us/commercial/45storyglassmodern.jpg  |   Bin 14939 -> 12862 bytes
 .../textures_us/commercial/5storywhite.jpg         |   Bin 5509 -> 7282 bytes
 .../textures_us/commercial/7storymodernsq.jpg      |   Bin 7147 -> 8377 bytes
 .../commercial/US-dcofficeconcrwhite6-7st.jpg      |   Bin 22797 -> 24466 bytes
 .../commercial/US-dcofficeconcrwhite8st.jpg        |   Bin 35714 -> 37917 bytes
 data/resources/textures_us/misc/asphalt.jpg        |   Bin 0 -> 806389 bytes
 .../textures_us/residential/US-CityCondo-3st.jpg   |   Bin 8801 -> 9348 bytes
 .../residential/tiles/USUAE-8stTile_rep.jpg        |   Bin 22042 -> 18095 bytes
 data/resources/textures_us/rooftop/roof_misc2.jpg  |   Bin 11642 -> 9501 bytes
 data/resources/textures_us/rooftop/roof_misc3.jpg  |   Bin 53332 -> 16060 bytes
 data/resources/textures_us/rooftop/roof_misc4.jpg  |   Bin 8291 -> 6456 bytes
 data/resources/textures_us/rooftop/roof_misc5.jpg  |   Bin 12332 -> 9647 bytes
 .../textures_us/rooftop/tiled/roof_tiled1.jpg      |   Bin 5762 -> 5742 bytes
 .../textures_us/rooftop/tiled/roof_tiled3.jpg      |   Bin 5815 -> 5807 bytes
 docs/source/about.rst                              |    24 +-
 docs/source/data.rst                               |     4 +-
 docs/source/developer/utilities.rst                |    43 +-
 docs/source/faq.rst                                |    35 +-
 docs/source/references/colorfilters.rst            |     6 +-
 .../source/references/drivers/cache/filesystem.rst |    40 +
 docs/source/references/drivers/cache/index.rst     |    10 +
 docs/source/references/drivers/cache/leveldb.rst   |    39 +
 docs/source/references/drivers/effects/glsky.rst   |    14 +
 docs/source/references/drivers/effects/index.rst   |    10 +
 .../references/drivers/effects/silverlining.rst    |    29 +
 .../references/drivers/effects/simplesky.rst       |    24 +
 .../references/drivers/effects/sky_shared.rst      |     4 +
 docs/source/references/drivers/feature/wfs.rst     |     2 +
 docs/source/references/drivers/index.rst           |     3 +-
 .../drivers/model/feature_model_shared_props.rst   |     1 +
 docs/source/references/drivers/model/simple.rst    |     1 +
 docs/source/references/drivers/tile/colorramp.rst  |    35 +
 docs/source/references/drivers/tile/index.rst      |     2 +
 docs/source/references/drivers/tile/mbtiles.rst    |    26 +
 docs/source/references/drivers/tile/vpb.rst        |     1 +
 docs/source/references/earthfile.rst               |    81 +-
 docs/source/references/envvars.rst                 |    29 +-
 docs/source/references/symbology.rst               |     7 +
 docs/source/startup.rst                            |    32 +-
 docs/source/user/caching.rst                       |    41 +-
 docs/source/user/features.rst                      |    45 +-
 docs/source/user/tools.rst                         |    32 +-
 src/CMakeLists.txt                                 |     2 +-
 src/applications/CMakeLists.txt                    |    19 +-
 .../osgearth_annotation/osgearth_annotation.cpp    |    78 +-
 src/applications/osgearth_atlas/CMakeLists.txt     |     7 +
 src/applications/osgearth_atlas/osgearth_atlas.cpp |   289 +
 .../osgearth_backfill/osgearth_backfill.cpp        |     2 +-
 src/applications/osgearth_boundarygen/BoundaryUtil |    60 +-
 .../osgearth_boundarygen/BoundaryUtil.cpp          |   267 +-
 .../osgearth_boundarygen/VertexCollectionVisitor   |     2 +-
 .../VertexCollectionVisitor.cpp                    |     2 +-
 .../osgearth_boundarygen/boundarygen.cpp           |    27 +-
 src/applications/osgearth_city/osgearth_city.cpp   |   201 +-
 src/applications/osgearth_clamp/osgearth_clamp.cpp |     2 +-
 src/applications/osgearth_clipplane/CMakeLists.txt |     7 +
 .../osgearth_clipplane/osgearth_clipplane.cpp      |   130 +
 .../osgearth_colorfilter/osgearth_colorfilter.cpp  |    12 +-
 .../osgearth_controls/osgearth_controls.cpp        |    30 +-
 src/applications/osgearth_conv/CMakeLists.txt      |     7 +
 src/applications/osgearth_conv/osgearth_conv.cpp   |   405 +
 src/applications/osgearth_demo/CMakeLists.txt      |    25 +-
 src/applications/osgearth_demo/osgearth_demo.cpp   |    12 +-
 .../osgearth_elevation/osgearth_elevation.cpp      |    39 +-
 .../osgearth_featureeditor.cpp                     |     4 +-
 .../osgearth_featurefilter.cpp                     |     2 +-
 .../osgearth_featureinfo/osgearth_featureinfo.cpp  |     2 +-
 .../osgearth_featuremanip.cpp                      |     2 +-
 .../osgearth_featurequery.cpp                      |     4 +-
 .../osgearth_features/osgearth_features.cpp        |     2 +-
 src/applications/osgearth_fog/CMakeLists.txt       |     7 +
 .../osgearth_fog.cpp}                              |    41 +-
 .../osgearth_graticule/osgearth_graticule.cpp      |     8 +-
 .../osgearth_imageoverlay.cpp                      |     4 +-
 src/applications/osgearth_los/osgearth_los.cpp     |     2 +-
 src/applications/osgearth_manip/osgearth_manip.cpp |    78 +-
 src/applications/osgearth_map/osgearth_map.cpp     |     4 +-
 .../osgearth_measure/osgearth_measure.cpp          |     5 +-
 .../osgearth_minimap/osgearth_minimap.cpp          |     2 +-
 src/applications/osgearth_mrt/CMakeLists.txt       |     7 +
 src/applications/osgearth_mrt/osgearth_mrt.cpp     |   335 +
 .../osgearth_occlusionculling.cpp                  |     2 +-
 .../osgearth_overlayviewer.cpp                     |    40 +-
 .../osgearth_package/osgearth_package.cpp          |   831 +-
 .../osgearth_package_qt/CMakeLists.txt             |    27 +-
 src/applications/osgearth_package_qt/ExportDialog  |    74 +-
 .../osgearth_package_qt/ExportDialog.cpp           |   152 +-
 .../osgearth_package_qt/ExportDialog.ui            |    69 +-
 .../osgearth_package_qt/ExportProgress.cpp         |    53 +
 .../osgearth_package_qt/ExportProgress.h           |    28 +
 .../osgearth_package_qt/PackageQtMainWindow        |    79 +-
 .../osgearth_package_qt/SceneController.cpp        |    24 +-
 .../osgearth_package_qt/SceneController.h          |    12 +-
 .../osgearth_package_qt/TMSExporter.cpp            |   607 +-
 src/applications/osgearth_package_qt/TMSExporter.h |    87 +-
 src/applications/osgearth_package_qt/WaitDialog    |     5 +-
 .../osgearth_package_qt/WaitDialog.cpp             |     2 +-
 .../osgearth_package_qt/package_qt.cpp             |   294 +-
 src/applications/osgearth_qt/CMakeLists.txt        |    19 +-
 src/applications/osgearth_qt/DemoMainWindow        |     2 +-
 src/applications/osgearth_qt/osgearth_qt.cpp       |    22 +-
 src/applications/osgearth_qt_simple/CMakeLists.txt |    16 +-
 .../osgearth_qt_simple/osgearth_qt_simple.cpp      |    12 +-
 .../osgearth_qt_windows/CMakeLists.txt             |    15 +-
 .../osgearth_qt_windows/osgearth_qt_windows.cpp    |    13 +-
 src/applications/osgearth_seed/osgearth_seed.cpp   |   321 +-
 .../osgearth_sequencecontrol.cpp                   |     4 +-
 .../osgearth_shadercomp/osgearth_shadercomp.cpp    |   251 +-
 src/applications/osgearth_shadergen/CMakeLists.txt |     7 +
 .../osgearth_shadergen.cpp}                        |    74 +-
 src/applications/osgearth_shadow/CMakeLists.txt    |    14 -
 .../osgearth_shadow/osgearth_shadow.cpp            |   171 -
 .../osgearth_sharedlayer/osgearth_sharedlayer.cpp  |     3 +-
 .../osgearth_terraineffects.cpp                    |    34 +-
 .../osgearth_terrainprofile.cpp                    |     2 +-
 src/applications/osgearth_tfs/osgearth_tfs.cpp     |     2 +-
 .../osgearth_tileindex/osgearth_tileindex.cpp      |     2 +-
 .../osgearth_tilesource/osgearth_tilesource.cpp    |     2 +-
 src/applications/osgearth_toc/osgearth_toc.cpp     |     4 +-
 .../osgearth_tracks/osgearth_tracks.cpp            |     8 +-
 src/applications/osgearth_transform/CMakeLists.txt |     7 +
 .../osgearth_transform/osgearth_transform.cpp      |   163 +
 .../osgearth_version/osgearth_version.cpp          |     2 +-
 .../osgearth_viewer/osgearth_viewer.cpp            |    12 +-
 src/osgEarth/AlphaEffect                           |     5 +-
 src/osgEarth/AlphaEffect.cpp                       |    29 +-
 src/osgEarth/AutoScale                             |     2 +-
 src/osgEarth/AutoScale.cpp                         |     2 +-
 src/osgEarth/Bounds                                |     2 +-
 src/osgEarth/Bounds.cpp                            |     2 +-
 src/osgEarth/CMakeLists.txt                        |    36 +-
 src/osgEarth/Cache                                 |    35 +-
 src/osgEarth/Cache.cpp                             |     6 +-
 src/osgEarth/CacheBin                              |    59 +-
 src/osgEarth/CacheEstimator                        |     2 +-
 src/osgEarth/CacheEstimator.cpp                    |     2 +-
 src/osgEarth/CachePolicy                           |    11 +-
 src/osgEarth/CachePolicy.cpp                       |    40 +-
 src/osgEarth/CacheSeed                             |   101 +-
 src/osgEarth/CacheSeed.cpp                         |   353 +-
 src/osgEarth/Capabilities                          |    30 +-
 src/osgEarth/Capabilities.cpp                      |   109 +-
 src/osgEarth/ClampableNode.cpp                     |     2 +-
 src/osgEarth/ClampingTechnique                     |     2 +-
 src/osgEarth/ClampingTechnique.cpp                 |     6 +-
 src/osgEarth/ColorFilter                           |     2 +-
 src/osgEarth/ColorFilter.cpp                       |     2 +-
 src/osgEarth/Common                                |     2 +-
 src/osgEarth/CompositeTileSource                   |    37 +-
 src/osgEarth/CompositeTileSource.cpp               |   391 +-
 src/osgEarth/Config                                |     2 +-
 src/osgEarth/Config.cpp                            |    81 +-
 src/osgEarth/Containers                            |    13 +-
 src/osgEarth/Cube                                  |    11 +-
 src/osgEarth/Cube.cpp                              |    67 +-
 src/osgEarth/CullingUtils                          |    28 +-
 src/osgEarth/CullingUtils.cpp                      |    68 +-
 src/osgEarth/DPLineSegmentIntersector              |     2 +-
 src/osgEarth/DPLineSegmentIntersector.cpp          |     5 +-
 src/osgEarth/DateTime                              |    20 +-
 src/osgEarth/DateTime.cpp                          |   172 +-
 src/osgEarth/Decluttering                          |     2 +-
 src/osgEarth/Decluttering.cpp                      |     5 +-
 src/osgEarth/DepthOffset                           |    15 +-
 src/osgEarth/DepthOffset.cpp                       |   119 +-
 src/osgEarth/Draggers                              |     2 +-
 src/osgEarth/Draggers.cpp                          |     7 +-
 src/osgEarth/DrapeableNode                         |     7 +
 src/osgEarth/DrapeableNode.cpp                     |     9 +-
 src/osgEarth/DrapingTechnique                      |     2 +-
 src/osgEarth/DrapingTechnique.cpp                  |    18 +-
 src/osgEarth/DrawInstanced                         |    26 +-
 src/osgEarth/DrawInstanced.cpp                     |   200 +-
 src/osgEarth/ECEF                                  |     2 +-
 src/osgEarth/ECEF.cpp                              |     2 +-
 src/osgEarth/ElevationLOD                          |     2 +-
 src/osgEarth/ElevationLOD.cpp                      |     2 +-
 src/osgEarth/ElevationLayer                        |    35 +-
 src/osgEarth/ElevationLayer.cpp                    |   664 +-
 src/osgEarth/ElevationQuery                        |    26 +-
 src/osgEarth/ElevationQuery.cpp                    |   382 +-
 src/osgEarth/Export                                |     2 +-
 src/osgEarth/FadeEffect                            |     2 +-
 src/osgEarth/FadeEffect.cpp                        |     2 +-
 src/osgEarth/FileUtils                             |    19 +-
 src/osgEarth/FileUtils.cpp                         |   191 +-
 src/osgEarth/GeoCommon                             |    12 +-
 src/osgEarth/GeoData                               |    43 +-
 src/osgEarth/GeoData.cpp                           |    91 +-
 src/osgEarth/GeoMath                               |    30 +-
 src/osgEarth/GeoMath.cpp                           |   139 +-
 src/osgEarth/GeoTransform                          |    95 +
 src/osgEarth/GeoTransform.cpp                      |   128 +
 src/osgEarth/Geoid                                 |     2 +-
 src/osgEarth/Geoid.cpp                             |     6 +-
 src/osgEarth/HTTPClient                            |   780 +-
 src/osgEarth/HTTPClient.cpp                        |  2569 +-
 src/osgEarth/HeightFieldUtils                      |    24 +-
 src/osgEarth/HeightFieldUtils.cpp                  |    27 +-
 src/osgEarth/IOTypes                               |   502 +-
 src/osgEarth/IOTypes.cpp                           |     4 +-
 src/osgEarth/ImageLayer                            |    25 +-
 src/osgEarth/ImageLayer.cpp                        |   359 +-
 src/osgEarth/ImageMosaic                           |     2 +-
 src/osgEarth/ImageMosaic.cpp                       |     2 +-
 src/osgEarth/ImageToHeightFieldConverter           |     2 +-
 src/osgEarth/ImageToHeightFieldConverter.cpp       |     2 +-
 src/osgEarth/ImageUtils                            |    45 +-
 src/osgEarth/ImageUtils.cpp                        |   463 +-
 src/osgEarth/JsonUtils                             |     2 +-
 src/osgEarth/JsonUtils.cpp                         |     2 +-
 src/osgEarth/Layer                                 |     4 +-
 src/osgEarth/Layer.cpp                             |     2 +-
 src/osgEarth/LineFunctor                           |     2 +-
 src/osgEarth/LocalTangentPlane                     |     6 +-
 src/osgEarth/LocalTangentPlane.cpp                 |    43 +-
 src/osgEarth/Locators                              |     2 +-
 src/osgEarth/Locators.cpp                          |     2 +-
 src/osgEarth/Map                                   |    64 +-
 src/osgEarth/Map.cpp                               |    88 +-
 src/osgEarth/MapCallback                           |     2 +-
 src/osgEarth/MapCallback.cpp                       |     2 +-
 src/osgEarth/MapFrame                              |    41 +-
 src/osgEarth/MapFrame.cpp                          |   150 +-
 src/osgEarth/MapInfo                               |     2 +-
 src/osgEarth/MapInfo.cpp                           |     2 +-
 src/osgEarth/MapModelChange                        |     2 +-
 src/osgEarth/MapNode                               |    14 +-
 src/osgEarth/MapNode.cpp                           |    53 +-
 src/osgEarth/MapNodeObserver                       |     2 +-
 src/osgEarth/MapNodeOptions                        |     2 +-
 src/osgEarth/MapNodeOptions.cpp                    |     2 +-
 src/osgEarth/MapOptions                            |     6 +-
 src/osgEarth/MapOptions.cpp                        |     2 +-
 src/osgEarth/MaskLayer                             |    30 +-
 src/osgEarth/MaskLayer.cpp                         |    13 +-
 src/osgEarth/MaskNode                              |     2 +-
 src/osgEarth/MaskNode.cpp                          |     2 +-
 src/osgEarth/MaskSource                            |     9 +-
 src/osgEarth/MaskSource.cpp                        |     4 +-
 src/osgEarth/MemCache                              |    13 +-
 src/osgEarth/MemCache.cpp                          |    33 +-
 src/osgEarth/MimeTypes.cpp                         |     2 +-
 src/osgEarth/ModelLayer                            |    96 +-
 src/osgEarth/ModelLayer.cpp                        |   160 +-
 src/osgEarth/ModelSource                           |    42 +-
 src/osgEarth/ModelSource.cpp                       |    72 +-
 src/osgEarth/NodeUtils                             |    26 +-
 src/osgEarth/NodeUtils.cpp                         |     9 +-
 src/osgEarth/Notify                                |     6 +-
 src/osgEarth/Notify.cpp                            |     2 +-
 src/osgEarth/OverlayDecorator                      |     4 +-
 src/osgEarth/OverlayDecorator.cpp                  |   211 +-
 src/osgEarth/OverlayNode                           |     2 +-
 src/osgEarth/OverlayNode.cpp                       |    23 +-
 src/osgEarth/{AlphaEffect => PhongLightingEffect}  |    31 +-
 src/osgEarth/PhongLightingEffect.cpp               |   217 +
 src/osgEarth/Pickers                               |     2 +-
 src/osgEarth/Pickers.cpp                           |     2 +-
 src/osgEarth/PrimitiveIntersector                  |     6 +-
 src/osgEarth/PrimitiveIntersector.cpp              |    81 +-
 src/osgEarth/Profile                               |     6 +-
 src/osgEarth/Profile.cpp                           |   173 +-
 src/osgEarth/Progress                              |    18 +-
 src/osgEarth/Progress.cpp                          |     2 +-
 src/osgEarth/Random                                |     2 +-
 src/osgEarth/Random.cpp                            |     2 +-
 src/osgEarth/Registry                              |    78 +-
 src/osgEarth/Registry.cpp                          |   226 +-
 src/osgEarth/Revisioning                           |     2 +-
 src/osgEarth/Revisioning.cpp                       |     2 +-
 src/osgEarth/ShaderFactory                         |    61 +-
 src/osgEarth/ShaderFactory.cpp                     |   192 +-
 src/osgEarth/ShaderGenerator                       |   161 +-
 src/osgEarth/ShaderGenerator.cpp                   |   880 +-
 src/osgEarth/ShaderUtils                           |    38 +-
 src/osgEarth/ShaderUtils.cpp                       |   136 +-
 src/osgEarth/SharedSARepo                          |   120 +
 src/osgEarth/SparseTexture2DArray                  |     2 +-
 src/osgEarth/SparseTexture2DArray.cpp              |     2 +-
 src/osgEarth/SpatialReference                      |    23 +-
 src/osgEarth/SpatialReference.cpp                  |   126 +-
 src/osgEarth/StateSetCache                         |    33 +-
 src/osgEarth/StateSetCache.cpp                     |   279 +-
 src/osgEarth/StateSetLOD                           |    92 +
 src/osgEarth/StateSetLOD.cpp                       |    86 +
 src/osgEarth/StringUtils                           |    42 +-
 src/osgEarth/StringUtils.cpp                       |    47 +-
 src/osgEarth/TaskService                           |    30 +-
 src/osgEarth/TaskService.cpp                       |    95 +-
 src/osgEarth/Terrain                               |    68 +-
 src/osgEarth/Terrain.cpp                           |    40 +-
 src/osgEarth/TerrainEffect                         |     2 +-
 src/osgEarth/TerrainEngineNode                     |    38 +-
 src/osgEarth/TerrainEngineNode.cpp                 |   185 +-
 src/osgEarth/TerrainLayer                          |   114 +-
 src/osgEarth/TerrainLayer.cpp                      |   272 +-
 src/osgEarth/TerrainOptions                        |   131 +-
 src/osgEarth/TerrainOptions.cpp                    |    84 +-
 src/osgEarth/Tessellator                           |    45 +
 src/osgEarth/Tessellator.cpp                       |   401 +
 src/osgEarth/TextureCompositor                     |   253 +-
 src/osgEarth/TextureCompositor.cpp                 |   543 +-
 src/osgEarth/TextureCompositorMulti                |    75 -
 src/osgEarth/TextureCompositorMulti.cpp            |   560 -
 src/osgEarth/TextureCompositorTexArray             |    86 -
 src/osgEarth/TextureCompositorTexArray.cpp         |   476 -
 src/osgEarth/ThreadingUtils                        |     4 +-
 src/osgEarth/ThreadingUtils.cpp                    |     2 +-
 src/osgEarth/TileHandler                           |    60 +
 .../TileHandler.cpp}                               |    23 +-
 src/osgEarth/TileKey                               |    50 +-
 src/osgEarth/TileKey.cpp                           |    58 +-
 src/osgEarth/TileSource                            |   103 +-
 src/osgEarth/TileSource.cpp                        |   186 +-
 src/osgEarth/TileVisitor                           |   228 +
 src/osgEarth/TileVisitor.cpp                       |   497 +
 src/osgEarth/TimeControl                           |     2 +-
 src/osgEarth/TimeControl.cpp                       |     2 +-
 src/osgEarth/TraversalData                         |     4 +-
 src/osgEarth/TraversalData.cpp                     |    10 +-
 src/osgEarth/URI                                   |    56 +-
 src/osgEarth/URI.cpp                               |   130 +-
 src/osgEarth/Units                                 |     2 +-
 src/osgEarth/Units.cpp                             |    19 +-
 src/osgEarth/Utils                                 |    47 +-
 src/osgEarth/Utils.cpp                             |   216 +-
 src/osgEarth/Version                               |     8 +-
 src/osgEarth/Version.cpp                           |    12 +-
 src/osgEarth/VersionGit.cpp.in                     |     1 +
 src/osgEarth/VerticalDatum                         |     2 +-
 src/osgEarth/VerticalDatum.cpp                     |    30 +-
 src/osgEarth/Viewpoint                             |     2 +-
 src/osgEarth/Viewpoint.cpp                         |     2 +-
 src/osgEarth/VirtualProgram                        |   136 +-
 src/osgEarth/VirtualProgram.cpp                    |   632 +-
 src/osgEarth/XmlUtils                              |     2 +-
 src/osgEarth/XmlUtils.cpp                          |    27 +-
 src/osgEarth/optional                              |     2 +-
 src/osgEarth/tinyxml.cpp                           |    94 +-
 src/osgEarthAnnotation/AnnotationData              |     2 +-
 src/osgEarthAnnotation/AnnotationData.cpp          |     2 +-
 src/osgEarthAnnotation/AnnotationEditing           |     2 +-
 src/osgEarthAnnotation/AnnotationEditing.cpp       |     4 +-
 src/osgEarthAnnotation/AnnotationNode              |     5 +-
 src/osgEarthAnnotation/AnnotationNode.cpp          |    13 +-
 src/osgEarthAnnotation/AnnotationRegistry          |     2 +-
 src/osgEarthAnnotation/AnnotationRegistry.cpp      |     2 +-
 src/osgEarthAnnotation/AnnotationSettings          |     2 +-
 src/osgEarthAnnotation/AnnotationSettings.cpp      |     2 +-
 src/osgEarthAnnotation/AnnotationUtils             |     3 +-
 src/osgEarthAnnotation/AnnotationUtils.cpp         |    33 +-
 src/osgEarthAnnotation/CMakeLists.txt              |    18 +-
 src/osgEarthAnnotation/CircleNode                  |     2 +-
 src/osgEarthAnnotation/CircleNode.cpp              |     5 +-
 src/osgEarthAnnotation/Common                      |     2 +-
 src/osgEarthAnnotation/Decoration                  |     2 +-
 src/osgEarthAnnotation/Decoration.cpp              |     2 +-
 src/osgEarthAnnotation/EllipseNode                 |     2 +-
 src/osgEarthAnnotation/EllipseNode.cpp             |     5 +-
 src/osgEarthAnnotation/Export                      |     2 +-
 src/osgEarthAnnotation/FeatureEditing              |     2 +-
 src/osgEarthAnnotation/FeatureEditing.cpp          |     2 +-
 src/osgEarthAnnotation/FeatureNode                 |     2 +-
 src/osgEarthAnnotation/FeatureNode.cpp             |     2 +-
 src/osgEarthAnnotation/HighlightDecoration         |    22 +-
 src/osgEarthAnnotation/HighlightDecoration.cpp     |   137 +-
 src/osgEarthAnnotation/ImageOverlay                |     2 +-
 src/osgEarthAnnotation/ImageOverlay.cpp            |     6 +-
 src/osgEarthAnnotation/ImageOverlayEditor          |     2 +-
 src/osgEarthAnnotation/ImageOverlayEditor.cpp      |     2 +-
 src/osgEarthAnnotation/LabelNode                   |     4 +-
 src/osgEarthAnnotation/LabelNode.cpp               |    14 +-
 src/osgEarthAnnotation/LocalGeometryNode           |     2 +-
 src/osgEarthAnnotation/LocalGeometryNode.cpp       |     2 +-
 src/osgEarthAnnotation/LocalizedNode               |     4 +-
 src/osgEarthAnnotation/LocalizedNode.cpp           |     2 +-
 src/osgEarthAnnotation/ModelNode                   |     2 +-
 src/osgEarthAnnotation/ModelNode.cpp               |    15 +-
 src/osgEarthAnnotation/OrthoNode                   |     6 +-
 src/osgEarthAnnotation/OrthoNode.cpp               |     3 +-
 src/osgEarthAnnotation/PlaceNode                   |     4 +-
 src/osgEarthAnnotation/PlaceNode.cpp               |    30 +-
 src/osgEarthAnnotation/RectangleNode               |     2 +-
 src/osgEarthAnnotation/RectangleNode.cpp           |     2 +-
 src/osgEarthAnnotation/ScaleDecoration             |     2 +-
 src/osgEarthAnnotation/TrackNode                   |     2 +-
 src/osgEarthAnnotation/TrackNode.cpp               |    17 +-
 src/osgEarthDrivers/CMakeLists.txt                 |    30 +-
 src/osgEarthDrivers/agglite/AGGLiteOptions         |    15 +-
 .../agglite/AGGLiteRasterizerTileSource.cpp        |     6 +-
 src/osgEarthDrivers/arcgis/ArcGISOptions           |     9 +-
 src/osgEarthDrivers/arcgis/Extent.h                |     2 +-
 src/osgEarthDrivers/arcgis/MapService.cpp          |   154 +-
 src/osgEarthDrivers/arcgis/MapService.h            |     2 +-
 src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp  |    73 +-
 .../ReaderWriterArcGISMapCache.cpp                 |     5 +-
 src/osgEarthDrivers/bing/BingOptions               |     2 +-
 src/osgEarthDrivers/bing/BingTileSource.cpp        |   178 +-
 .../cache_filesystem/FileSystemCache               |     2 +-
 .../cache_filesystem/FileSystemCache.cpp           |   132 +-
 src/osgEarthDrivers/cache_leveldb/CMakeLists.txt   |    25 +
 src/osgEarthDrivers/cache_leveldb/LevelDBCache     |    77 +
 src/osgEarthDrivers/cache_leveldb/LevelDBCache.cpp |   227 +
 src/osgEarthDrivers/cache_leveldb/LevelDBCacheBin  |   138 +
 .../cache_leveldb/LevelDBCacheBin.cpp              |   668 +
 .../cache_leveldb/LevelDBCacheDriver.cpp           |    57 +
 .../cache_leveldb/LevelDBCacheOptions              |   114 +
 src/osgEarthDrivers/cache_leveldb/Tracker          |   113 +
 src/osgEarthDrivers/colorramp/CMakeLists.txt       |    15 +
 .../ColorRampOptions}                              |    59 +-
 .../colorramp/ColorRampTileSource.cpp              |   166 +
 src/osgEarthDrivers/debug/DebugOptions             |     2 +-
 src/osgEarthDrivers/debug/DebugTileSource.cpp      |     2 +-
 src/osgEarthDrivers/earth/EarthFileSerializer      |     2 +-
 src/osgEarthDrivers/earth/EarthFileSerializer1.cpp |     9 +-
 src/osgEarthDrivers/earth/EarthFileSerializer2.cpp |    14 +-
 src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp |    13 +-
 .../engine_byo/BYOTerrainEngineDriver.cpp          |     2 +-
 .../engine_byo/BYOTerrainEngineNode                |     2 +-
 .../engine_byo/BYOTerrainEngineNode.cpp            |    11 +-
 .../engine_byo/BYOTerrainEngineOptions             |     2 +-
 src/osgEarthDrivers/engine_byo/Common              |     2 +-
 src/osgEarthDrivers/engine_mp/Common               |     8 +-
 .../engine_mp/DynamicLODScaleCallback              |     6 +-
 src/osgEarthDrivers/engine_mp/FileLocationCallback |    16 +-
 src/osgEarthDrivers/engine_mp/KeyNodeFactory       |    12 +-
 src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp   |     5 +-
 src/osgEarthDrivers/engine_mp/MPGeometry           |    23 +-
 src/osgEarthDrivers/engine_mp/MPGeometry.cpp       |   411 +-
 .../engine_mp/MPTerrainEngineDriver.cpp            |   295 +-
 src/osgEarthDrivers/engine_mp/MPTerrainEngineNode  |    28 +-
 .../engine_mp/MPTerrainEngineNode.cpp              |   486 +-
 .../engine_mp/MPTerrainEngineOptions               |    33 +-
 .../engine_mp/QuickReleaseGLObjects                |    12 +-
 src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory |    24 +-
 .../engine_mp/SingleKeyNodeFactory.cpp             |   208 +-
 src/osgEarthDrivers/engine_mp/TerrainNode          |    12 +-
 src/osgEarthDrivers/engine_mp/TerrainNode.cpp      |     4 +-
 src/osgEarthDrivers/engine_mp/TileGroup            |    12 +-
 src/osgEarthDrivers/engine_mp/TileGroup.cpp        |     4 +-
 src/osgEarthDrivers/engine_mp/TileModel            |    35 +-
 src/osgEarthDrivers/engine_mp/TileModel.cpp        |   117 +-
 src/osgEarthDrivers/engine_mp/TileModelCompiler    |    19 +-
 .../engine_mp/TileModelCompiler.cpp                |  4009 +-
 src/osgEarthDrivers/engine_mp/TileModelFactory     |   157 +-
 src/osgEarthDrivers/engine_mp/TileModelFactory.cpp |   310 +-
 src/osgEarthDrivers/engine_mp/TileNode             |    13 +-
 src/osgEarthDrivers/engine_mp/TileNode.cpp         |    37 +-
 src/osgEarthDrivers/engine_mp/TileNodeRegistry     |    31 +-
 src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp |    30 +-
 src/osgEarthDrivers/engine_mp/TilePagedLOD         |    26 +-
 src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp     |    67 +-
 .../engine_osgterrain/FileLocationCallback         |     2 +-
 .../MultiPassTerrainTechnique.cpp                  |    19 -
 .../engine_osgterrain/SinglePassTerrainTechnique   |     8 -
 .../engine_quadtree/FileLocationCallback           |     2 +-
 src/osgEarthDrivers/feature_ogr/FeatureCursorOGR   |     2 +-
 .../feature_ogr/FeatureCursorOGR.cpp               |    76 +-
 .../feature_ogr/FeatureSourceOGR.cpp               |    89 +-
 src/osgEarthDrivers/feature_ogr/OGRFeatureOptions  |    14 +-
 .../feature_tfs/FeatureSourceTFS.cpp               |     4 +-
 src/osgEarthDrivers/feature_tfs/TFSFeatureOptions  |     9 +-
 .../feature_wfs/FeatureSourceWFS.cpp               |    15 +-
 src/osgEarthDrivers/feature_wfs/WFSFeatureOptions  |    22 +-
 src/osgEarthDrivers/gdal/GDALOptions               |     2 +-
 src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp      |   525 +-
 src/osgEarthDrivers/kml/KML                        |     2 +-
 src/osgEarthDrivers/kml/KMLOptions                 |     2 +-
 src/osgEarthDrivers/kml/KMLReader                  |     2 +-
 src/osgEarthDrivers/kml/KMLReader.cpp              |     2 +-
 src/osgEarthDrivers/kml/KML_Common                 |     2 +-
 src/osgEarthDrivers/kml/KML_Container              |     2 +-
 src/osgEarthDrivers/kml/KML_Document               |     2 +-
 src/osgEarthDrivers/kml/KML_Document.cpp           |     2 +-
 src/osgEarthDrivers/kml/KML_Feature                |     2 +-
 src/osgEarthDrivers/kml/KML_Feature.cpp            |     2 +-
 src/osgEarthDrivers/kml/KML_Folder                 |     2 +-
 src/osgEarthDrivers/kml/KML_Folder.cpp             |     2 +-
 src/osgEarthDrivers/kml/KML_Geometry               |     2 +-
 src/osgEarthDrivers/kml/KML_Geometry.cpp           |     2 +-
 src/osgEarthDrivers/kml/KML_GroundOverlay          |     2 +-
 src/osgEarthDrivers/kml/KML_GroundOverlay.cpp      |     2 +-
 src/osgEarthDrivers/kml/KML_IconStyle              |     2 +-
 src/osgEarthDrivers/kml/KML_IconStyle.cpp          |     2 +-
 src/osgEarthDrivers/kml/KML_LabelStyle             |     2 +-
 src/osgEarthDrivers/kml/KML_LabelStyle.cpp         |     2 +-
 src/osgEarthDrivers/kml/KML_LineString             |     2 +-
 src/osgEarthDrivers/kml/KML_LineString.cpp         |     2 +-
 src/osgEarthDrivers/kml/KML_LineStyle              |     2 +-
 src/osgEarthDrivers/kml/KML_LineStyle.cpp          |     2 +-
 src/osgEarthDrivers/kml/KML_LinearRing             |     2 +-
 src/osgEarthDrivers/kml/KML_LinearRing.cpp         |     2 +-
 src/osgEarthDrivers/kml/KML_Model                  |     2 +-
 src/osgEarthDrivers/kml/KML_Model.cpp              |     2 +-
 src/osgEarthDrivers/kml/KML_MultiGeometry          |     2 +-
 src/osgEarthDrivers/kml/KML_MultiGeometry.cpp      |     2 +-
 src/osgEarthDrivers/kml/KML_NetworkLink.cpp        |    10 +-
 src/osgEarthDrivers/kml/KML_NetworkLinkControl     |     2 +-
 src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp |     2 +-
 src/osgEarthDrivers/kml/KML_Object                 |     2 +-
 src/osgEarthDrivers/kml/KML_Object.cpp             |     2 +-
 src/osgEarthDrivers/kml/KML_Overlay                |     2 +-
 src/osgEarthDrivers/kml/KML_Overlay.cpp            |     2 +-
 src/osgEarthDrivers/kml/KML_PhotoOverlay           |     2 +-
 src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp       |     2 +-
 src/osgEarthDrivers/kml/KML_Placemark.cpp          |    34 +-
 src/osgEarthDrivers/kml/KML_Point                  |     2 +-
 src/osgEarthDrivers/kml/KML_Point.cpp              |     2 +-
 src/osgEarthDrivers/kml/KML_PolyStyle              |     2 +-
 src/osgEarthDrivers/kml/KML_PolyStyle.cpp          |    58 +-
 src/osgEarthDrivers/kml/KML_Polygon                |     2 +-
 src/osgEarthDrivers/kml/KML_Polygon.cpp            |     2 +-
 src/osgEarthDrivers/kml/KML_Root                   |     2 +-
 src/osgEarthDrivers/kml/KML_Root.cpp               |     2 +-
 src/osgEarthDrivers/kml/KML_Schema                 |     2 +-
 src/osgEarthDrivers/kml/KML_Schema.cpp             |     2 +-
 src/osgEarthDrivers/kml/KML_ScreenOverlay          |     2 +-
 src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp      |     2 +-
 src/osgEarthDrivers/kml/KML_Style                  |     2 +-
 src/osgEarthDrivers/kml/KML_Style.cpp              |     2 +-
 src/osgEarthDrivers/kml/KML_StyleMap               |     2 +-
 src/osgEarthDrivers/kml/KML_StyleMap.cpp           |     2 +-
 src/osgEarthDrivers/kml/KML_StyleSelector          |     2 +-
 src/osgEarthDrivers/kml/KMZArchive                 |     2 +-
 src/osgEarthDrivers/kml/KMZArchive.cpp             |     2 +-
 src/osgEarthDrivers/kml/ReaderWriterKML.cpp        |     2 +-
 .../label_annotation/AnnotationLabelSource.cpp     |    24 +-
 .../label_overlay/OverlayLabelSource.cpp           |    27 +-
 .../mask_feature/FeatureMaskOptions                |     2 +-
 .../mask_feature/FeatureMaskSource.cpp             |    39 +-
 src/osgEarthDrivers/mbtiles/CMakeLists.txt         |     4 +-
 src/osgEarthDrivers/mbtiles/MBTilesOptions         |    41 +-
 src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp      |    61 +
 src/osgEarthDrivers/mbtiles/MBTilesTileSource      |    88 +
 src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp  |   596 +
 .../mbtiles/ReaderWriterMBTiles.cpp                |   310 -
 .../model_feature_geom/FeatureGeomModelOptions     |     2 +-
 .../model_feature_geom/FeatureGeomModelSource.cpp  |     2 +-
 .../FeatureStencilModelOptions                     |     2 +-
 .../FeatureStencilModelSource.cpp                  |     2 +-
 .../model_simple/SimpleModelOptions                |    11 +-
 .../model_simple/SimpleModelSource.cpp             |    91 +-
 src/osgEarthDrivers/noise/CMakeLists.txt           |    10 +-
 src/osgEarthDrivers/noise/NoiseDriver.cpp          |   321 +
 src/osgEarthDrivers/noise/NoiseOptions             |    25 +-
 src/osgEarthDrivers/noise/ReaderWriterNoise.cpp    |   318 -
 src/osgEarthDrivers/ocean_simple/CMakeLists.txt    |    25 +
 .../ElevationProxyImageLayer                       |    25 +-
 .../ocean_simple/ElevationProxyImageLayer.cpp      |    88 +
 .../ocean_simple/SimpleOceanDriver.cpp             |    67 +
 .../SimpleOceanNode}                               |    63 +-
 .../ocean_simple/SimpleOceanNode.cpp               |   275 +
 .../SimpleOceanOptions}                            |    87 +-
 .../SimpleOceanShaders}                            |    61 +-
 src/osgEarthDrivers/ocean_surface/CMakeLists.txt   |    22 -
 .../ocean_surface/ElevationProxyImageLayer.cpp     |    76 -
 src/osgEarthDrivers/ocean_surface/OceanCompositor  |    60 -
 .../ocean_surface/OceanCompositor.cpp              |   130 -
 .../ocean_surface/OceanSurfaceContainer.cpp        |   184 -
 .../ocean_surface/ReaderWriterOceanSurface.cpp     |    88 -
 src/osgEarthDrivers/ocean_triton/CMakeLists.txt    |    30 +
 src/osgEarthDrivers/ocean_triton/TritonContext     |    82 +
 src/osgEarthDrivers/ocean_triton/TritonContext.cpp |   141 +
 src/osgEarthDrivers/ocean_triton/TritonDrawable    |    80 +
 .../ocean_triton/TritonDrawable.cpp                |   535 +
 src/osgEarthDrivers/ocean_triton/TritonDriver.cpp  |    96 +
 src/osgEarthDrivers/ocean_triton/TritonNode        |    64 +
 src/osgEarthDrivers/ocean_triton/TritonNode.cpp    |    86 +
 src/osgEarthDrivers/ocean_triton/TritonOptions     |    88 +
 src/osgEarthDrivers/osg/OSGOptions                 |     2 +-
 src/osgEarthDrivers/osg/OSGTileSource.cpp          |    38 +-
 .../refresh/ReaderWriterRefresh.cpp                |     2 +-
 src/osgEarthDrivers/refresh/RefreshOptions         |     2 +-
 .../script_engine_duktape/CMakeLists.txt           |    42 +
 .../script_engine_duktape/DuktapeEngine            |    72 +
 .../script_engine_duktape/DuktapeEngine.cpp        |   277 +
 .../script_engine_duktape/JSGeometry               |   180 +
 .../script_engine_duktape/Plugin.cpp               |    59 +
 .../script_engine_duktape/duktape.c                | 65023 +++++++++++++++++++
 .../script_engine_duktape/duktape.h                |  3668 ++
 .../script_engine_v8/CMakeLists.txt                |     2 +-
 .../script_engine_v8/JSWrappers.cpp                |     4 +-
 .../script_engine_v8/JavascriptEngineV8            |     5 +-
 .../script_engine_v8/JavascriptEngineV8.cpp        |    62 +-
 src/osgEarthDrivers/sky_gl/CMakeLists.txt          |    22 +
 src/osgEarthDrivers/sky_gl/GLSkyDriver.cpp         |    62 +
 src/osgEarthDrivers/sky_gl/GLSkyNode               |    72 +
 src/osgEarthDrivers/sky_gl/GLSkyNode.cpp           |   146 +
 .../{yahoo/YahooOptions => sky_gl/GLSkyOptions}    |    47 +-
 src/osgEarthDrivers/sky_gl/GLSkyShaders            |   128 +
 .../sky_silverlining/CMakeLists.txt                |    32 +
 .../sky_silverlining/SilverLiningCloudsDrawable    |    62 +
 .../SilverLiningCloudsDrawable.cpp                 |    65 +
 .../sky_silverlining/SilverLiningContext           |   106 +
 .../sky_silverlining/SilverLiningContext.cpp       |   225 +
 .../sky_silverlining/SilverLiningDriver.cpp        |    84 +
 .../sky_silverlining/SilverLiningNode              |    68 +
 .../sky_silverlining/SilverLiningNode.cpp          |   164 +
 .../sky_silverlining/SilverLiningOptions           |   104 +
 .../sky_silverlining/SilverLiningSkyDrawable       |    58 +
 .../sky_silverlining/SilverLiningSkyDrawable.cpp   |   110 +
 src/osgEarthDrivers/sky_simple/CMakeLists.txt      |    22 +
 src/osgEarthDrivers/sky_simple/SimpleSkyDriver.cpp |    63 +
 src/osgEarthDrivers/sky_simple/SimpleSkyNode       |   122 +
 src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp   |   808 +
 src/osgEarthDrivers/sky_simple/SimpleSkyOptions    |    90 +
 src/osgEarthDrivers/sky_simple/SimpleSkyShaders    |   684 +
 src/osgEarthDrivers/splat_mask/CMakeLists.txt      |    14 +
 src/osgEarthDrivers/splat_mask/SplatMaskDriver.cpp |   205 +
 .../SplatMaskOptions}                              |    62 +-
 .../template_matclass/CMakeLists.txt               |    16 +
 .../template_matclass/TemplateMatClassDriver.cpp   |   163 +
 .../template_matclass/TemplateMatClassOptions      |    83 +
 .../tilecache/ReaderWriterTileCache.cpp            |     5 +-
 src/osgEarthDrivers/tilecache/TileCacheOptions     |     2 +-
 .../tileindex/ReaderWriterTileIndex.cpp            |     4 +-
 src/osgEarthDrivers/tileindex/TileIndexOptions     |     2 +-
 .../tileservice/ReaderWriterTileService.cpp        |     5 +-
 src/osgEarthDrivers/tileservice/TileServiceOptions |     2 +-
 src/osgEarthDrivers/tms/CMakeLists.txt             |     6 +-
 src/osgEarthDrivers/tms/ReaderWriterTMS.cpp        |   241 -
 src/osgEarthDrivers/tms/TMSOptions                 |     2 +-
 src/osgEarthDrivers/tms/TMSPlugin.cpp              |    66 +
 src/osgEarthDrivers/tms/TMSTileSource              |    82 +
 src/osgEarthDrivers/tms/TMSTileSource.cpp          |   310 +
 src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp     |     8 +-
 src/osgEarthDrivers/vdatum_egm2008/EGM2008Grid.h   |     2 +-
 src/osgEarthDrivers/vdatum_egm84/EGM84.cpp         |     8 +-
 src/osgEarthDrivers/vdatum_egm84/EGM84Grid.h       |     2 +-
 src/osgEarthDrivers/vdatum_egm96/EGM96.cpp         |    12 +-
 src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h       |     2 +-
 src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp        |   134 +-
 src/osgEarthDrivers/vpb/VPBOptions                 |     2 +-
 src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp        |     2 +-
 src/osgEarthDrivers/wcs/WCS11Source.cpp            |    16 +-
 src/osgEarthDrivers/wcs/WCS11Source.h              |     2 +-
 src/osgEarthDrivers/wcs/WCSOptions                 |     2 +-
 src/osgEarthDrivers/wms/ReaderWriterWMS.cpp        |    22 +-
 src/osgEarthDrivers/wms/TileService                |     2 +-
 src/osgEarthDrivers/wms/TileService.cpp            |     2 +-
 src/osgEarthDrivers/wms/WMSOptions                 |     2 +-
 src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp        |    12 +-
 src/osgEarthDrivers/xyz/XYZOptions                 |     2 +-
 src/osgEarthDrivers/yahoo/ReaderWriterYahoo.cpp    |     4 +-
 src/osgEarthDrivers/yahoo/YahooOptions             |     2 +-
 src/osgEarthFeatures/AltitudeFilter                |     2 +-
 src/osgEarthFeatures/AltitudeFilter.cpp            |    21 +-
 src/osgEarthFeatures/BufferFilter                  |     2 +-
 src/osgEarthFeatures/BufferFilter.cpp              |     2 +-
 src/osgEarthFeatures/BuildGeometryFilter           |    14 +-
 src/osgEarthFeatures/BuildGeometryFilter.cpp       |   470 +-
 src/osgEarthFeatures/BuildTextFilter               |     2 +-
 src/osgEarthFeatures/BuildTextFilter.cpp           |     8 +-
 src/osgEarthFeatures/BuildTextOperator             |     2 +-
 src/osgEarthFeatures/BuildTextOperator.cpp         |     2 +-
 src/osgEarthFeatures/CMakeLists.txt                |     4 +-
 src/osgEarthFeatures/CentroidFilter                |     2 +-
 src/osgEarthFeatures/CentroidFilter.cpp            |     2 +-
 src/osgEarthFeatures/Common                        |     2 +-
 src/osgEarthFeatures/ConvertTypeFilter             |     2 +-
 src/osgEarthFeatures/ConvertTypeFilter.cpp         |     2 +-
 src/osgEarthFeatures/CropFilter                    |     2 +-
 src/osgEarthFeatures/CropFilter.cpp                |     2 +-
 src/osgEarthFeatures/ExtrudeGeometryFilter         |    90 +-
 src/osgEarthFeatures/ExtrudeGeometryFilter.cpp     |   949 +-
 src/osgEarthFeatures/Feature                       |     4 +-
 src/osgEarthFeatures/Feature.cpp                   |    12 +-
 src/osgEarthFeatures/FeatureCursor                 |     2 +-
 src/osgEarthFeatures/FeatureCursor.cpp             |     4 +-
 src/osgEarthFeatures/FeatureDisplayLayout          |     2 +-
 src/osgEarthFeatures/FeatureDisplayLayout.cpp      |     2 +-
 src/osgEarthFeatures/FeatureDrawSet                |     2 +-
 src/osgEarthFeatures/FeatureDrawSet.cpp            |     2 +-
 src/osgEarthFeatures/FeatureListSource             |     2 +-
 src/osgEarthFeatures/FeatureListSource.cpp         |     2 +-
 src/osgEarthFeatures/FeatureModelGraph             |    25 +-
 src/osgEarthFeatures/FeatureModelGraph.cpp         |   170 +-
 src/osgEarthFeatures/FeatureModelSource            |     7 +-
 src/osgEarthFeatures/FeatureModelSource.cpp        |    52 +-
 src/osgEarthFeatures/FeatureSource                 |     2 +-
 src/osgEarthFeatures/FeatureSource.cpp             |     2 +-
 src/osgEarthFeatures/FeatureSourceIndexNode        |     2 +-
 src/osgEarthFeatures/FeatureSourceIndexNode.cpp    |     2 +-
 src/osgEarthFeatures/FeatureTileSource             |     2 +-
 src/osgEarthFeatures/FeatureTileSource.cpp         |    20 +-
 src/osgEarthFeatures/Filter                        |     6 +-
 src/osgEarthFeatures/Filter.cpp                    |    76 +-
 src/osgEarthFeatures/FilterContext                 |     8 +-
 src/osgEarthFeatures/FilterContext.cpp             |    20 +-
 src/osgEarthFeatures/GeometryCompiler              |    27 +-
 src/osgEarthFeatures/GeometryCompiler.cpp          |   130 +-
 src/osgEarthFeatures/GeometryUtils                 |    14 +-
 src/osgEarthFeatures/GeometryUtils.cpp             |    25 +-
 src/osgEarthFeatures/LabelSource                   |     2 +-
 src/osgEarthFeatures/LabelSource.cpp               |     3 +-
 src/osgEarthFeatures/MeshClamper                   |     2 +-
 src/osgEarthFeatures/MeshClamper.cpp               |     2 +-
 src/osgEarthFeatures/OgrUtils                      |     8 +-
 src/osgEarthFeatures/OgrUtils.cpp                  |    32 +-
 src/osgEarthFeatures/OptimizerHints                |     2 +-
 src/osgEarthFeatures/OptimizerHints.cpp            |     2 +-
 src/osgEarthFeatures/PolygonizeLines               |     4 +-
 src/osgEarthFeatures/PolygonizeLines.cpp           |    85 +-
 src/osgEarthFeatures/ResampleFilter                |     2 +-
 src/osgEarthFeatures/ResampleFilter.cpp            |     2 +-
 src/osgEarthFeatures/ScaleFilter                   |     2 +-
 src/osgEarthFeatures/ScaleFilter.cpp               |     2 +-
 src/osgEarthFeatures/ScatterFilter                 |     2 +-
 src/osgEarthFeatures/ScatterFilter.cpp             |     2 +-
 src/osgEarthFeatures/Script                        |     2 +-
 src/osgEarthFeatures/ScriptEngine                  |    36 +-
 src/osgEarthFeatures/ScriptEngine.cpp              |    19 +-
 src/osgEarthFeatures/Session                       |    11 +-
 src/osgEarthFeatures/Session.cpp                   |    51 +-
 src/osgEarthFeatures/SubstituteModelFilter         |     2 +-
 src/osgEarthFeatures/SubstituteModelFilter.cpp     |    62 +-
 src/osgEarthFeatures/TessellateOperator            |     2 +-
 src/osgEarthFeatures/TessellateOperator.cpp        |     3 +-
 src/osgEarthFeatures/TextSymbolizer                |     2 +-
 src/osgEarthFeatures/TextSymbolizer.cpp            |    15 +-
 src/osgEarthFeatures/TransformFilter               |     2 +-
 src/osgEarthFeatures/TransformFilter.cpp           |     8 +-
 src/osgEarthFeatures/VirtualFeatureSource          |     2 +-
 src/osgEarthFeatures/VirtualFeatureSource.cpp      |     2 +-
 src/osgEarthQt/Actions                             |     2 +-
 src/osgEarthQt/AnnotationDialogs                   |     2 +-
 src/osgEarthQt/AnnotationDialogs.cpp               |     2 +-
 src/osgEarthQt/AnnotationListWidget                |     2 +-
 src/osgEarthQt/AnnotationListWidget.cpp            |     5 +-
 src/osgEarthQt/AnnotationToolbar                   |     2 +-
 src/osgEarthQt/AnnotationToolbar.cpp               |     2 +-
 src/osgEarthQt/CMakeLists.txt                      |    31 +-
 src/osgEarthQt/CollapsiblePairWidget               |     2 +-
 src/osgEarthQt/CollapsiblePairWidget.cpp           |     2 +-
 src/osgEarthQt/Common                              |     2 +-
 src/osgEarthQt/DataManager                         |     2 +-
 src/osgEarthQt/DataManager.cpp                     |     2 +-
 src/osgEarthQt/GuiActions                          |     2 +-
 src/osgEarthQt/LOSControlWidget                    |     2 +-
 src/osgEarthQt/LOSControlWidget.cpp                |     2 +-
 src/osgEarthQt/LOSCreationDialog                   |     2 +-
 src/osgEarthQt/LOSCreationDialog.cpp               |     2 +-
 src/osgEarthQt/LayerManagerWidget                  |     3 +-
 src/osgEarthQt/LayerManagerWidget.cpp              |     5 +-
 src/osgEarthQt/MapCatalogWidget                    |     2 +-
 src/osgEarthQt/MapCatalogWidget.cpp                |     4 +-
 src/osgEarthQt/TerrainProfileGraph                 |    11 +-
 src/osgEarthQt/TerrainProfileGraph.cpp             |    89 +-
 src/osgEarthQt/TerrainProfileWidget                |     9 +-
 src/osgEarthQt/TerrainProfileWidget.cpp            |    49 +-
 src/osgEarthQt/ViewWidget                          |     2 +-
 src/osgEarthQt/ViewWidget.cpp                      |     5 +-
 src/osgEarthQt/ViewerWidget                        |     2 +-
 src/osgEarthQt/ViewerWidget.cpp                    |     4 +-
 src/osgEarthQt/images.qrc                          |     1 +
 src/osgEarthQt/images/copy.png                     |   Bin 0 -> 341 bytes
 src/osgEarthSymbology/AltitudeSymbol               |     2 +-
 src/osgEarthSymbology/AltitudeSymbol.cpp           |    10 +-
 src/osgEarthSymbology/Color                        |     2 +-
 src/osgEarthSymbology/Color.cpp                    |     5 +-
 src/osgEarthSymbology/Common                       |     2 +-
 src/osgEarthSymbology/CssUtils                     |     2 +-
 src/osgEarthSymbology/CssUtils.cpp                 |     2 +-
 src/osgEarthSymbology/Expression                   |     2 +-
 src/osgEarthSymbology/Expression.cpp               |     2 +-
 src/osgEarthSymbology/ExtrusionSymbol              |     2 +-
 src/osgEarthSymbology/ExtrusionSymbol.cpp          |     5 +-
 src/osgEarthSymbology/Fill                         |     2 +-
 src/osgEarthSymbology/Fill.cpp                     |     2 +-
 src/osgEarthSymbology/GEOS                         |    15 +-
 src/osgEarthSymbology/GEOS.cpp                     |   318 +-
 src/osgEarthSymbology/Geometry                     |     2 +-
 src/osgEarthSymbology/Geometry.cpp                 |   103 +-
 src/osgEarthSymbology/GeometryFactory              |     2 +-
 src/osgEarthSymbology/GeometryFactory.cpp          |    15 +-
 src/osgEarthSymbology/GeometryRasterizer           |     2 +-
 src/osgEarthSymbology/GeometryRasterizer.cpp       |     2 +-
 src/osgEarthSymbology/IconResource                 |     2 +-
 src/osgEarthSymbology/IconResource.cpp             |     5 +-
 src/osgEarthSymbology/IconSymbol                   |     2 +-
 src/osgEarthSymbology/IconSymbol.cpp               |     5 +-
 src/osgEarthSymbology/InstanceResource             |     2 +-
 src/osgEarthSymbology/InstanceResource.cpp         |     2 +-
 src/osgEarthSymbology/InstanceSymbol               |    15 +-
 src/osgEarthSymbology/InstanceSymbol.cpp           |    14 +-
 src/osgEarthSymbology/LineSymbol                   |     7 +-
 src/osgEarthSymbology/LineSymbol.cpp               |    13 +-
 src/osgEarthSymbology/MarkerResource               |     2 +-
 src/osgEarthSymbology/MarkerResource.cpp           |    15 +-
 src/osgEarthSymbology/MarkerSymbol                 |     2 +-
 src/osgEarthSymbology/MarkerSymbol.cpp             |     5 +-
 src/osgEarthSymbology/MeshConsolidator             |     2 +-
 src/osgEarthSymbology/MeshConsolidator.cpp         |   159 +-
 src/osgEarthSymbology/MeshSubdivider               |     2 +-
 src/osgEarthSymbology/MeshSubdivider.cpp           |   110 +-
 src/osgEarthSymbology/ModelResource                |     2 +-
 src/osgEarthSymbology/ModelResource.cpp            |    27 +-
 src/osgEarthSymbology/ModelSymbol                  |     3 +-
 src/osgEarthSymbology/ModelSymbol.cpp              |    10 +-
 src/osgEarthSymbology/PointSymbol                  |     2 +-
 src/osgEarthSymbology/PointSymbol.cpp              |     8 +-
 src/osgEarthSymbology/PolygonSymbol                |     2 +-
 src/osgEarthSymbology/PolygonSymbol.cpp            |     5 +-
 src/osgEarthSymbology/Query                        |     2 +-
 src/osgEarthSymbology/Query.cpp                    |     2 +-
 src/osgEarthSymbology/RenderSymbol                 |    20 +-
 src/osgEarthSymbology/RenderSymbol.cpp             |    22 +-
 src/osgEarthSymbology/Resource                     |     2 +-
 src/osgEarthSymbology/Resource.cpp                 |     2 +-
 src/osgEarthSymbology/ResourceCache                |    53 +-
 src/osgEarthSymbology/ResourceCache.cpp            |   174 +-
 src/osgEarthSymbology/ResourceLibrary              |    13 +-
 src/osgEarthSymbology/ResourceLibrary.cpp          |    25 +-
 src/osgEarthSymbology/Skins                        |    81 +-
 src/osgEarthSymbology/Skins.cpp                    |   159 +-
 src/osgEarthSymbology/StencilVolumeNode            |     2 +-
 src/osgEarthSymbology/StencilVolumeNode.cpp        |     2 +-
 src/osgEarthSymbology/Stroke                       |     2 +-
 src/osgEarthSymbology/Stroke.cpp                   |    18 +-
 src/osgEarthSymbology/Style                        |     5 +-
 src/osgEarthSymbology/Style.cpp                    |     2 +-
 src/osgEarthSymbology/StyleSelector                |     2 +-
 src/osgEarthSymbology/StyleSelector.cpp            |     2 +-
 src/osgEarthSymbology/StyleSheet                   |    16 +-
 src/osgEarthSymbology/StyleSheet.cpp               |    33 +-
 src/osgEarthSymbology/Symbol                       |    14 +-
 src/osgEarthSymbology/Symbol.cpp                   |    20 +-
 src/osgEarthSymbology/Tags                         |     6 +-
 src/osgEarthSymbology/TextSymbol                   |     8 +-
 src/osgEarthSymbology/TextSymbol.cpp               |    11 +-
 .../{Formatter => ActivityMonitorTool}             |    33 +-
 src/osgEarthUtil/ActivityMonitorTool.cpp           |    58 +
 src/osgEarthUtil/AnnotationEvents                  |     2 +-
 src/osgEarthUtil/AnnotationEvents.cpp              |    23 +-
 src/osgEarthUtil/ArcGIS                            |     4 +-
 src/osgEarthUtil/ArcGIS.cpp                        |     2 +-
 src/osgEarthUtil/AtlasBuilder                      |    83 +
 src/osgEarthUtil/AtlasBuilder.cpp                  |   324 +
 src/osgEarthUtil/AutoClipPlaneHandler              |     2 +-
 src/osgEarthUtil/AutoClipPlaneHandler.cpp          |     2 +-
 src/osgEarthUtil/BrightnessContrastColorFilter     |     2 +-
 src/osgEarthUtil/BrightnessContrastColorFilter.cpp |     2 +-
 src/osgEarthUtil/CMYKColorFilter                   |     2 +-
 src/osgEarthUtil/CMYKColorFilter.cpp               |     2 +-
 src/osgEarthUtil/CMakeLists.txt                    |    35 +-
 src/osgEarthUtil/ChromaKeyColorFilter              |     2 +-
 src/osgEarthUtil/ChromaKeyColorFilter.cpp          |     2 +-
 src/osgEarthUtil/ClampCallback                     |     2 +-
 src/osgEarthUtil/ClampCallback.cpp                 |     2 +-
 src/osgEarthUtil/Common                            |     2 +-
 src/osgEarthUtil/Controls                          |    58 +-
 src/osgEarthUtil/Controls.cpp                      |   326 +-
 src/osgEarthUtil/DataScanner                       |     2 +-
 src/osgEarthUtil/DataScanner.cpp                   |     2 +-
 src/osgEarthUtil/DateTime                          |     3 +-
 src/osgEarthUtil/DetailTexture                     |    62 +-
 src/osgEarthUtil/DetailTexture.cpp                 |   378 +-
 src/osgEarthUtil/EarthManipulator                  |    73 +-
 src/osgEarthUtil/EarthManipulator.cpp              |   496 +-
 src/osgEarthUtil/Ephemeris                         |    60 +
 src/osgEarthUtil/Ephemeris.cpp                     |   322 +
 src/osgEarthUtil/ExampleResources                  |    22 +-
 src/osgEarthUtil/ExampleResources.cpp              |   302 +-
 src/osgEarthUtil/Export                            |     2 +-
 src/osgEarthUtil/FeatureManipTool                  |     2 +-
 src/osgEarthUtil/FeatureManipTool.cpp              |     3 +-
 src/osgEarthUtil/FeatureQueryTool                  |     2 +-
 src/osgEarthUtil/FeatureQueryTool.cpp              |    29 +-
 src/{osgEarth/AlphaEffect => osgEarthUtil/Fog}     |    60 +-
 src/osgEarthUtil/Fog.cpp                           |    98 +
 src/osgEarthUtil/Formatter                         |     2 +-
 src/osgEarthUtil/GLSLColorFilter                   |    18 +-
 src/osgEarthUtil/GLSLColorFilter.cpp               |    50 +-
 src/osgEarthUtil/GammaColorFilter                  |     2 +-
 src/osgEarthUtil/GammaColorFilter.cpp              |     2 +-
 src/osgEarthUtil/GeodeticGraticule                 |     2 +-
 src/osgEarthUtil/GeodeticGraticule.cpp             |     2 +-
 src/osgEarthUtil/HSLColorFilter                    |     2 +-
 src/osgEarthUtil/HSLColorFilter.cpp                |     2 +-
 src/osgEarthUtil/HTM                               |     2 +-
 src/osgEarthUtil/HTM.cpp                           |     2 +-
 src/osgEarthUtil/LODBlending                       |    10 +
 src/osgEarthUtil/LODBlending.cpp                   |   137 +-
 src/osgEarthUtil/LatLongFormatter                  |     2 +-
 src/osgEarthUtil/LatLongFormatter.cpp              |     8 +-
 src/osgEarthUtil/LineOfSight                       |     2 +-
 src/osgEarthUtil/LinearLineOfSight                 |     2 +-
 src/osgEarthUtil/LinearLineOfSight.cpp             |     2 +-
 src/osgEarthUtil/LogarithmicDepthBuffer            |    62 +
 src/osgEarthUtil/LogarithmicDepthBuffer.cpp        |   175 +
 src/osgEarthUtil/MGRSFormatter                     |     2 +-
 src/osgEarthUtil/MGRSFormatter.cpp                 |     2 +-
 src/osgEarthUtil/MGRSGraticule                     |     2 +-
 src/osgEarthUtil/MGRSGraticule.cpp                 |    23 +-
 src/osgEarthUtil/MeasureTool                       |     2 +-
 src/osgEarthUtil/MeasureTool.cpp                   |     2 +-
 src/osgEarthUtil/MouseCoordsTool                   |     2 +-
 src/osgEarthUtil/MouseCoordsTool.cpp               |    21 +-
 src/osgEarthUtil/Ocean                             |   123 +
 src/osgEarthUtil/Ocean.cpp                         |   196 +
 src/osgEarthUtil/PolyhedralLineOfSight             |     2 +-
 src/osgEarthUtil/PolyhedralLineOfSight.cpp         |     2 +-
 src/osgEarthUtil/RGBColorFilter                    |     2 +-
 src/osgEarthUtil/RGBColorFilter.cpp                |     2 +-
 src/osgEarthUtil/RadialLineOfSight                 |     2 +-
 src/osgEarthUtil/RadialLineOfSight.cpp             |     2 +-
 src/osgEarthUtil/ShadowUtils                       |    37 -
 src/osgEarthUtil/ShadowUtils.cpp                   |   207 -
 src/osgEarthUtil/Shadowing                         |   129 +
 src/osgEarthUtil/Shadowing.cpp                     |   381 +
 src/osgEarthUtil/SimplexNoise                      |   159 +
 src/osgEarthUtil/SimplexNoise.cpp                  |   556 +
 src/osgEarthUtil/Sky                               |   220 +
 src/osgEarthUtil/Sky.cpp                           |   204 +
 src/osgEarthUtil/SkyNode                           |   221 -
 src/osgEarthUtil/SkyNode.cpp                       |  1593 -
 src/osgEarthUtil/SpatialData                       |     2 +-
 src/osgEarthUtil/SpatialData.cpp                   |     2 +-
 src/osgEarthUtil/StarData                          |     2 +-
 src/osgEarthUtil/TFS                               |     4 +-
 src/osgEarthUtil/TFS.cpp                           |     2 +-
 src/osgEarthUtil/TFSPackager                       |     2 +-
 src/osgEarthUtil/TFSPackager.cpp                   |     5 +-
 src/osgEarthUtil/TMS                               |     4 +-
 src/osgEarthUtil/TMS.cpp                           |  1551 +-
 src/osgEarthUtil/TMSBackFiller                     |     2 +-
 src/osgEarthUtil/TMSBackFiller.cpp                 |     7 +-
 src/osgEarthUtil/TMSPackager                       |   350 +-
 src/osgEarthUtil/TMSPackager.cpp                   |  1043 +-
 src/osgEarthUtil/TerrainProfile                    |    19 +-
 src/osgEarthUtil/TerrainProfile.cpp                |    90 +-
 src/osgEarthUtil/TextureSplatter                   |   121 +
 src/osgEarthUtil/TextureSplatter.cpp               |   362 +
 src/osgEarthUtil/TileIndex                         |     2 +-
 src/osgEarthUtil/TileIndex.cpp                     |     2 +-
 src/osgEarthUtil/TileIndexBuilder                  |     2 +-
 src/osgEarthUtil/TileIndexBuilder.cpp              |     5 +-
 src/osgEarthUtil/UTMGraticule                      |    15 +-
 src/osgEarthUtil/UTMGraticule.cpp                  |    51 +-
 src/osgEarthUtil/WFS                               |     4 +-
 src/osgEarthUtil/WFS.cpp                           |     2 +-
 src/osgEarthUtil/WMS                               |     4 +-
 src/osgEarthUtil/WMS.cpp                           |     2 +-
 tests/annotation.earth                             |    26 +-
 tests/bing.earth                                   |    12 +-
 tests/boston.earth                                 |    92 +-
 tests/{boston.earth => boston_projected.earth}     |   103 +-
 tests/colorramp.earth                              |    20 +
 tests/datum_override.earth                         |     6 +-
 tests/feature_custom_filters.earth                 |     6 +-
 tests/feature_draped_lines.earth                   |     6 +-
 tests/feature_draped_polygons.earth                |    16 +-
 tests/feature_extrude.earth                        |    26 +-
 tests/feature_geom.earth                           |    10 +-
 tests/feature_labels.earth                         |     8 +-
 ...re_labels.earth => feature_labels_script.earth} |    12 +-
 tests/feature_levels_and_selectors.earth           |    94 +
 tests/feature_model_scatter.earth                  |    11 +-
 tests/feature_models.earth                         |    14 +-
 tests/feature_multilod.earth                       |    62 -
 tests/feature_population_cylinders.earth           |    91 +
 tests/feature_scripted_styling_2.earth             |     6 +-
 tests/feature_scripting.earth                      |    80 -
 tests/feature_stencil_line_draping.earth           |    46 -
 tests/feature_stencil_polygon_draping.earth        |   103 -
 tests/feature_tfs.earth                            |    10 +-
 tests/feature_tfs_scripting.earth                  |     8 +-
 tests/fractal_detail.earth                         |     8 +-
 tests/gdal_tiff.earth                              |     2 +-
 tests/glsl_filter.earth                            |    23 +-
 tests/layer_opacity.earth                          |    15 +-
 tests/lod_blending.earth                           |    17 +-
 tests/min_max_level.earth                          |    23 +-
 tests/noise.earth                                  |    13 +-
 tests/normalmap.earth                              |     2 +-
 tests/readymap.earth                               |     6 +-
 tests/silverlining.earth                           |    28 +
 tests/splat.earth                                  |   118 +
 tests/srtm.earth                                   |    18 -
 tests/stamen_toner.earth                           |    15 +
 tests/stamen_watercolor.earth                      |    15 +
 tests/triton.earth                                 |    36 +
 tests/vpb_with_inset.earth                         |    25 -
 tests/wms-t_nexrad_animated.earth                  |     7 -
 tests/yahoo_aerial.earth                           |    20 -
 tests/yahoo_maps.earth                             |    20 -
 1015 files changed, 110307 insertions(+), 21979 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osgearth.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to