@cpp.js/package-gdal 1.0.0-beta.20 → 1.0.0-beta.21

package/dist/prebuilt/Android-arm64-v8a/include/vrtdataset.h

@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VIRTUALDATASET_H_INCLUDED
@@ -41,15 +25,18 @@
 #include "gdal_vrt.h"
 #include "gdal_rat.h"
 
+#include <atomic>
+#include <deque>
 #include <functional>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <vector>
 
 CPLErr GDALRegisterDefaultPixelFunc();
 void GDALVRTRegisterDefaultProcessedDatasetFuncs();
-CPLString VRTSerializeNoData(double dfVal, GDALDataType eDataType,
-                             int nPrecision);
+CPLString CPL_DLL VRTSerializeNoData(double dfVal, GDALDataType eDataType,
+                                     int nPrecision);
 
 #if 0
 int VRTWarpedOverviewTransform( void *pTransformArg, int bDstToSrc,
@@ -103,6 +90,37 @@ class VRTOverviewInfo
     }
 };
 
+/************************************************************************/
+/*                            VRTMapSharedResources                     */
+/************************************************************************/
+
+/** Map of shared datasets */
+class CPL_DLL VRTMapSharedResources
+{
+  public:
+    VRTMapSharedResources() = default;
+
+    /** Return a dataset from its key */
+    GDALDataset *Get(const std::string &osKey) const;
+
+    /** Inserts a dataset. It must be kept alive while this
+     * VRTMapSharedResources is alive.
+     */
+    void Insert(const std::string &osKey, GDALDataset *poDS);
+
+    /** To be called before any attempt at using this instance in a
+     * multi-threaded context.
+     */
+    void InitMutex();
+
+  private:
+    std::mutex oMutex{};
+    std::mutex *poMutex = nullptr;
+    std::map<std::string, GDALDataset *> oMap{};
+
+    CPL_DISALLOW_COPY_ASSIGN(VRTMapSharedResources)
+};
+
 /************************************************************************/
 /*                              VRTSource                               */
 /************************************************************************/
@@ -159,36 +177,40 @@ class CPL_DLL VRTSource
                                 void *pProgressData) = 0;
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) = 0;
+                           VRTMapSharedResources &) = 0;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) = 0;
 
     virtual void GetFileList(char ***ppapszFileList, int *pnSize,
                              int *pnMaxSize, CPLHashSet *hSetFiles);
 
-    virtual int IsSimpleSource()
+    /** Returns whether this instance can be cast to a VRTSimpleSource
+     * (and its subclasses).
+     */
+    virtual bool IsSimpleSource() const
     {
-        return FALSE;
+        return false;
     }
 
+    /** Returns a string with the VRTSource class type.
+     * This method must be implemented in all subclasses
+     */
+    virtual const char *GetType() const = 0;
+
     virtual CPLErr FlushCache(bool /*bAtClosing*/)
     {
         return CE_None;
     }
 };
 
-typedef VRTSource *(*VRTSourceParser)(
-    const CPLXMLNode *, const char *,
-    std::map<CPLString, GDALDataset *> &oMapSharedSources);
+typedef VRTSource *(*VRTSourceParser)(const CPLXMLNode *, const char *,
+                                      VRTMapSharedResources &oMapSharedSources);
 
-VRTSource *
-VRTParseCoreSources(const CPLXMLNode *psTree, const char *,
-                    std::map<CPLString, GDALDataset *> &oMapSharedSources);
-VRTSource *
-VRTParseFilterSources(const CPLXMLNode *psTree, const char *,
-                      std::map<CPLString, GDALDataset *> &oMapSharedSources);
-VRTSource *
-VRTParseArraySource(const CPLXMLNode *psTree, const char *,
-                    std::map<CPLString, GDALDataset *> &oMapSharedSources);
+VRTSource *VRTParseCoreSources(const CPLXMLNode *psTree, const char *,
+                               VRTMapSharedResources &oMapSharedSources);
+VRTSource *VRTParseFilterSources(const CPLXMLNode *psTree, const char *,
+                                 VRTMapSharedResources &oMapSharedSources);
+VRTSource *VRTParseArraySource(const CPLXMLNode *psTree, const char *,
+                               VRTMapSharedResources &oMapSharedSources);
 
 /************************************************************************/
 /*                              VRTDataset                              */
@@ -205,6 +227,7 @@ class VRTWarpedDataset;
 class VRTPansharpenedDataset;
 class VRTProcessedDataset;
 class VRTGroup;
