Vicar: embed vicar.json if EMBED_RESOURCE_FILES

Author: rouault

frmts/pds/CMakeLists.txt

@@ -14,11 +14,12 @@ add_gdal_driver(
   NO_SHARED_SYMBOL_WITH_CORE
 )
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/vicar.json
-)
+
 if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
-    list(APPEND GDAL_DATA_FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pds4_template.xml)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/vicar.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/pds4_template.xml
+    )
 endif()
 
 set_property(

frmts/pds/embedded_resources.c

@@ -11,3 +11,12 @@ const char *PDS4GetEmbeddedTemplate()
 {
     return szPDS4Template;
 }
+
+static const char szVICARJson[] = {
+#embed "data/vicar.json"
+    , 0};
+
+const char *VICARGetEmbeddedConf(void)
+{
+    return szVICARJson;
+}

frmts/pds/embedded_resources.h

@@ -6,5 +6,6 @@
 CPL_C_START
 
 const char *PDS4GetEmbeddedTemplate(void);
+const char *VICARGetEmbeddedConf(void);
 
 CPL_C_END

frmts/pds/vicardataset.cpp

@@ -40,6 +40,10 @@ constexpr double VICAR_NULL3 = -32768.0;
 #include <limits>
 #include <string>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
 /* GeoTIFF 1.0 geokeys */
 
@@ -2645,7 +2649,20 @@ GDALDataset *VICARDataset::Open(GDALOpenInfo *poOpenInfo)
     if (nNBB != 0)
     {
         const char *pszBLType = poDS->GetKeyword("BLTYPE", nullptr);
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszVicarConf = nullptr;
+#else
         const char *pszVicarConf = CPLFindFile("gdal", "vicar.json");
+#endif
+        CPLJSONDocument oDoc;
+        if (!pszVicarConf || EQUAL(pszVicarConf, "vicar.json"))
+        {
+#ifdef EMBED_RESOURCE_FILES
+            oDoc.LoadMemory(VICARGetEmbeddedConf());
+            pszVicarConf = "__embedded__";
+#endif
+        }
+
         if (pszBLType && pszVicarConf && poDS->m_nRecordSize > 0)
         {
 
@@ -2687,8 +2704,7 @@ GDALDataset *VICARDataset::Open(GDALOpenInfo *poOpenInfo)
                          "BREALFMT=%s layout not supported.", value);
             }
 
-            CPLJSONDocument oDoc;
-            if (oDoc.Load(pszVicarConf))
+            if (EQUAL(pszVicarConf, "__embedded__") || oDoc.Load(pszVicarConf))
             {
                 const auto oRoot = oDoc.GetRoot();
                 if (oRoot.GetType() == CPLJSONObject::Type::Object)