Merge pull request #10762 from rouault/GDALDoublePointsCache

Fix build issue of external code including gdal_priv.h with MSVC (master only)
OSGeo · Sep 11, 2024 · 1e48b77 · 1e48b77
2 parents 912dcf2 + 515fbf0
commit 1e48b77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gcore/gdal_priv.h b/gcore/gdal_priv.h
@@ -1625,7 +1625,7 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
     void InitRWLock();
     void SetValidPercent(GUIntBig nSampleCount, GUIntBig nValidCount);
 
-    mutable std::unique_ptr<GDALDoublePointsCache> m_oPointsCache{};
+    mutable GDALDoublePointsCache *m_poPointsCache = nullptr;
 
     //! @endcond
 

diff --git a/gcore/gdalrasterband.cpp b/gcore/gdalrasterband.cpp
@@ -107,6 +107,8 @@ GDALRasterBand::~GDALRasterBand()
 
     InvalidateMaskBand();
     nBand = -nBand;
+
+    delete m_poPointsCache;
 }
 
 /************************************************************************/
@@ -9398,11 +9400,11 @@ CPLErr GDALRasterBand::InterpolateAtPoint(double dfPixel, double dfLine,
     }
 
     GDALRasterBand *pBand = const_cast<GDALRasterBand *>(this);
-    if (!m_oPointsCache)
-        m_oPointsCache = std::make_unique<GDALDoublePointsCache>();
+    if (!m_poPointsCache)
+        m_poPointsCache = new GDALDoublePointsCache();
 
     const bool res =
-        GDALInterpolateAtPoint(pBand, eInterpolation, m_oPointsCache->cache,
+        GDALInterpolateAtPoint(pBand, eInterpolation, m_poPointsCache->cache,
                                dfPixel, dfLine, pdfRealValue, pdfImagValue);
 
     return res ? CE_None : CE_Failure;