+class VRTSimpleSource;
 
 class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 {
@@ -229,8 +252,8 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 
     VRTRasterBand *m_poMaskBand = nullptr;
 
-    int m_bCompatibleForDatasetIO = -1;
-    int CheckCompatibleForDatasetIO();
+    mutable int m_nCompatibleForDatasetIO = -1;
+    bool CheckCompatibleForDatasetIO() const;
 
     // Virtual (ie not materialized) overviews, created either implicitly
     // when it is cheap to do it, or explicitly.
@@ -242,11 +265,23 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 
     char **m_papszXMLVRTMetadata = nullptr;
 
-    std::map<CPLString, GDALDataset *> m_oMapSharedSources{};
+    VRTMapSharedResources m_oMapSharedSources{};
     std::shared_ptr<VRTGroup> m_poRootGroup{};
 
+    // Used by VRTSourcedRasterBand::IRasterIO() in single-threaded situations
     VRTSource::WorkingState m_oWorkingState{};
 
+    // Used by VRTSourcedRasterBand::IRasterIO() when using multi-threading
+    struct QueueWorkingStates
+    {
+        std::mutex oMutex{};
+        std::vector<std::unique_ptr<VRTSource::WorkingState>> oStates{};
+    };
+
+    QueueWorkingStates m_oQueueWorkingStates{};
+
+    bool m_bMultiThreadedRasterIOLastUsed = false;
+
     static constexpr const char *const apszSpecialSyntax[] = {
         "NITF_IM:{ANY}:{FILENAME}", "PDF:{ANY}:{FILENAME}",
         "RASTERLITE:{FILENAME},{ANY}", "TILEDB:\"{FILENAME}\":{ANY}",
@@ -261,6 +296,34 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
                            GDALDataset *&poSrcDataset, int &nSrcXOff,
                            int &nSrcYOff);
 
+    /** Structure used to declare a threaded job to satisfy IRasterIO()
+     * on a given source.
+     */
+    struct RasterIOJob
+    {
+        std::atomic<int> *pnCompletedJobs = nullptr;
+        std::atomic<bool> *pbSuccess = nullptr;
+
+        GDALDataType eVRTBandDataType = GDT_Unknown;
+        int nXOff = 0;
+        int nYOff = 0;
+        int nXSize = 0;
+        int nYSize = 0;
+        void *pData = nullptr;
+        int nBufXSize = 0;
+        int nBufYSize = 0;
+        int nBandCount = 0;
+        BANDMAP_TYPE panBandMap = nullptr;
+        GDALDataType eBufType = GDT_Unknown;
+        GSpacing nPixelSpace = 0;
+        GSpacing nLineSpace = 0;
+        GSpacing nBandSpace = 0;
+        GDALRasterIOExtraArg *psExtraArg = nullptr;
+        VRTSimpleSource *poSource = nullptr;
+
+        static void Func(void *pData);
+    };
+
     CPL_DISALLOW_COPY_ASSIGN(VRTDataset)
 
   protected:
@@ -311,6 +374,8 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
                                    const char *pszDomain = "") override;
 
     virtual char **GetMetadata(const char *pszDomain = "") override;
+    virtual const char *GetMetadataItem(const char *pszName,
+                                        const char *pszDomain = "") override;
 
     virtual int GetGCPCount() override;
 
@@ -332,7 +397,7 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
     virtual CPLErr IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                              int nXSize, int nYSize, void *pData, int nBufXSize,
                              int nBufYSize, GDALDataType eBufType,
-                             int nBandCount, int *panBandMap,
+                             int nBandCount, BANDMAP_TYPE panBandMap,
                              GSpacing nPixelSpace, GSpacing nLineSpace,
                              GSpacing nBandSpace,
                              GDALRasterIOExtraArg *psExtraArg) override;
@@ -362,6 +427,12 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 
     void ClearStatistics() override;
 
+    /** To be called when a new source is added, to invalidate cached states. */
+    void SourceAdded()
+    {
+        m_nCompatibleForDatasetIO = -1;
+    }
+
     /* Used by PDF driver for example */
     GDALDataset *GetSingleSimpleSource();
     void BuildVirtualOverviews();
@@ -399,6 +470,8 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
     static std::string BuildSourceFilename(const char *pszFilename,
                                            const char *pszVRTPath,
                                            bool bRelativeToVRT);
+
+    static int GetNumThreads(GDALDataset *poDS);
 };
 
 /************************************************************************/
