GeoHeightField: underlying heightfield should be const to prevent cac…

…he corruption
zjdyzww · Oct 23, 2018 · e8b6ba8 · e8b6ba8
1 parent 3dd9319
commit e8b6ba8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 38 deletions.
diff --git a/src/osgEarth/ElevationLayer.cpp b/src/osgEarth/ElevationLayer.cpp
@@ -650,14 +650,7 @@ ElevationLayer::createHeightField(const TileKey&    key,
         return GeoHeightField::INVALID;
     }
 
-    // write to mem cache if needed:
-    if ( result.valid() && !fromMemCache && _memCache.valid() )
-    {
-        CacheBin* bin = _memCache->getOrCreateDefaultBin();
-        bin->write(cacheKey, result.getHeightField(), 0L);
-    }
-
-    // post-processing:
+    // post-processing -- must be done before caching because it may alter the heightfield data
     if ( result.valid() )
     {
         if ( options().noDataPolicy() == NODATA_MSL )
@@ -677,13 +670,20 @@ ElevationLayer::createHeightField(const TileKey&    key,
             }
 
             HeightFieldUtils::resolveInvalidHeights(
-                result.getHeightField(),
+                hf.get(),
                 result.getExtent(),
                 NO_DATA_VALUE,
                 geoid );
         }
     }
 
+    // write to mem cache if needed:
+    if ( result.valid() && !fromMemCache && _memCache.valid() )
+    {
+        CacheBin* bin = _memCache->getOrCreateDefaultBin();
+        bin->write(cacheKey, result.getHeightField(), 0L);
+    }
+
     return result;
 }
 

diff --git a/src/osgEarth/GeoData b/src/osgEarth/GeoData
@@ -826,16 +826,9 @@ namespace osgEarth
          * Gets a pointer to the underlying OSG heightfield.
          */
         const osg::HeightField* getHeightField() const;
-        osg::HeightField* getHeightField();
 
         //! Normal map
         const NormalMap* getNormalMap() const;
-        NormalMap* getNormalMap();
-
-        /**
-         * Gets a pointer to the underlying OSG heightfield, and releases the internal reference.
-         */
-        osg::HeightField* takeHeightField();
 
         /**
          * Gets the X interval of this GeoHeightField

diff --git a/src/osgEarth/GeoData.cpp b/src/osgEarth/GeoData.cpp
@@ -2664,24 +2664,6 @@ GeoHeightField::getHeightField() const
     return _heightField.get();
 }
 
-osg::HeightField*
-GeoHeightField::getHeightField() 
-{
-    return _heightField.get();
-}
-
-osg::HeightField*
-GeoHeightField::takeHeightField()
-{
-    return _heightField.release();
-}
-
-NormalMap*
-GeoHeightField::getNormalMap()
-{
-    return _normalMap.get();
-}
-
 const NormalMap*
 GeoHeightField::getNormalMap() const
 {

diff --git a/src/osgEarth/TileSource b/src/osgEarth/TileSource
@@ -269,7 +269,7 @@ namespace osgEarth
          * image with one 32-bit channel and call storeImage.)
          */
         virtual bool storeHeightField(const TileKey&    key,
-                                      osg::HeightField* hf,
+                                      const osg::HeightField* hf,
                                       ProgressCallback* progress);
 
     public:

diff --git a/src/osgEarth/TileSource.cpp b/src/osgEarth/TileSource.cpp
@@ -413,8 +413,8 @@ TileSource::createHeightField(const TileKey&        key,
 
 bool
 TileSource::storeHeightField(const TileKey&     key,
-                             osg::HeightField*  hf,
-                              ProgressCallback* progress)
+                             const osg::HeightField*  hf,
+                             ProgressCallback* progress)
 {
     if (getStatus().isError() || hf == 0L )
         return 0L;

diff --git a/src/osgEarthDrivers/colorramp/ColorRampTileSource.cpp b/src/osgEarthDrivers/colorramp/ColorRampTileSource.cpp
@@ -106,7 +106,7 @@ class ColorRampTileSource : public TileSource
         GeoHeightField geoHF = _layer->createHeightField(key, progress);
         if (geoHF.valid())
         {
-            osg::HeightField* hf = geoHF.getHeightField(); 
+            const osg::HeightField* hf = geoHF.getHeightField(); 
             osg::Image* image = new osg::Image();
             image->allocateImage(hf->getNumColumns(),hf->getNumRows(),1, GL_RGBA, GL_UNSIGNED_BYTE);
             memset(image->data(), 0, image->getImageSizeInBytes());