@@ -412,10 +485,16 @@ class CPL_DLL VRTWarpedDataset final : public VRTDataset
 {
     GDALWarpOperation *m_poWarper;
 
-    int m_nOverviewCount;
-    VRTWarpedDataset **m_papoOverviews;
+    bool m_bIsOverview = false;
+    std::vector<VRTWarpedDataset *> m_apoOverviews{};
     int m_nSrcOvrLevel;
 
+    bool GetOverviewSize(GDALDataset *poSrcDS, int iOvr, int iSrcOvr,
+                         int &nOvrXSize, int &nOvrYSize, double &dfSrcRatioX,
+                         double &dfSrcRatioY) const;
+    int GetOverviewCount() const;
+    int GetSrcOverviewLevel(int iOvr, bool &bThisLevelOnlyOut) const;
+    VRTWarpedDataset *CreateImplicitOverview(int iOvr) const;
     void CreateImplicitOverviews();
 
     friend class VRTWarpedRasterBand;
@@ -452,7 +531,7 @@ class CPL_DLL VRTWarpedDataset final : public VRTDataset
     virtual CPLErr IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                              int nXSize, int nYSize, void *pData, int nBufXSize,
                              int nBufYSize, GDALDataType eBufType,
-                             int nBandCount, int *panBandMap,
+                             int nBandCount, BANDMAP_TYPE panBandMap,
                              GSpacing nPixelSpace, GSpacing nLineSpace,
                              GSpacing nBandSpace,
                              GDALRasterIOExtraArg *psExtraArg) override;
@@ -527,7 +606,7 @@ class VRTPansharpenedDataset final : public VRTDataset
     virtual CPLErr IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                              int nXSize, int nYSize, void *pData, int nBufXSize,
                              int nBufYSize, GDALDataType eBufType,
-                             int nBandCount, int *panBandMap,
+                             int nBandCount, BANDMAP_TYPE panBandMap,
                              GSpacing nPixelSpace, GSpacing nLineSpace,
                              GSpacing nBandSpace,
                              GDALRasterIOExtraArg *psExtraArg) override;
@@ -725,7 +804,7 @@ class CPL_DLL VRTRasterBand CPL_NON_FINAL : public GDALRasterBand
     virtual ~VRTRasterBand();
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &);
+                           VRTMapSharedResources &);
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage);
@@ -831,6 +910,32 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
     bool IsMosaicOfNonOverlappingSimpleSourcesOfFullRasterNoResAndTypeChange(
         bool bAllowMaxValAdjustment) const;
 
+    /** Structure used to declare a threaded job to satisfy IRasterIO()
+     * on a given source.
+     */
+    struct RasterIOJob
+    {
+        std::atomic<int> *pnCompletedJobs = nullptr;
+        std::atomic<bool> *pbSuccess = nullptr;
+        VRTDataset::QueueWorkingStates *poQueueWorkingStates = nullptr;
+
+        GDALDataType eVRTBandDataType = GDT_Unknown;
+        int nXOff = 0;
+        int nYOff = 0;
+        int nXSize = 0;
+        int nYSize = 0;
+        void *pData = nullptr;
+        int nBufXSize = 0;
+        int nBufYSize = 0;
+        GDALDataType eBufType = GDT_Unknown;
+        GSpacing nPixelSpace = 0;
+        GSpacing nLineSpace = 0;
+        GDALRasterIOExtraArg *psExtraArg = nullptr;
+        VRTSimpleSource *poSource = nullptr;
+
+        static void Func(void *pData);
+    };
+
     CPL_DISALLOW_COPY_ASSIGN(VRTSourcedRasterBand)
 
   protected:
@@ -868,7 +973,7 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
                                    const char *pszDomain = "") override;
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage) override;
@@ -944,6 +1049,10 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
         GDALRWFlag eRWFlag, int nXOff, int nYOff, int nXSize, int nYSize,
         int nBufXSize, int nBufYSize, GDALRasterIOExtraArg *psExtraArg) const;
 
+    bool CanMultiThreadRasterIO(double dfXOff, double dfYOff, double dfXSize,
+                                double dfYSize,
+                                int &nContributingSources) const;
+
     virtual CPLErr IReadBlock(int, int, void *) override;
 
     virtual void GetFileList(char ***ppapszFileList, int *pnSize,
@@ -989,6 +1098,10 @@ class CPL_DLL VRTWarpedRasterBand final : public VRTRasterBand
   private:
     int m_nIRasterIOCounter =
         0;  //! Protects against infinite recursion inside IRasterIO()
+
+    int GetBestOverviewLevel(int &nXOff, int &nYOff, int &nXSize, int &nYSize,
+                             int nBufXSize, int nBufYSize,
+                             GDALRasterIOExtraArg *psExtraArg) const;
 };
 
 /************************************************************************/
@@ -1107,7 +1220,7 @@ class CPL_DLL VRTDerivedRasterBand CPL_NON_FINAL : public VRTSourcedRasterBand
     void SetPixelFunctionLanguage(const char *pszLanguage);
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage) override;
@@ -1150,7 +1263,7 @@ class CPL_DLL VRTRawRasterBand CPL_NON_FINAL : public VRTRasterBand
     virtual ~VRTRawRasterBand();
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage) override;
@@ -1199,9 +1312,8 @@ class VRTDriver final : public GDALDriver
     virtual CPLErr SetMetadata(char **papszMetadata,
                                const char *pszDomain = "") override;
 
-    VRTSource *
-    ParseSource(const CPLXMLNode *psSrc, const char *pszVRTPath,
-                std::map<CPLString, GDALDataset *> &oMapSharedSources);
+    VRTSource *ParseSource(const CPLXMLNode *psSrc, const char *pszVRTPath,
+                           VRTMapSharedResources &oMapSharedSources);
     void AddSourceParser(const char *pszElementName, VRTSourceParser pfnParser);
 };
 
@@ -1215,7 +1327,7 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
 
   private:
     // Owned by the VRTDataset
-    std::map<CPLString, GDALDataset *> *m_poMapSharedSources = nullptr;
+    VRTMapSharedResources *m_poMapSharedSources = nullptr;
 
     mutable GDALRasterBand *m_poRasterBand = nullptr;
 
@@ -1302,7 +1414,7 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     virtual ~VRTSimpleSource();
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
     CPLErr ParseSrcRectAndDstRect(const CPLXMLNode *psSrc);
@@ -1312,7 +1424,9 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     void SetSrcMaskBand(GDALRasterBand *);
     void SetSrcWindow(double, double, double, double);
     void SetDstWindow(double, double, double, double);
-    void GetDstWindow(double &, double &, double &, double &);
+    void GetDstWindow(double &, double &, double &, double &) const;
+    bool DstWindowIntersects(double dfXOff, double dfYOff, double dfXSize,
+                             double dfYSize) const;
 
     const std::string &GetSourceDatasetName() const
     {
@@ -1353,25 +1467,27 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     virtual void GetFileList(char ***ppapszFileList, int *pnSize,
                              int *pnMaxSize, CPLHashSet *hSetFiles) override;
 
-    virtual int IsSimpleSource() override
+    bool IsSimpleSource() const override
     {
-        return TRUE;
+        return true;
     }
 
-    virtual const char *GetType()
-    {
-        return "SimpleSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTSimpleSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
     GDALRasterBand *GetRasterBand() const;
     GDALRasterBand *GetMaskBandMainBand();
-    int IsSameExceptBandNumber(VRTSimpleSource *poOtherSource);
+    bool IsSameExceptBandNumber(const VRTSimpleSource *poOtherSource) const;
     CPLErr DatasetRasterIO(GDALDataType eVRTBandDataType, int nXOff, int nYOff,
                            int nXSize, int nYSize, void *pData, int nBufXSize,
                            int nBufYSize, GDALDataType eBufType, int nBandCount,
-                           int *panBandMap, GSpacing nPixelSpace,
+                           const int *panBandMap, GSpacing nPixelSpace,
                            GSpacing nLineSpace, GSpacing nBandSpace,
                            GDALRasterIOExtraArg *psExtraArg);
 
@@ -1415,10 +1531,12 @@ class VRTAveragedSource final : public VRTSimpleSource
 
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
-    virtual const char *GetType() override
-    {
-        return "AveragedSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTAveragedSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 };
 
 /************************************************************************/
@@ -1457,13 +1575,15 @@ class VRTNoDataFromMaskSource final : public VRTSimpleSource
                        double dfRemappedValue);
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
-    virtual const char *GetType() override
-    {
-        return "VRTNoDataFromMaskSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTNoDataFromMaskSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 };
 
 /************************************************************************/
@@ -1550,12 +1670,14 @@ class CPL_DLL VRTComplexSource CPL_NON_FINAL : public VRTSimpleSource
 
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
 
-    virtual const char *GetType() override
-    {
-        return "ComplexSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTComplexSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 
     bool AreValuesUnchanged() const;
 
@@ -1598,6 +1720,8 @@ class VRTFilteredSource CPL_NON_FINAL : public VRTComplexSource
     VRTFilteredSource();
     virtual ~VRTFilteredSource();
 
+    const char *GetType() const override = 0;
+
     void SetExtraEdgePixels(int);
     void SetFilteringDataTypesSupported(int, GDALDataType *);
 
@@ -1621,27 +1745,27 @@ class VRTKernelFilteredSource CPL_NON_FINAL : public VRTFilteredSource
     CPL_DISALLOW_COPY_ASSIGN(VRTKernelFilteredSource)
 
   protected:
-    int m_nKernelSize;
-
-    bool m_bSeparable;
-
-    double *m_padfKernelCoefs;
-
-    int m_bNormalized;
+    int m_nKernelSize = 0;
+    bool m_bSeparable = false;
+    // m_nKernelSize elements if m_bSeparable, m_nKernelSize * m_nKernelSize otherwise
+    std::vector<double> m_adfKernelCoefs{};
+    bool m_bNormalized = false;
 
   public:
     VRTKernelFilteredSource();
-    virtual ~VRTKernelFilteredSource();
+
+    const char *GetType() const override;
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
     virtual CPLErr FilterData(int nXSize, int nYSize, GDALDataType eType,
                               GByte *pabySrcData, GByte *pabyDstData) override;
 
-    CPLErr SetKernel(int nKernelSize, bool bSeparable, double *padfCoefs);
-    void SetNormalized(int);
+    CPLErr SetKernel(int nKernelSize, bool bSeparable,
+                     const std::vector<double> &adfNewCoefs);
+    void SetNormalized(bool);
 };
 
 /************************************************************************/
@@ -1656,8 +1780,10 @@ class VRTAverageFilteredSource final : public VRTKernelFilteredSource
     explicit VRTAverageFilteredSource(int nKernelSize);
     virtual ~VRTAverageFilteredSource();
 
+    const char *GetType() const override;
+
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 };
 
@@ -1673,7 +1799,7 @@ class VRTFuncSource final : public VRTSource
     virtual ~VRTFuncSource();
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override
+                           VRTMapSharedResources &) override
     {
         return CE_Failure;
     }
@@ -1695,6 +1821,8 @@ class VRTFuncSource final : public VRTSource
                                 int bApproxOK, GDALProgressFunc pfnProgress,
                                 void *pProgressData) override;
 
+    const char *GetType() const override;
+
     VRTImageReadFunc pfnReadFunc;
     void *pCBData;
     GDALDataType eType;

package/dist/prebuilt/Android-arm64-v8a/lib/cmake/gdal/GDALConfigVersion.cmake

@@ -10,13 +10,13 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "3.9.2")
+set(PACKAGE_VERSION "3.10.0")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("3.9.2" MATCHES "^([0-9]+)\\.([0-9]+)")
+  if("3.10.0" MATCHES "^([0-9]+)\\.([0-9]+)")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
 
@@ -27,7 +27,7 @@ else()
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "3.9.2")
+    set(CVF_VERSION_MAJOR "3.10.0")
     set(CVF_VERSION_MINOR "")
   endif()
 

package/dist/prebuilt/Android-arm64-v8a/lib/gdalplugins/drivers.ini

@@ -12,8 +12,9 @@
 
 [order]
 VRT
-GTI
 Derived
+GTI
+SNAP_TIFF
 GTiff
 COG
 NITF
@@ -164,6 +165,7 @@ DAAS
 NULL
 SIGDEM
 EXR
+AVIF
 HEIF
 TGA
 OGCAPI
@@ -263,6 +265,7 @@ GTFS
 PMTiles
 JSONFG
 MiraMonVector
+XODR
 
 # Put TIGER and AVCBIN at end since they need poOpenInfo->GetSiblingFiles()
 Tiger

package/dist/prebuilt/Android-arm64-v8a/lib/pkgconfig/gdal.pc

@@ -1,4 +1,4 @@
-CONFIG_VERSION=3.9.2
+CONFIG_VERSION=3.10.0
 CONFIG_INST_PREFIX=/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-arm64-v8a
 CONFIG_INST_LIBS=-L/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-arm64-v8a/lib -lgdal
 CONFIG_INST_CFLAGS=-I/tmp/cppjs/live/packages/cppjs-package-gdal/.cppjs/build/Source-Release/prebuilt/Android-arm64-v8a/include

package/dist/prebuilt/Android-arm64-v8a/share/gdal/gdaltileindex.xsd

@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2023, Even Rouault
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">