From 48e4a28711dcc1559a0ed5fe0bdc3086431614ac Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2024 13:07:20 +0100
Subject: [PATCH 01/21] /vsicurl/: fix to allow to read Parquet partitionned
 datasets from public Azure container using /vsicurl/

Fixes #11309
---
 autotest/ogr/ogr_parquet.py |  21 +++++++
 port/cpl_vsil_curl.cpp      | 112 ++++++++++++++++++++++--------------
 port/cpl_vsil_curl_class.h  |   1 +
 3 files changed, 91 insertions(+), 43 deletions(-)

diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
index 912ca56c34e3..add20d7952d0 100755
--- a/autotest/ogr/ogr_parquet.py
+++ b/autotest/ogr/ogr_parquet.py
@@ -3355,6 +3355,27 @@ def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata(use_dataset):
 ###############################################################################
 
 
+@gdaltest.enable_exceptions()
+@pytest.mark.require_curl
+def test_ogr_parquet_overture_from_azure():
+
+    if not _has_arrow_dataset():
+        pytest.skip("Test requires build with ArrowDataset")
+
+    url = "https://overturemapswestus2.blob.core.windows.net/release?comp=list&delimiter=%2F&prefix=2024-11-13.0%2Ftheme%3Ddivisions%2Ftype%3Ddivision_area%2F&restype=container"
+    if gdaltest.gdalurlopen(url, timeout=5) is None:
+        pytest.skip(reason=f"{url} is down")
+
+    with ogr.Open(
+        "PARQUET:/vsicurl/https://overturemapswestus2.blob.core.windows.net/release/2024-11-13.0/theme=divisions/type=division_area"
+    ) as ds:
+        lyr = ds.GetLayer(0)
+        assert lyr.GetFeatureCount() > 0
+
+
+###############################################################################
+
+
 @gdaltest.enable_exceptions()
 def test_ogr_parquet_write_arrow(tmp_vsimem):
 
diff --git a/port/cpl_vsil_curl.cpp b/port/cpl_vsil_curl.cpp
index 6899cf6af6bd..afdc67bb8982 100644
--- a/port/cpl_vsil_curl.cpp
+++ b/port/cpl_vsil_curl.cpp
@@ -1348,49 +1348,6 @@ vsi_l_offset VSICurlHandle::GetFileSizeOrHeaders(bool bSetError,
         if (sWriteFuncHeaderData.pBuffer != nullptr &&
             (response_code == 200 || response_code == 206))
         {
-            const char *pzETag =
-                strstr(sWriteFuncHeaderData.pBuffer, "ETag: \"");
-            if (pzETag)
-            {
-                pzETag += strlen("ETag: \"");
-                const char *pszEndOfETag = strchr(pzETag, '"');
-                if (pszEndOfETag)
-                {
-                    oFileProp.ETag.assign(pzETag, pszEndOfETag - pzETag);
-                }
-            }
-
-            // Azure Data Lake Storage
-            const char *pszPermissions =
-                strstr(sWriteFuncHeaderData.pBuffer, "x-ms-permissions: ");
-            if (pszPermissions)
-            {
-                pszPermissions += strlen("x-ms-permissions: ");
-                const char *pszEOL = strstr(pszPermissions, "\r\n");
-                if (pszEOL)
-                {
-                    bool bIsDir =
-                        strstr(sWriteFuncHeaderData.pBuffer,
-                               "x-ms-resource-type: directory\r\n") != nullptr;
-                    bool bIsFile =
-                        strstr(sWriteFuncHeaderData.pBuffer,
-                               "x-ms-resource-type: file\r\n") != nullptr;
-                    if (bIsDir || bIsFile)
-                    {
-                        oFileProp.bIsDirectory = bIsDir;
-                        std::string osPermissions;
-                        osPermissions.assign(pszPermissions,
-                                             pszEOL - pszPermissions);
-                        if (bIsDir)
-                            oFileProp.nMode = S_IFDIR;
-                        else
-                            oFileProp.nMode = S_IFREG;
-                        oFileProp.nMode |=
-                            VSICurlParseUnixPermissions(osPermissions.c_str());
-                    }
-                }
-            }
-
             {
                 char **papszHeaders =
                     CSLTokenizeString2(sWriteFuncHeaderData.pBuffer, "\r\n", 0);
@@ -1412,6 +1369,44 @@ vsi_l_offset VSICurlHandle::GetFileSizeOrHeaders(bool bSetError,
                         {
                             m_bCached = false;
                         }
+
+                        else if (EQUAL(pszKey, "ETag"))
+                        {
+                            std::string osValue(pszValue);
+                            if (osValue.size() >= 2 && osValue.front() == '"' &&
+                                osValue.back() == '"')
+                                osValue = osValue.substr(1, osValue.size() - 2);
+                            oFileProp.ETag = osValue;
+                        }
+
+                        // Azure Data Lake Storage
+                        else if (EQUAL(pszKey, "x-ms-resource-type"))
+                        {
+                            if (EQUAL(pszValue, "file"))
+                            {
+                                oFileProp.nMode |= S_IFREG;
+                            }
+                            else if (EQUAL(pszValue, "directory"))
+                            {
+                                oFileProp.bIsDirectory = true;
+                                oFileProp.nMode |= S_IFDIR;
+                            }
+                        }
+                        else if (EQUAL(pszKey, "x-ms-permissions"))
+                        {
+                            oFileProp.nMode |=
+                                VSICurlParseUnixPermissions(pszValue);
+                        }
+
+                        // https://overturemapswestus2.blob.core.windows.net/release/2024-11-13.0/theme%3Ddivisions/type%3Ddivision_area
+                        // returns a x-ms-meta-hdi_isfolder: true header
+                        else if (EQUAL(pszKey, "x-ms-meta-hdi_isfolder") &&
+                                 EQUAL(pszValue, "true"))
+                        {
+                            oFileProp.bIsAzureFolder = true;
+                            oFileProp.bIsDirectory = true;
+                            oFileProp.nMode |= S_IFDIR;
+                        }
                     }
                     CPLFree(pszKey);
                 }
@@ -4893,6 +4888,37 @@ char **VSICurlFilesystemHandlerBase::GetFileList(const char *pszDirname,
     if (!bListDir)
         return nullptr;
 
+    // Deal with publicly visible Azure directories.
+    if (STARTS_WITH(osURL.c_str(), "https://"))
+    {
+        const char *pszBlobCore =
+            strstr(osURL.c_str(), ".blob.core.windows.net/");
+        if (pszBlobCore)
+        {
+            FileProp cachedFileProp;
+            GetCachedFileProp(osURL.c_str(), cachedFileProp);
+            if (cachedFileProp.bIsAzureFolder)
+            {
+                const char *pszURLWithoutHTTPS =
+                    osURL.c_str() + strlen("https://");
+                const std::string osStorageAccount(
+                    pszURLWithoutHTTPS, pszBlobCore - pszURLWithoutHTTPS);
+                CPLConfigOptionSetter oSetter1("AZURE_NO_SIGN_REQUEST", "YES",
+                                               false);
+                CPLConfigOptionSetter oSetter2("AZURE_STORAGE_ACCOUNT",
+                                               osStorageAccount.c_str(), false);
+                const std::string osVSIAZ(std::string("/vsiaz/").append(
+                    pszBlobCore + strlen(".blob.core.windows.net/")));
+                char **papszFileList = VSIReadDirEx(osVSIAZ.c_str(), nMaxFiles);
+                if (papszFileList)
+                {
+                    *pbGotFileList = true;
+                    return papszFileList;
+                }
+            }
+        }
+    }
+
     // HACK (optimization in fact) for MBTiles driver.
     if (strstr(pszDirname, ".tiles.mapbox.com") != nullptr)
         return nullptr;
diff --git a/port/cpl_vsil_curl_class.h b/port/cpl_vsil_curl_class.h
index 4fb1e4ff9bce..6b47050dd638 100644
--- a/port/cpl_vsil_curl_class.h
+++ b/port/cpl_vsil_curl_class.h
@@ -80,6 +80,7 @@ class FileProp
     std::string osRedirectURL{};
     bool bHasComputedFileSize = false;
     bool bIsDirectory = false;
+    bool bIsAzureFolder = false;
     int nMode = 0;  // st_mode member of struct stat
     bool bS3LikeRedirect = false;
     std::string ETag{};

From 78518bef378b816376b1e4f95b25d5d2c4964553 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2024 14:09:38 +0100
Subject: [PATCH 02/21] CMake: Export -DGDAL_DEBUG as PUBLIC for debug builds

Fixes #11311
---
 autotest/postinstall/test_cpp/test_cpp.cpp |  9 +++++++++
 gdal.cmake                                 |  4 ++++
 ogr/ogr_api.h                              | 10 +++++-----
 ogr/ogr_feature.h                          |  2 +-
 ogr/ogr_geometry.h                         |  2 +-
 ogr/ogr_srs_api.h                          |  2 +-
 ogr/ograpispy.h                            |  2 +-
 port/cpl_error.h                           |  2 +-
 8 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/autotest/postinstall/test_cpp/test_cpp.cpp b/autotest/postinstall/test_cpp/test_cpp.cpp
index b928a03b9205..173daa14f6f2 100644
--- a/autotest/postinstall/test_cpp/test_cpp.cpp
+++ b/autotest/postinstall/test_cpp/test_cpp.cpp
@@ -9,6 +9,7 @@
 #endif
 #include <cpl_vsi_virtual.h>
 #include <ogr_geometry.h>
+#include <ogr_spatialref.h>
 
 int main(int argc, char **argv)
 {
@@ -16,5 +17,13 @@ int main(int argc, char **argv)
     OGRGeometryFactory::createFromWkt("POINT(1 2)", nullptr, &poGeom);
     OGRGeometryFactory::destroyGeometry(poGeom);
     std::cout << GDALVersionInfo("RELEASE_NAME") << std::endl;
+
+    // Check fix for https://github.com/OSGeo/gdal/issues/11311
+    OGRSpatialReference oSRS;
+    int nEntries = 0;
+    int *panMatchCondidence = nullptr;
+    oSRS.FindMatches(nullptr, &nEntries, &panMatchCondidence);
+    CPLFree(panMatchCondidence);
+
     return (0);
 }
diff --git a/gdal.cmake b/gdal.cmake
index 1799ea709019..80c7ddf7ce68 100644
--- a/gdal.cmake
+++ b/gdal.cmake
@@ -196,6 +196,10 @@ if (MINGW AND BUILD_SHARED_LIBS)
     set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES SUFFIX "-${GDAL_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif ()
 
+# Some of the types in our public headers are dependent on whether GDAL_DEBUG
+# is defined or not
+target_compile_definitions(${GDAL_LIB_TARGET_NAME} PUBLIC $<$<CONFIG:DEBUG>:GDAL_DEBUG>)
+
 # Install properties
 if (GDAL_ENABLE_MACOSX_FRAMEWORK)
   set(FRAMEWORK_VERSION ${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR})
diff --git a/ogr/ogr_api.h b/ogr/ogr_api.h
index d17fd9028d35..8a3e674f35dd 100644
--- a/ogr/ogr_api.h
+++ b/ogr/ogr_api.h
@@ -43,7 +43,7 @@ bool CPL_DLL OGRGetGEOSVersion(int *pnMajor, int *pnMinor, int *pnPatch);
 /*! @cond Doxygen_Suppress */
 #define DEFINEH_OGRGeometryH
 /*! @endcond */
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRGeometryHS *OGRGeometryH;
 #else
 /** Opaque type for a geometry */
@@ -57,7 +57,7 @@ typedef void *OGRGeometryH;
 /*! @endcond */
 
 #ifndef DOXYGEN_XML
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
 typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH;
 #else
@@ -396,7 +396,7 @@ int CPL_DLL OGRPreparedGeometryContains(OGRPreparedGeometryH hPreparedGeom,
 /*! @cond Doxygen_Suppress */
 #define DEFINE_OGRFeatureH
 /*! @endcond */
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRFieldDefnHS *OGRFieldDefnH;
 typedef struct OGRFeatureDefnHS *OGRFeatureDefnH;
 typedef struct OGRFeatureHS *OGRFeatureH;
@@ -667,7 +667,7 @@ const char CPL_DLL *OGR_GlobFldDomain_GetGlob(OGRFieldDomainH);
 /*      ogrsf_frmts.h                                                   */
 /* -------------------------------------------------------------------- */
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRLayerHS *OGRLayerH;
 typedef struct OGRDataSourceHS *OGRDataSourceH;
 typedef struct OGRDriverHS *OGRSFDriverH;
@@ -949,7 +949,7 @@ void CPL_DLL OGRCleanupAll(void);
 /*      ogrsf_featurestyle.h                                            */
 /* -------------------------------------------------------------------- */
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRStyleMgrHS *OGRStyleMgrH;
 typedef struct OGRStyleToolHS *OGRStyleToolH;
 #else
diff --git a/ogr/ogr_feature.h b/ogr/ogr_feature.h
index d710dfd54a93..3ffd6b0201cb 100644
--- a/ogr/ogr_feature.h
+++ b/ogr/ogr_feature.h
@@ -37,7 +37,7 @@
 /*! @cond Doxygen_Suppress */
 #define DEFINE_OGRFeatureH
 /*! @endcond */
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRFieldDefnHS *OGRFieldDefnH;
 typedef struct OGRFeatureDefnHS *OGRFeatureDefnH;
 typedef struct OGRFeatureHS *OGRFeatureH;
diff --git a/ogr/ogr_geometry.h b/ogr/ogr_geometry.h
index 2e07be78d05e..4d354cce8f02 100644
--- a/ogr/ogr_geometry.h
+++ b/ogr/ogr_geometry.h
@@ -36,7 +36,7 @@
 /*! @cond Doxygen_Suppress */
 #ifndef DEFINEH_OGRGeometryH
 #define DEFINEH_OGRGeometryH
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRGeometryHS *OGRGeometryH;
 #else
 typedef void *OGRGeometryH;
diff --git a/ogr/ogr_srs_api.h b/ogr/ogr_srs_api.h
index e9eb02ea90ca..2116821b80bc 100644
--- a/ogr/ogr_srs_api.h
+++ b/ogr/ogr_srs_api.h
@@ -426,7 +426,7 @@ const char CPL_DLL *OSRAxisEnumToName(OGRAxisOrientation eOrientation);
 #define DEFINED_OGRSpatialReferenceH
 /*! @endcond */
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
 typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH;
 #else
diff --git a/ogr/ograpispy.h b/ogr/ograpispy.h
index 70d98b5ea16f..f04d3758657b 100644
--- a/ogr/ograpispy.h
+++ b/ogr/ograpispy.h
@@ -45,7 +45,7 @@
  * @since GDAL 2.0
  */
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 #define OGRAPISPY_ENABLED
 #endif
 
diff --git a/port/cpl_error.h b/port/cpl_error.h
index d15d875e619c..c4f1cde43626 100644
--- a/port/cpl_error.h
+++ b/port/cpl_error.h
@@ -179,7 +179,7 @@ void CPL_DLL CPLDebugProgress(const char *, CPL_FORMAT_STRING(const char *),
                               ...) CPL_PRINT_FUNC_FORMAT(2, 3);
 #endif
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(GDAL_DEBUG)
 /** Same as CPLDebug(), but expands to nothing for non-DEBUG builds.
  * @since GDAL 3.1
  */

From 409982bb95164fbc85c17d152bd95033e197fe6a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 20 Nov 2024 22:12:42 +0100
Subject: [PATCH 03/21] GTI: make the driver work with STAC GeoParquet files
 that don't have a assets.image.href field

Fixes #11317
---
 frmts/gti/gdaltileindexdataset.cpp | 87 +++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 13 deletions(-)

diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index 52b7618537ac..d19a25dade78 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -892,36 +892,97 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
 
     const OGRFeatureDefn *poLayerDefn = m_poLayer->GetLayerDefn();
 
-    // Is this a https://stac-utils.github.io/stac-geoparquet/latest/spec/stac-geoparquet-spec ?
-    const bool bIsStacGeoParquet =
-        poLayerDefn->GetFieldIndex("assets.image.href") >= 0;
-
-    const char *pszLocationFieldName = GetOption(MD_LOCATION_FIELD);
-    if (!pszLocationFieldName)
+    std::string osLocationFieldName;
     {
-        if (bIsStacGeoParquet)
+        const char *pszLocationFieldName = GetOption(MD_LOCATION_FIELD);
+        if (pszLocationFieldName)
         {
-            pszLocationFieldName = "assets.image.href";
+            osLocationFieldName = pszLocationFieldName;
         }
         else
         {
-            constexpr const char *DEFAULT_LOCATION_FIELD_NAME = "location";
-            pszLocationFieldName = DEFAULT_LOCATION_FIELD_NAME;
+            // Is this a https://stac-utils.github.io/stac-geoparquet/latest/spec/stac-geoparquet-spec ?
+            if (poLayerDefn->GetFieldIndex("assets.data.href") >= 0)
+            {
+                osLocationFieldName = "assets.data.href";
+                CPLDebug("GTI", "Using %s as location field",
+                         osLocationFieldName.c_str());
+            }
+            else if (poLayerDefn->GetFieldIndex("assets.image.href") >= 0)
+            {
+                osLocationFieldName = "assets.image.href";
+                CPLDebug("GTI", "Using %s as location field",
+                         osLocationFieldName.c_str());
+            }
+            else if (poLayerDefn->GetFieldIndex("stac_version") >= 0)
+            {
+                const int nFieldCount = poLayerDefn->GetFieldCount();
+                // Look for "assets.xxxxx.href" fields
+                int nAssetCount = 0;
+                for (int i = 0; i < nFieldCount; ++i)
+                {
+                    const auto poFDefn = poLayerDefn->GetFieldDefn(i);
+                    const char *pszFieldName = poFDefn->GetNameRef();
+                    if (STARTS_WITH(pszFieldName, "assets.") &&
+                        EQUAL(pszFieldName + strlen(pszFieldName) -
+                                  strlen(".href"),
+                              ".href") &&
+                        // Assets with "metadata" in them are very much likely
+                        // not rasters... We could potentially confirm that by
+                        // inspecting the value of the assets.XXX.type or
+                        // assets.XXX.roles fields of one feature
+                        !strstr(pszFieldName, "metadata"))
+                    {
+                        ++nAssetCount;
+                        if (!osLocationFieldName.empty())
+                        {
+                            osLocationFieldName += ", ";
+                        }
+                        osLocationFieldName += pszFieldName;
+                    }
+                }
+                if (nAssetCount > 1)
+                {
+                    CPLError(CE_Failure, CPLE_AppDefined,
+                             "Several potential STAC assets. Please select one "
+                             "among %s with the LOCATION_FIELD open option",
+                             osLocationFieldName.c_str());
+                    return false;
+                }
+                else if (nAssetCount == 0)
+                {
+                    CPLError(CE_Failure, CPLE_AppDefined,
+                             "File has stac_version property but lacks assets");
+                    return false;
+                }
+            }
+            else
+            {
+                constexpr const char *DEFAULT_LOCATION_FIELD_NAME = "location";
+                osLocationFieldName = DEFAULT_LOCATION_FIELD_NAME;
+            }
         }
     }
 
-    m_nLocationFieldIndex = poLayerDefn->GetFieldIndex(pszLocationFieldName);
+    const bool bIsStacGeoParquet =
+        STARTS_WITH(osLocationFieldName.c_str(), "assets.") &&
+        EQUAL(osLocationFieldName.c_str() + osLocationFieldName.size() -
+                  strlen(".href"),
+              ".href");
+
+    m_nLocationFieldIndex =
+        poLayerDefn->GetFieldIndex(osLocationFieldName.c_str());
     if (m_nLocationFieldIndex < 0)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find field %s",
-                 pszLocationFieldName);
+                 osLocationFieldName.c_str());
         return false;
     }
     if (poLayerDefn->GetFieldDefn(m_nLocationFieldIndex)->GetType() !=
         OFTString)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Field %s is not of type string",
-                 pszLocationFieldName);
+                 osLocationFieldName.c_str());
         return false;
     }
 

From f8532eebd5485fc7232744d921885da99c9d1874 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 01:16:59 +0100
Subject: [PATCH 04/21] GTI: advertize SRS open option

---
 doc/source/drivers/raster/gti.rst  | 8 +++++++-
 frmts/gti/gdaltileindexdataset.cpp | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/source/drivers/raster/gti.rst b/doc/source/drivers/raster/gti.rst
index f44f0b359b12..f169e2f82298 100644
--- a/doc/source/drivers/raster/gti.rst
+++ b/doc/source/drivers/raster/gti.rst
@@ -42,7 +42,7 @@ driver with the following main differences:
 * Contrary to the VRT driver, the GTI driver does not enable to alter
   characteristics of referenced tiles, such as their georeferencing, nodata value,
   etc. If such behavior is desired, the tiles must be for example wrapped
-  individually in a VRT file (or `vrt://` connection string) before being referenced 
+  individually in a VRT file (or `vrt://` connection string) before being referenced
   in the GTI index.
 
 Connection strings
@@ -444,6 +444,12 @@ also defined as layer metadata items or in the .gti XML file
 
       Resolution along Y axis in SRS units / pixel.
 
+-  .. oo:: SRS
+      :choices: <string>
+
+      Override/sets the Spatial Reference System in one of the formats supported
+      by :cpp:func:`OGRSpatialReference::SetFromUserInput`.
+
 -  .. oo:: MINX
       :choices: <float>
 
diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index d19a25dade78..ba326ed8b8ec 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -4693,6 +4693,7 @@ void GDALRegister_GTI()
         "  <Option name='SORT_FIELD' type='string'/>"
         "  <Option name='SORT_FIELD_ASC' type='boolean'/>"
         "  <Option name='FILTER' type='string'/>"
+        "  <Option name='SRS' type='string'/>"
         "  <Option name='RESX' type='float'/>"
         "  <Option name='RESY' type='float'/>"
         "  <Option name='MINX' type='float'/>"

From fa72c11ac1888216d44321425c2788c9e7a50245 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 04:34:29 +0100
Subject: [PATCH 05/21] GTI: STAC GeoParquet: make it recognize
 assets.XXX.proj:epsg and assets.XXX.proj:transform

fields in addition to top level proj:epsg and proj:transform.
Also handle geotransform being a IntegerList or Integer64List.

Refs #11321 (but does no fix it)
---
 frmts/gti/gdaltileindexdataset.cpp | 78 ++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 16 deletions(-)

diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index ba326ed8b8ec..c2658b225915 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -964,12 +964,6 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         }
     }
 
-    const bool bIsStacGeoParquet =
-        STARTS_WITH(osLocationFieldName.c_str(), "assets.") &&
-        EQUAL(osLocationFieldName.c_str() + osLocationFieldName.size() -
-                  strlen(".href"),
-              ".href");
-
     m_nLocationFieldIndex =
         poLayerDefn->GetFieldIndex(osLocationFieldName.c_str());
     if (m_nLocationFieldIndex < 0)
@@ -1157,14 +1151,36 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     std::string osResX, osResY, osMinX, osMinY, osMaxX, osMaxY;
     int iProjEPSG = -1;
     int iProjTransform = -1;
+
+    const bool bIsStacGeoParquet =
+        STARTS_WITH(osLocationFieldName.c_str(), "assets.") &&
+        EQUAL(osLocationFieldName.c_str() + osLocationFieldName.size() -
+                  strlen(".href"),
+              ".href");
+    std::string osAssetName;
+    if (bIsStacGeoParquet)
+    {
+        osAssetName = osLocationFieldName.substr(
+            strlen("assets."),
+            osLocationFieldName.size() - strlen("assets.") - strlen(".href"));
+    }
     if (bIsStacGeoParquet && !pszSRS && !pszResX && !pszResY && !pszMinX &&
         !pszMinY && !pszMaxX && !pszMaxY &&
-        (iProjEPSG = poLayerDefn->GetFieldIndex("proj:epsg")) >= 0 &&
-        (iProjTransform = poLayerDefn->GetFieldIndex("proj:transform")) >= 0)
+        ((iProjEPSG = poLayerDefn->GetFieldIndex(
+              CPLSPrintf("assets.%s.proj:epsg", osAssetName.c_str()))) >= 0 ||
+         (iProjEPSG = poLayerDefn->GetFieldIndex("proj:epsg")) >= 0) &&
+        ((iProjTransform = poLayerDefn->GetFieldIndex(CPLSPrintf(
+              "assets.%s.proj:transform", osAssetName.c_str()))) >= 0 ||
+         (iProjTransform = poLayerDefn->GetFieldIndex("proj:transform")) >= 0))
     {
         poFeature.reset(m_poLayer->GetNextFeature());
+        const auto poProjTransformField =
+            poLayerDefn->GetFieldDefn(iProjTransform);
         if (poFeature && poFeature->IsFieldSet(iProjEPSG) &&
-            poFeature->IsFieldSet(iProjTransform))
+            poFeature->IsFieldSet(iProjTransform) &&
+            (poProjTransformField->GetType() == OFTRealList ||
+             poProjTransformField->GetType() == OFTIntegerList ||
+             poProjTransformField->GetType() == OFTInteger64List))
         {
             const int nEPSGCode = poFeature->GetFieldAsInteger(iProjEPSG);
             OGRSpatialReference oSTACSRS;
@@ -1173,17 +1189,47 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 oSTACSRS.importFromEPSG(nEPSGCode) == OGRERR_NONE)
             {
                 int nTransformCount = 0;
-                const auto padfFeatureTransform =
-                    poFeature->GetFieldAsDoubleList(iProjTransform,
-                                                    &nTransformCount);
+                double adfGeoTransform[6] = {0, 0, 0, 0, 0, 0};
+                if (poProjTransformField->GetType() == OFTRealList)
+                {
+                    const auto padfFeatureTransform =
+                        poFeature->GetFieldAsDoubleList(iProjTransform,
+                                                        &nTransformCount);
+                    if (nTransformCount >= 6)
+                        memcpy(adfGeoTransform, padfFeatureTransform,
+                               6 * sizeof(double));
+                }
+                else if (poProjTransformField->GetType() == OFTInteger64List)
+                {
+                    const auto paFeatureTransform =
+                        poFeature->GetFieldAsInteger64List(iProjTransform,
+                                                           &nTransformCount);
+                    if (nTransformCount >= 6)
+                    {
+                        for (int i = 0; i < 6; ++i)
+                            adfGeoTransform[i] =
+                                static_cast<double>(paFeatureTransform[i]);
+                    }
+                }
+                else if (poProjTransformField->GetType() == OFTIntegerList)
+                {
+                    const auto paFeatureTransform =
+                        poFeature->GetFieldAsIntegerList(iProjTransform,
+                                                         &nTransformCount);
+                    if (nTransformCount >= 6)
+                    {
+                        for (int i = 0; i < 6; ++i)
+                            adfGeoTransform[i] = paFeatureTransform[i];
+                    }
+                }
                 OGREnvelope sEnvelope;
                 if (nTransformCount >= 6 && m_poLayer->GetSpatialRef() &&
                     m_poLayer->GetExtent(&sEnvelope, /* bForce = */ true) ==
                         OGRERR_NONE)
                 {
-                    const double dfResX = padfFeatureTransform[0];
+                    const double dfResX = adfGeoTransform[0];
                     osResX = CPLSPrintf("%.17g", dfResX);
-                    const double dfResY = std::fabs(padfFeatureTransform[4]);
+                    const double dfResY = std::fabs(adfGeoTransform[4]);
                     osResY = CPLSPrintf("%.17g", dfResY);
 
                     auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
@@ -1203,9 +1249,9 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                     {
                         constexpr double EPSILON = 1e-3;
                         const bool bTileAlignedOnRes =
-                            (fmod(std::fabs(padfFeatureTransform[3]), dfResX) <=
+                            (fmod(std::fabs(adfGeoTransform[3]), dfResX) <=
                                  EPSILON * dfResX &&
-                             fmod(std::fabs(padfFeatureTransform[5]), dfResY) <=
+                             fmod(std::fabs(adfGeoTransform[5]), dfResY) <=
                                  EPSILON * dfResY);
 
                         osMinX = CPLSPrintf(

From f91d0e2c554062a5e74a4fab3a2c790259931697 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 01:41:48 +0100
Subject: [PATCH 06/21] GTI: attach the color table of the sample tile to the
 GTI single band

---
 frmts/gti/gdaltileindexdataset.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index c2658b225915..d6ab4633f825 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -1301,10 +1301,11 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     }
 
     bool bHasMaskBand = false;
+    std::unique_ptr<GDALColorTable> poSingleColorTable;
     if ((!pszBandCount && apoXMLNodeBands.empty()) ||
         (!(pszResX && pszResY) && nCountXSizeYSizeGT == 0))
     {
-        CPLDebug("VRT", "Inspecting one feature due to missing metadata items");
+        CPLDebug("GTI", "Inspecting one feature due to missing metadata items");
         m_bScannedOneFeatureAtOpening = true;
 
         if (!poFeature)
@@ -1348,6 +1349,17 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
             const double dfNoData = poTileBand->GetNoDataValue(&bHasNoData);
             aNoData.emplace_back(CPL_TO_BOOL(bHasNoData), dfNoData);
             aeColorInterp.push_back(poTileBand->GetColorInterpretation());
+            if (nTileBandCount == 1)
+            {
+                if (auto poCT = poTileBand->GetColorTable())
+                {
+                    // We assume that this will apply to all tiles...
+                    // TODO: detect if that it is really the case, and warn
+                    // if not, or do approximate palette matching like
+                    // done in GDALRasterBand::GetIndexColorTranslationTo()
+                    poSingleColorTable.reset(poCT->Clone());
+                }
+            }
 
             if (poTileBand->GetMaskFlags() == GMF_PER_DATASET)
                 bHasMaskBand = true;
@@ -2042,6 +2054,10 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         }
     }
 
+    if (nBandCount == 1 && poFirstBand && poSingleColorTable &&
+        !poFirstBand->m_poColorTable)
+        poFirstBand->m_poColorTable = std::move(poSingleColorTable);
+
     const char *pszMaskBand = GetOption(MD_MASK_BAND);
     if (pszMaskBand)
         bHasMaskBand = CPLTestBool(pszMaskBand);

From 32bd86fb68ceec3a128c574463f833c42099aa06 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 14:54:54 +0100
Subject: [PATCH 07/21] /vsiaz/: ReadDir(): be robust to a response to list
 blob that returns no blobs but has a non-empty NextMarker

---
 autotest/gcore/vsiaz.py | 103 ++++++++++++++++++++++++++++++++++++++++
 port/cpl_vsil_az.cpp    |  13 ++++-
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 348f794b44dd..d2b094453148 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -381,6 +381,109 @@ def test_vsiaz_fake_readdir():
     assert gdal.VSIStatL("/vsiaz/mycontainer1", gdal.VSI_STAT_CACHE_ONLY) is not None
 
 
+###############################################################################
+# Test ReadDir() when first response has no blobs but a non-empty NextMarker
+
+
+def test_vsiaz_fake_readdir_no_blobs_in_first_request():
+
+    if gdaltest.webserver_port == 0:
+        pytest.skip()
+
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/azure/blob/myaccount/az_fake_bucket2?comp=list&delimiter=%2F&prefix=a_dir%20with_space%2F&restype=container",
+        200,
+        {"Content-type": "application/xml"},
+        """<?xml version="1.0" encoding="UTF-8"?>
+                    <EnumerationResults>
+                        <Prefix>a_dir with_space/</Prefix>
+                        <Blobs/>
+                        <NextMarker>bla</NextMarker>
+                    </EnumerationResults>
+                """,
+    )
+    handler.add(
+        "GET",
+        "/azure/blob/myaccount/az_fake_bucket2?comp=list&delimiter=%2F&marker=bla&prefix=a_dir%20with_space%2F&restype=container",
+        200,
+        {"Content-type": "application/xml"},
+        """<?xml version="1.0" encoding="UTF-8"?>
+                    <EnumerationResults>
+                        <Prefix>a_dir with_space/</Prefix>
+                        <Blobs>
+                          <Blob>
+                            <Name>a_dir with_space/resource4.bin</Name>
+                            <Properties>
+                              <Last-Modified>16 Oct 2016 12:34:56</Last-Modified>
+                              <Content-Length>456789</Content-Length>
+                            </Properties>
+                          </Blob>
+                          <BlobPrefix>
+                            <Name>a_dir with_space/subdir/</Name>
+                          </BlobPrefix>
+                        </Blobs>
+                    </EnumerationResults>
+                """,
+    )
+
+    with webserver.install_http_handler(handler):
+        dir_contents = gdal.ReadDir("/vsiaz/az_fake_bucket2/a_dir with_space")
+    assert dir_contents == ["resource4.bin", "subdir"]
+
+
+###############################################################################
+#
+
+
+@gdaltest.enable_exceptions()
+def test_vsiaz_fake_readdir_protection_again_infinite_looping():
+
+    if gdaltest.webserver_port == 0:
+        pytest.skip()
+
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/azure/blob/myaccount/az_fake_bucket2?comp=list&delimiter=%2F&prefix=a_dir%20with_space%2F&restype=container",
+        200,
+        {"Content-type": "application/xml"},
+        """<?xml version="1.0" encoding="UTF-8"?>
+                    <EnumerationResults>
+                        <Prefix>a_dir with_space/</Prefix>
+                        <Blobs/>
+                        <NextMarker>bla0</NextMarker>
+                    </EnumerationResults>
+                """,
+    )
+    for i in range(10):
+        handler.add(
+            "GET",
+            f"/azure/blob/myaccount/az_fake_bucket2?comp=list&delimiter=%2F&marker=bla{i}&prefix=a_dir%20with_space%2F&restype=container",
+            200,
+            {"Content-type": "application/xml"},
+            f"""<?xml version="1.0" encoding="UTF-8"?>
+                        <EnumerationResults>
+                            <Prefix>a_dir with_space/</Prefix>
+                            <Blobs/>
+                            <NextMarker>bla{i+1}</NextMarker>
+                        </EnumerationResults>
+                    """,
+        )
+
+    with webserver.install_http_handler(handler):
+        with pytest.raises(
+            Exception,
+            match="More than 10 consecutive List Blob requests returning no blobs",
+        ):
+            gdal.ReadDir("/vsiaz/az_fake_bucket2/a_dir with_space")
+
+
 ###############################################################################
 # Test AZURE_STORAGE_SAS_TOKEN option with fake server
 
diff --git a/port/cpl_vsil_az.cpp b/port/cpl_vsil_az.cpp
index a4cc28b39e07..1b115a9430a3 100644
--- a/port/cpl_vsil_az.cpp
+++ b/port/cpl_vsil_az.cpp
@@ -358,6 +358,11 @@ bool VSIDIRAz::AnalyseAzureFileList(const std::string &osBaseURL,
         }
 
         osNextMarker = CPLGetXMLValue(psEnumerationResults, "NextMarker", "");
+        // For some containers, a list blob request can return a response
+        // with no blobs, but with a non-empty NextMarker, and the following
+        // request using that marker will return blobs...
+        if (!osNextMarker.empty())
+            bOK = true;
     }
     CPLDestroyXMLNode(psTree);
 
@@ -460,7 +465,8 @@ bool VSIDIRAz::IssueListDir()
 
 const VSIDIREntry *VSIDIRAz::NextDirEntry()
 {
-    while (true)
+    constexpr int ARBITRARY_LIMIT = 10;
+    for (int i = 0; i < ARBITRARY_LIMIT; ++i)
     {
         if (nPos < static_cast<int>(aoEntries.size()))
         {
@@ -477,6 +483,11 @@ const VSIDIREntry *VSIDIRAz::NextDirEntry()
             return nullptr;
         }
     }
+    CPLError(CE_Failure, CPLE_AppDefined,
+             "More than %d consecutive List Blob "
+             "requests returning no blobs",
+             ARBITRARY_LIMIT);
+    return nullptr;
 }
 
 /************************************************************************/

From d5ce4ba6836f107492799b29c3c126180fd0144e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 15:28:44 +0100
Subject: [PATCH 08/21] GTI: generalize logic for reading STAC GeoParquet
 eo:bands field to any asset name, and handle all 'common_names' values

---
 frmts/gti/gdaltileindexdataset.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index d6ab4633f825..b14995c6509e 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -1847,8 +1847,8 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     std::vector<std::string> aosDescriptions;
     if (bIsStacGeoParquet && poFeature)
     {
-        const int nEOBandsIdx =
-            poLayerDefn->GetFieldIndex("assets.image.eo:bands");
+        const int nEOBandsIdx = poLayerDefn->GetFieldIndex(
+            CPLSPrintf("assets.%s.eo:bands", osAssetName.c_str()));
         if (nEOBandsIdx >= 0 &&
             poLayerDefn->GetFieldDefn(nEOBandsIdx)->GetSubType() == OFSTJSON &&
             poFeature->IsFieldSet(nEOBandsIdx))
@@ -1863,23 +1863,17 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 {
                     int i = 0;
                     aosDescriptions.resize(nBandCount);
-                    static const std::map<std::string, GDALColorInterp>
-                        oMapCommonName = {
-                            {"red", GCI_RedBand},
-                            {"green", GCI_GreenBand},
-                            {"blue", GCI_BlueBand},
-                            {"alpha", GCI_AlphaBand},
-                        };
                     for (const auto &oObj : oArray)
                     {
                         if (oObj.GetType() == CPLJSONObject::Type::Object)
                         {
                             const auto osCommonName =
                                 oObj.GetString("common_name");
-                            const auto oIter =
-                                oMapCommonName.find(osCommonName);
-                            if (oIter != oMapCommonName.end())
-                                aeColorInterp[i] = oIter->second;
+                            const auto eInterp =
+                                GDALGetColorInterpFromSTACCommonName(
+                                    osCommonName.c_str());
+                            if (eInterp != GCI_Undefined)
+                                aeColorInterp[i] = eInterp;
 
                             const auto osName = oObj.GetString("name");
                             aosDescriptions[i] = osName;

From 58df2f114ce45579e066b00491fbd89798f81137 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 15:34:27 +0100
Subject: [PATCH 09/21] GTI: parse central wavelength and full width half max
 metadata items from STAC GeoParquet eo:bands field

---
 frmts/gti/gdaltileindexdataset.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index b14995c6509e..f5a9a22483f1 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -1845,6 +1845,8 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     }
 
     std::vector<std::string> aosDescriptions;
+    std::vector<double> adfCenterWavelength;
+    std::vector<double> adfFullWidthHalfMax;
     if (bIsStacGeoParquet && poFeature)
     {
         const int nEOBandsIdx = poLayerDefn->GetFieldIndex(
@@ -1863,6 +1865,8 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 {
                     int i = 0;
                     aosDescriptions.resize(nBandCount);
+                    adfCenterWavelength.resize(nBandCount);
+                    adfFullWidthHalfMax.resize(nBandCount);
                     for (const auto &oObj : oArray)
                     {
                         if (oObj.GetType() == CPLJSONObject::Type::Object)
@@ -1890,6 +1894,11 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                                         .append(osDescription)
                                         .append(")");
                             }
+
+                            adfCenterWavelength[i] =
+                                oObj.GetDouble("center_wavelength");
+                            adfFullWidthHalfMax[i] =
+                                oObj.GetDouble("full_width_half_max");
                         }
                         ++i;
                     }
@@ -2046,6 +2055,21 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 poBand->m_poRAT->XMLInit(psRAT, "");
             }
         }
+
+        if (static_cast<int>(adfCenterWavelength.size()) == nBandCount &&
+            adfCenterWavelength[i] != 0)
+        {
+            poBand->GDALRasterBand::SetMetadataItem(
+                "CENTRAL_WAVELENGTH_UM",
+                CPLSPrintf("%g", adfCenterWavelength[i]), "IMAGERY");
+        }
+
+        if (static_cast<int>(adfFullWidthHalfMax.size()) == nBandCount &&
+            adfFullWidthHalfMax[i] != 0)
+        {
+            poBand->GDALRasterBand::SetMetadataItem(
+                "FWHM_UM", CPLSPrintf("%g", adfFullWidthHalfMax[i]), "IMAGERY");
+        }
     }
 
     if (nBandCount == 1 && poFirstBand && poSingleColorTable &&

From 770c8ae47c6dbf1ba32d1403bde32add7aa6a3dc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 15:41:08 +0100
Subject: [PATCH 10/21] GTI: read scale and offset from STAC GeoParquet
 raster:bands field

---
 frmts/gti/gdaltileindexdataset.cpp | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
index f5a9a22483f1..e42f134d64f7 100644
--- a/frmts/gti/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -1847,6 +1847,8 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     std::vector<std::string> aosDescriptions;
     std::vector<double> adfCenterWavelength;
     std::vector<double> adfFullWidthHalfMax;
+    std::vector<double> adfScale;
+    std::vector<double> adfOffset;
     if (bIsStacGeoParquet && poFeature)
     {
         const int nEOBandsIdx = poLayerDefn->GetFieldIndex(
@@ -1905,6 +1907,43 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 }
             }
         }
+
+        const int nRasterBandsIdx = poLayerDefn->GetFieldIndex(
+            CPLSPrintf("assets.%s.raster:bands", osAssetName.c_str()));
+        if (nRasterBandsIdx >= 0 &&
+            poLayerDefn->GetFieldDefn(nRasterBandsIdx)->GetSubType() ==
+                OFSTJSON &&
+            poFeature->IsFieldSet(nRasterBandsIdx))
+        {
+            const char *pszStr = poFeature->GetFieldAsString(nRasterBandsIdx);
+            CPLJSONDocument oDoc;
+            if (oDoc.LoadMemory(pszStr) &&
+                oDoc.GetRoot().GetType() == CPLJSONObject::Type::Array)
+            {
+                const auto oArray = oDoc.GetRoot().ToArray();
+                if (oArray.Size() == nBandCount)
+                {
+                    int i = 0;
+                    adfScale.resize(nBandCount,
+                                    std::numeric_limits<double>::quiet_NaN());
+                    adfOffset.resize(nBandCount,
+                                     std::numeric_limits<double>::quiet_NaN());
+                    for (const auto &oObj : oArray)
+                    {
+                        if (oObj.GetType() == CPLJSONObject::Type::Object)
+                        {
+                            adfScale[i] = oObj.GetDouble(
+                                "scale",
+                                std::numeric_limits<double>::quiet_NaN());
+                            adfOffset[i] = oObj.GetDouble(
+                                "offset",
+                                std::numeric_limits<double>::quiet_NaN());
+                        }
+                        ++i;
+                    }
+                }
+            }
+        }
     }
 
     GDALTileIndexBand *poFirstBand = nullptr;
@@ -1984,6 +2023,11 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
             }
         }
 
+        if (static_cast<int>(adfScale.size()) == nBandCount &&
+            !std::isnan(adfScale[i]))
+        {
+            poBand->m_dfScale = adfScale[i];
+        }
         if (const char *pszScale =
                 GetOption(CPLSPrintf("BAND_%d_%s", i + 1, MD_BAND_SCALE)))
         {
@@ -1999,6 +2043,11 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
             }
         }
 
+        if (static_cast<int>(adfOffset.size()) == nBandCount &&
+            !std::isnan(adfOffset[i]))
+        {
+            poBand->m_dfOffset = adfOffset[i];
+        }
         if (const char *pszOffset =
                 GetOption(CPLSPrintf("BAND_%d_%s", i + 1, MD_BAND_OFFSET)))
         {

From 316c8a4f33e1c4f5b19efb2022c8af41d02be9ae Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 21 Nov 2024 16:00:45 +0100
Subject: [PATCH 11/21] GTI: add test case for Sentinel2 STAC GeoParquet

---
 .../gti/sentinel2_stac_geoparquet.geojson     |  7 ++++
 autotest/gdrivers/gti.py                      | 34 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 autotest/gdrivers/data/gti/sentinel2_stac_geoparquet.geojson

diff --git a/autotest/gdrivers/data/gti/sentinel2_stac_geoparquet.geojson b/autotest/gdrivers/data/gti/sentinel2_stac_geoparquet.geojson
new file mode 100644
index 000000000000..40048d297f81
--- /dev/null
+++ b/autotest/gdrivers/data/gti/sentinel2_stac_geoparquet.geojson
@@ -0,0 +1,7 @@
+{
+"type": "FeatureCollection",
+"name": "sentinel2_stac_geoparquet",
+"features": [
+{ "type": "Feature", "properties": { "type": "Feature", "stac_version": "1.1.0", "assets.rededge3.href": "https://e84-earth-search-sentinel-data.s3.us-west-2.amazonaws.com/sentinel-2-c1-l2a/12/S/VD/2023/12/S2A_T12SVD_20231213T181818_L2A/B07.tif", "assets.rededge3.title": "Red Edge 3 - 20m", "assets.rededge3.type": "image/tiff; application=geotiff; profile=cloud-optimized", "assets.rededge3.roles": [ "data", "reflectance" ], "assets.rededge3.eo:bands": [ { "name": "B07", "common_name": "rededge", "center_wavelength": 0.783, "full_width_half_max": 0.028 } ], "assets.rededge3.gsd": 20.0, "assets.rededge3.proj:shape": [ 5490, 5490 ], "assets.rededge3.proj:transform": [ 20, 0, 399960, 0, -20, 3900000 ], "assets.rededge3.raster:bands": [ { "nodata": 0, "data_type": "uint16", "spatial_resolution": 20, "scale": 0.0001, "offset": -0.1 } ], "assets.rededge3.file:checksum": "1220f2623a57da9b09fe8253c2dc9a6377227041e86d192715c6d753638cb0977d99", "assets.rededge3.file:size": 53583888, "proj:epsg": 32612, }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -112.099469246340007, 35.238074627405702 ], [ -112.086441301193005, 34.249018117524301 ], [ -111.171637815685003, 34.254252630787903 ], [ -110.892875963752005, 35.136386493702297 ], [ -110.892735914686995, 35.243021163215097 ], [ -112.099469246340007, 35.238074627405702 ] ] ] } }
+]
+}
diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index c9691ebd0574..68ea6e67f79a 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -2985,3 +2985,37 @@ def test_gti_stac_geoparquet():
         "Blue",
         "NIR (near-infrared)",
     ]
+
+
+###############################################################################
+
+
+@pytest.mark.require_curl()
+@pytest.mark.require_driver("GeoJSON")
+def test_gti_stac_geoparquet_sentinel2():
+
+    url = "https://e84-earth-search-sentinel-data.s3.us-west-2.amazonaws.com/sentinel-2-c1-l2a/12/S/VD/2023/12/S2A_T12SVD_20231213T181818_L2A/B07.tif"
+
+    conn = gdaltest.gdalurlopen(url, timeout=4)
+    if conn is None:
+        pytest.skip("cannot open URL")
+
+    ds = gdal.Open("GTI:data/gti/sentinel2_stac_geoparquet.geojson")
+    assert ds.RasterXSize == 5556
+    assert ds.RasterYSize == 5540
+    assert ds.GetSpatialRef().GetAuthorityCode(None) == "32612"
+    assert ds.GetGeoTransform() == pytest.approx(
+        (398760.0, 20.0, 0.0, 3900560.0, 0.0, -20.0), rel=1e-5
+    )
+    assert ds.RasterCount == 1
+    band = ds.GetRasterBand(1)
+    assert band.DataType == gdal.GDT_UInt16
+    assert band.GetNoDataValue() == 0
+    assert band.GetColorInterpretation() == gdal.GCI_RedEdgeBand
+    assert band.GetDescription() == "B07"
+    assert band.GetOffset() == -0.1
+    assert band.GetScale() == 0.0001
+    assert band.GetMetadata_Dict("IMAGERY") == {
+        "CENTRAL_WAVELENGTH_UM": "0.783",
+        "FWHM_UM": "0.028",
+    }

From 7fec8c7aa4d5e6e6556b3dd4ee17f2b918eedb3a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 23 Nov 2024 16:30:45 +0100
Subject: [PATCH 12/21] OCI: add a TIMESTAMP_WITH_TIME_ZONE layer creation
 option, and ogr2ogr tweaks

Fixes https://github.com/OSGeo/gdal/issues/11057#issuecomment-2495479779
---
 apps/ogr2ogr_lib.cpp                        | 26 ++++++++--
 autotest/ogr/ogr_oci.py                     | 50 +++++++++++++++++-
 doc/source/drivers/vector/oci.rst           | 11 ++++
 ogr/ogrsf_frmts/oci/ogr_oci.h               |  3 ++
 ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp    |  3 ++
 ogr/ogrsf_frmts/oci/ogrocisession.cpp       |  7 ++-
 ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp    | 57 +++++++++++++++++++++
 ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp | 15 +++++-
 8 files changed, 166 insertions(+), 6 deletions(-)

diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
index 19734944335d..6b8543d18590 100644
--- a/apps/ogr2ogr_lib.cpp
+++ b/apps/ogr2ogr_lib.cpp
@@ -4625,6 +4625,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
             oCoordPrec.dfMResolution = psOptions->dfMRes;
         }
 
+        auto poSrcDriver = m_poSrcDS->GetDriver();
+
         // Force FID column as 64 bit if the source feature has a 64 bit FID,
         // the target driver supports 64 bit FID and the user didn't set it
         // manually.
@@ -4667,9 +4669,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
         }
         // Detect scenario of converting from GPX to a format like GPKG
         // Cf https://github.com/OSGeo/gdal/issues/9225
-        else if (!bPreserveFID && !m_bUnsetFid && !bAppend &&
-                 m_poSrcDS->GetDriver() &&
-                 EQUAL(m_poSrcDS->GetDriver()->GetDescription(), "GPX") &&
+        else if (!bPreserveFID && !m_bUnsetFid && !bAppend && poSrcDriver &&
+                 EQUAL(poSrcDriver->GetDescription(), "GPX") &&
                  pszDestCreationOptions &&
                  (strstr(pszDestCreationOptions, "='FID'") != nullptr ||
                   strstr(pszDestCreationOptions, "=\"FID\"") != nullptr) &&
@@ -4761,6 +4762,23 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
             }
         }
 
+        // Use case of https://github.com/OSGeo/gdal/issues/11057#issuecomment-2495479779
+        // Conversion from GPKG to OCI.
+        // OCI distinguishes between TIMESTAMP and TIMESTAMP WITH TIME ZONE
+        // GeoPackage is supposed to have DateTime in UTC, so we set
+        // TIMESTAMP_WITH_TIME_ZONE=YES
+        if (poSrcDriver && pszDestCreationOptions &&
+            strstr(pszDestCreationOptions, "TIMESTAMP_WITH_TIME_ZONE") &&
+            CSLFetchNameValue(m_papszLCO, "TIMESTAMP_WITH_TIME_ZONE") ==
+                nullptr &&
+            EQUAL(poSrcDriver->GetDescription(), "GPKG"))
+        {
+            papszLCOTemp = CSLSetNameValue(papszLCOTemp,
+                                           "TIMESTAMP_WITH_TIME_ZONE", "YES");
+            CPLDebug("GDALVectorTranslate",
+                     "Setting TIMESTAMP_WITH_TIME_ZONE=YES");
+        }
+
         OGRGeomFieldDefn oGeomFieldDefn(
             osGeomFieldName.c_str(),
             static_cast<OGRwkbGeometryType>(eGCreateLayerType));
@@ -4956,7 +4974,9 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
 
     bool bError = false;
     OGRArrowArrayStream streamSrc;
+
     const bool bUseWriteArrowBatch =
+        !EQUAL(m_poDstDS->GetDriver()->GetDescription(), "OCI") &&
         CanUseWriteArrowBatch(poSrcLayer, poDstLayer, bJustCreatedLayer,
                               psOptions, bPreserveFID, bError, streamSrc);
     if (bError)
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 02e3683cbea4..b213ae4a7038 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -70,6 +70,7 @@ def setup_tests():
     gdaltest.oci_ds.ExecuteSQL("DELLAYER:test_GEOMETRYCOLLECTION")
     gdaltest.oci_ds.ExecuteSQL("DELLAYER:test_NONE")
     gdaltest.oci_ds.ExecuteSQL("DELLAYER:testdate")
+    gdaltest.oci_ds.ExecuteSQL("DELLAYER:testdate_with_tz")
     gdaltest.oci_ds.ExecuteSQL("DELLAYER:ogr_oci_20")
     gdaltest.oci_ds.ExecuteSQL("DELLAYER:ogr_oci_20bis")
     gdaltest.oci_ds.ExecuteSQL("DELLAYER:ogr_oci_21")
@@ -724,7 +725,7 @@ def test_ogr_oci_18():
 # Test date / datetime
 
 
-def test_ogr_oci_19():
+def test_ogr_oci_datetime_no_tz():
 
     lyr = gdaltest.oci_ds.CreateLayer("testdate", geom_type=ogr.wkbNone)
     lyr.CreateField(ogr.FieldDefn("MYDATE", ogr.OFTDate))
@@ -736,6 +737,9 @@ def test_ogr_oci_19():
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetField("MYDATETIME", "2015/02/03 11:33:44.12345")
     lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetField("MYDATETIME", "2015/02/03 11:33:44.12345+0530")  # Timezone lost
+    lyr.CreateFeature(feat)
     lyr.SyncToDisk()
 
     with gdaltest.oci_ds.ExecuteSQL(
@@ -743,11 +747,55 @@ def test_ogr_oci_19():
     ) as sql_lyr:
         assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDate
         assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTDateTime
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetTZFlag() == ogr.TZFLAG_UNKNOWN
         f = sql_lyr.GetNextFeature()
         assert f.GetField(0) == "2015/02/03"
         assert f.GetField(1) == "2015/02/03 11:33:44"
         f = sql_lyr.GetNextFeature()
         assert f.GetField(1) == "2015/02/03 11:33:44.123"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetField(1) == "2015/02/03 11:33:44.123"  # Timezone lost
+
+
+###############################################################################
+# Test date / datetime with time zone
+
+
+def test_ogr_oci_datetime_with_tz():
+
+    lyr = gdaltest.oci_ds.CreateLayer(
+        "testdate_with_tz",
+        geom_type=ogr.wkbNone,
+        options=["TIMESTAMP_WITH_TIME_ZONE=YES"],
+    )
+    lyr.CreateField(ogr.FieldDefn("MYDATETIME", ogr.OFTDateTime))
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetField("MYDATETIME", "2015/02/03 11:33:44.567+0530")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetField("MYDATETIME", "2015/02/03 11:33:44-0530")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetField("MYDATETIME", "2015/02/03 11:33:44+00")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetField("MYDATETIME", "2015/02/03 11:33:44")  # UTC assumed...
+    lyr.CreateFeature(feat)
+    lyr.SyncToDisk()
+
+    with gdaltest.oci_ds.ExecuteSQL(
+        "SELECT MYDATETIME FROM testdate_with_tz"
+    ) as sql_lyr:
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDateTime
+        assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetTZFlag() == ogr.TZFLAG_MIXED_TZ
+        f = sql_lyr.GetNextFeature()
+        assert f.GetField(0) == "2015/02/03 11:33:44.567+0530"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetField(0) == "2015/02/03 11:33:44-0530"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetField(0) == "2015/02/03 11:33:44+00"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetField(0) == "2015/02/03 11:33:44+00"  # UTC assumed...
 
 
 ###############################################################################
diff --git a/doc/source/drivers/vector/oci.rst b/doc/source/drivers/vector/oci.rst
index 764767c2c9d5..2c367b394faf 100644
--- a/doc/source/drivers/vector/oci.rst
+++ b/doc/source/drivers/vector/oci.rst
@@ -288,6 +288,17 @@ The following layer creation options are supported:
       name, it can be supplied with the GEOMETRY_NAME layer creation
       option.
 
+-  .. lco:: TIMESTAMP_WITH_TIME_ZONE
+      :choices: YES, NO
+      :default: NO
+      :since: 3.10.1
+
+      Whether DateTime fields should be created with TIMESTAMP WITH TIME ZONE
+      Oracle type (otherwise without timezone).
+      When creating a field, if it advertises a known or mixed time zone,
+      TIMESTAMP_WITH_TIME_ZONE will default to YES, otherwise it will default to
+      NO.
+
 Layer Open Options
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/ogr/ogrsf_frmts/oci/ogr_oci.h b/ogr/ogrsf_frmts/oci/ogr_oci.h
index 616822136fd7..a8d483ed469b 100644
--- a/ogr/ogrsf_frmts/oci/ogr_oci.h
+++ b/ogr/ogrsf_frmts/oci/ogr_oci.h
@@ -19,6 +19,7 @@
 #include "cpl_error.h"
 
 #include <map>
+#include <set>
 
 /* -------------------------------------------------------------------- */
 /*      Low level Oracle spatial declarations.                          */
@@ -246,6 +247,8 @@ class OGROCILayer CPL_NON_FINAL : public OGRLayer
     char *pszFIDName;
     int iFIDColumn;
 
+    std::set<int> setFieldIndexWithTimeStampWithTZ{};
+
     OGRGeometry *TranslateGeometry();
     OGRGeometry *TranslateGeometryElement(int *piElement, int nGType,
                                           int nDimension, int nEType,
diff --git a/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp b/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp
index b1432a1150a9..80a445636eed 100644
--- a/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp
@@ -107,6 +107,9 @@ void OGROCIDriverSetCommonMetadata(GDALDriver *poDriver)
         "  <Option name='FIRST_ID' type='int' description='First id value'/>"
         "  <Option name='NO_LOGGING' type='boolean' description='Create table "
         "with no_logging parameters' default='NO'/>"
+        "  <Option name='TIMESTAMP_WITH_TIME_ZONE' type='boolean' description='"
+        "Whether DateTime fields should be created with TIMESTAMP WITH TIME "
+        "ZONE Oracle type (otherwise without timezone)'/>"
         "</LayerCreationOptionList>");
 
     poDriver->SetMetadataItem(GDAL_DMD_CREATIONFIELDDATATYPES,
diff --git a/ogr/ogrsf_frmts/oci/ogrocisession.cpp b/ogr/ogrsf_frmts/oci/ogrocisession.cpp
index 3e8950bf4592..a3339bd8e90d 100644
--- a/ogr/ogrsf_frmts/oci/ogrocisession.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocisession.cpp
@@ -496,11 +496,16 @@ CPLErr OGROCISession::GetParamInfo(OCIParam *hParamDesc,
             poOGRDefn->SetType(OFTDate);
             break;
         case SQLT_TIMESTAMP:
+        case SQLT_TIME:
+            poOGRDefn->SetType(OFTDateTime);
+            break;
         case SQLT_TIMESTAMP_TZ:
         case SQLT_TIMESTAMP_LTZ:
-        case SQLT_TIME:
         case SQLT_TIME_TZ:
             poOGRDefn->SetType(OFTDateTime);
+            // Indicates that there's timezones. They might not actually be
+            // mixed !
+            poOGRDefn->SetTZFlag(OGR_TZFLAG_MIXED_TZ);
             break;
 
         case SQLT_RID:
diff --git a/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp b/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp
index 46646fdefe87..cd87bf3f16b4 100644
--- a/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp
@@ -16,6 +16,8 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
+#include <cmath>
+
 static int nDiscarded = 0;
 static int nHits = 0;
 
@@ -283,6 +285,11 @@ OGRFeatureDefn *OGROCITableLayer::ReadTableDefinition(const char *pszTable)
             continue;
         }
 
+        if (oField.GetTZFlag() >= OGR_TZFLAG_MIXED_TZ)
+        {
+            setFieldIndexWithTimeStampWithTZ.insert(poDefn->GetFieldCount());
+        }
+
         poDefn->AddFieldDefn(&oField);
     }
 
@@ -2096,6 +2103,56 @@ OGRErr OGROCITableLayer::BoundCreateFeature(OGRFeature *poFeature)
                 ((char *)papWriteFields[i]) + iCache * nEachBufSize;
             strncpy(pszTarget, pszStrValue, nLen);
             pszTarget[nLen] = '\0';
+
+            if (poFldDefn->GetType() == OFTDateTime &&
+                cpl::contains(setFieldIndexWithTimeStampWithTZ, i))
+            {
+                const auto *psField = poFeature->GetRawFieldRef(i);
+                int nTZHour = 0;
+                int nTZMin = 0;
+                if (psField->Date.TZFlag > OGR_TZFLAG_MIXED_TZ)
+                {
+                    const int nOffset =
+                        (psField->Date.TZFlag - OGR_TZFLAG_UTC) * 15;
+                    nTZHour =
+                        static_cast<int>(nOffset / 60);  // Round towards zero.
+                    nTZMin = std::abs(nOffset - nTZHour * 60);
+                }
+                else
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "DateTime %s has no time zone whereas it should "
+                             "have. Assuming +00:00",
+                             pszTarget);
+                }
+                CPLsnprintf(pszTarget, nEachBufSize,
+                            "%04d-%02d-%02d %02d:%02d:%06.3f %s%02d%02d",
+                            psField->Date.Year, psField->Date.Month,
+                            psField->Date.Day, psField->Date.Hour,
+                            psField->Date.Minute, psField->Date.Second,
+                            (psField->Date.TZFlag <= OGR_TZFLAG_MIXED_TZ ||
+                             psField->Date.TZFlag >= OGR_TZFLAG_UTC)
+                                ? "+"
+                                : "-",
+                            std::abs(nTZHour), nTZMin);
+            }
+            else if (poFldDefn->GetType() == OFTDateTime)
+            {
+                const auto *psField = poFeature->GetRawFieldRef(i);
+                if (psField->Date.TZFlag > OGR_TZFLAG_MIXED_TZ)
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "DateTime %s has a time zone whereas the target "
+                             "field does not support time zone. Time zone will "
+                             "be dropped.",
+                             pszTarget);
+                }
+                CPLsnprintf(pszTarget, nEachBufSize,
+                            "%04d-%02d-%02d %02d:%02d:%06.3f",
+                            psField->Date.Year, psField->Date.Month,
+                            psField->Date.Day, psField->Date.Hour,
+                            psField->Date.Minute, psField->Date.Second);
+            }
         }
     }
 
diff --git a/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp b/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp
index de9bb30d5c71..8f83d7599233 100644
--- a/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp
@@ -291,7 +291,20 @@ OGRErr OGROCIWritableLayer::CreateField(const OGRFieldDefn *poFieldIn,
     }
     else if (oField.GetType() == OFTDateTime)
     {
-        snprintf(szFieldType, sizeof(szFieldType), "TIMESTAMP(3)");
+        const char *pszTIMESTAMP_WITH_TIME_ZONE =
+            CSLFetchNameValue(papszOptions, "TIMESTAMP_WITH_TIME_ZONE");
+        if ((!pszTIMESTAMP_WITH_TIME_ZONE &&
+             oField.GetTZFlag() >= OGR_TZFLAG_MIXED_TZ) ||
+            (pszTIMESTAMP_WITH_TIME_ZONE &&
+             CPLTestBool(pszTIMESTAMP_WITH_TIME_ZONE)))
+        {
+            setFieldIndexWithTimeStampWithTZ.insert(
+                poFeatureDefn->GetFieldCount());
+            snprintf(szFieldType, sizeof(szFieldType),
+                     "TIMESTAMP(3) WITH TIME ZONE");
+        }
+        else
+            snprintf(szFieldType, sizeof(szFieldType), "TIMESTAMP(3)");
     }
     else if (bApproxOK)
     {

From 9ef30ab4be914bd940db33d5799349e98a9389dd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 24 Nov 2024 16:51:55 +0100
Subject: [PATCH 13/21] GDALContourGenerateEx(): return CE_None even if the
 raster is at constant value

Fixes 3.10.0 regression
Fixes #11340
---
 alg/contour.cpp         |  7 ++++++-
 autotest/alg/contour.py | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/alg/contour.cpp b/alg/contour.cpp
index 9c74574b1a95..e2081cbb7121 100644
--- a/alg/contour.cpp
+++ b/alg/contour.cpp
@@ -710,7 +710,7 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
         }
     }
 
-    bool ok = false;
+    bool ok = true;
 
     try
     {
@@ -880,6 +880,11 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
         }
     }
 
+    if (ok)
+    {
+        pfnProgress(1.0, "", pProgressArg);
+    }
+
     return ok ? CE_None : CE_Failure;
 }
 
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index ef0493f67284..65f563e70ace 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -446,3 +446,28 @@ def test_contour_min_value_is_multiple_of_interval(tmp_vsimem):
     f = lyr.GetNextFeature()
     assert f["ELEV"] == 3
     ogrtest.check_feature_geometry(f, "LINESTRING (1.5 0.0,1.5 0.5,1.5 1.5,1.5 2.0)")
+
+
+###############################################################################
+# Test scenario of https://github.com/OSGeo/gdal/issues/11340
+
+
+def test_contour_constant_raster_value(tmp_vsimem):
+
+    ogr_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    lyr = ogr_ds.CreateLayer("contour", geom_type=ogr.wkbLineString)
+    lyr.CreateField(ogr.FieldDefn("ID", ogr.OFTInteger))
+    lyr.CreateField(ogr.FieldDefn("ELEV", ogr.OFTReal))
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    assert (
+        gdal.ContourGenerateEx(
+            src_ds.GetRasterBand(1),
+            lyr,
+            options=["LEVEL_INTERVAL=10", "ID_FIELD=0", "ELEV_FIELD=1"],
+        )
+        == gdal.CE_None
+    )
+
+    f = lyr.GetNextFeature()
+    assert f is None

From c6c1a9b04e68dd295186ffe46c301937568daa89 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 24 Nov 2024 19:03:45 +0100
Subject: [PATCH 14/21] Remove lines with '$Id$' in source files

This dates back to Subversion times where they were substituted with the
Subversion revision number.
---
 apps/commonutils.h                            |   1 -
 apps/gdal_utils.h                             |   1 -
 apps/gdal_utils_priv.h                        |   1 -
 autotest/alg/applyverticalshiftgrid.py        |   1 -
 autotest/alg/contour.py                       |   1 -
 autotest/alg/cutline.py                       |   1 -
 autotest/alg/dither.py                        |   1 -
 autotest/alg/fillnodata.py                    |   1 -
 autotest/alg/los.py                           |   1 -
 autotest/alg/polygonize.py                    |   1 -
 autotest/alg/proximity.py                     |   1 -
 autotest/alg/rasterize.py                     |   1 -
 autotest/alg/reproject.py                     |   1 -
 autotest/alg/sieve.py                         |   1 -
 autotest/alg/transformgeoloc.py               |   1 -
 autotest/alg/warp.py                          |   1 -
 autotest/benchmark/conftest.py                |   1 -
 autotest/benchmark/test_gdalwarp.py           |   1 -
 autotest/benchmark/test_gtiff.py              |   1 -
 autotest/benchmark/test_ogr2ogr.py            |   1 -
 autotest/benchmark/test_ogr_gpkg.py           |   1 -
 autotest/cpp/bug1488.cpp                      |   1 -
 autotest/cpp/test_alg.cpp                     |   1 -
 autotest/cpp/test_deferred_plugin.cpp         |   1 -
 .../cpp/test_marching_squares_contour.cpp     |   1 -
 .../cpp/test_marching_squares_polygon.cpp     |   1 -
 autotest/cpp/test_marching_squares_square.cpp |   1 -
 autotest/cpp/test_marching_squares_tile.cpp   |   1 -
 .../cpp/test_osr_set_proj_search_paths.cpp    |   1 -
 autotest/cpp/test_triangulation.cpp           |   1 -
 autotest/cpp/testblockcache.cpp               |   1 -
 autotest/cpp/testblockcachelimits.cpp         |   1 -
 autotest/cpp/testblockcachewrite.cpp          |   1 -
 autotest/cpp/testclosedondestroydm.cpp        |   1 -
 autotest/cpp/testcopywords.cpp                |   1 -
 autotest/cpp/testdestroy.cpp                  |   1 -
 autotest/cpp/testlog.cpp                      |   1 -
 autotest/cpp/testthreadcond.cpp               |   1 -
 autotest/cpp/testvirtualmem.cpp               |   1 -
 autotest/gcore/asyncreader.py                 |   1 -
 autotest/gcore/basic_test.py                  |   1 -
 autotest/gcore/basic_test_subprocess.py       |   1 -
 autotest/gcore/bmp_read.py                    |   1 -
 autotest/gcore/bmp_write.py                   |   1 -
 autotest/gcore/cog.py                         |   1 -
 autotest/gcore/colortable.py                  |   1 -
 autotest/gcore/envi_read.py                   |   1 -
 autotest/gcore/gdal_stats.py                  |   1 -
 autotest/gcore/geoloc.py                      |   1 -
 autotest/gcore/gtiff_subdatasetinfo.py        |   1 -
 autotest/gcore/gtiff_write.py                 |   1 -
 autotest/gcore/hdf4_read.py                   |   1 -
 autotest/gcore/hdf4_write.py                  |   1 -
 autotest/gcore/hdf4multidim.py                |   1 -
 autotest/gcore/hfa_read.py                    |   1 -
 autotest/gcore/hfa_rfc40.py                   |   1 -
 autotest/gcore/hfa_srs.py                     |   1 -
 autotest/gcore/hfa_write.py                   |   1 -
 autotest/gcore/identify.py                    |   1 -
 autotest/gcore/interpolateatpoint.py          |   1 -
 autotest/gcore/mask.py                        |   1 -
 autotest/gcore/minixml.py                     |   1 -
 autotest/gcore/misc.py                        |   1 -
 autotest/gcore/multidim.py                    |   1 -
 autotest/gcore/nodatamaskband.py              |   1 -
 autotest/gcore/numpy_rw.py                    |   1 -
 autotest/gcore/numpy_rw_multidim.py           |   1 -
 autotest/gcore/overviewds.py                  |   1 -
 autotest/gcore/pam.py                         |   1 -
 autotest/gcore/pamproxydb.py                  |   1 -
 autotest/gcore/pixfun.py                      |   1 -
 autotest/gcore/pnm_read.py                    |   1 -
 autotest/gcore/pnm_write.py                   |   1 -
 autotest/gcore/rasterio.py                    |   1 -
 autotest/gcore/rat.py                         |   1 -
 autotest/gcore/relationship.py                |   1 -
 autotest/gcore/rfc30.py                       |   1 -
 autotest/gcore/test_driver_metadata.py        |   1 -
 autotest/gcore/testnonboundtoswig.py          |   1 -
 autotest/gcore/thread_test.py                 |   1 -
 autotest/gcore/tiff_ovr.py                    |   1 -
 autotest/gcore/tiff_read.py                   |   1 -
 autotest/gcore/tiff_read_subifds.py           |   1 -
 autotest/gcore/tiff_srs.py                    |   1 -
 autotest/gcore/tiff_write.py                  |   1 -
 autotest/gcore/transformer.py                 |   1 -
 autotest/gcore/virtualmem.py                  |   1 -
 autotest/gcore/vrt_read.py                    |   1 -
 autotest/gcore/vrtmisc.py                     |   1 -
 autotest/gcore/vsi7z.py                       |   1 -
 autotest/gcore/vsiadls.py                     |   1 -
 autotest/gcore/vsiadls_real_instance.py       |   1 -
 autotest/gcore/vsiaz.py                       |   1 -
 autotest/gcore/vsiaz_real_instance_auto.py    |   1 -
 autotest/gcore/vsiaz_real_instance_manual.py  |   1 -
 autotest/gcore/vsicached.py                   |   1 -
 autotest/gcore/vsicrypt.py                    |   1 -
 autotest/gcore/vsicurl.py                     |   1 -
 autotest/gcore/vsicurl_streaming.py           |   1 -
 autotest/gcore/vsifile.py                     |   1 -
 autotest/gcore/vsigs.py                       |   1 -
 autotest/gcore/vsihdfs.py                     |   1 -
 autotest/gcore/vsioss.py                      |   1 -
 autotest/gcore/vsipathspecificoption.py       |   1 -
 autotest/gcore/vsirar.py                      |   1 -
 autotest/gcore/vsis3.py                       |   1 -
 autotest/gcore/vsistdin.py                    |   1 -
 autotest/gcore/vsiswift.py                    |   1 -
 autotest/gcore/vsiwebhdfs.py                  |   1 -
 autotest/gcore/vsizip.py                      |   1 -
 autotest/gdrivers/aaigrid.py                  |   1 -
 autotest/gdrivers/ace2.py                     |   1 -
 autotest/gdrivers/adrg.py                     |   1 -
 autotest/gdrivers/aigrid.py                   |   1 -
 autotest/gdrivers/bag.py                      |   1 -
 autotest/gdrivers/basisu.py                   |   1 -
 autotest/gdrivers/blx.py                      |   1 -
 autotest/gdrivers/bsb.py                      |   1 -
 autotest/gdrivers/bt.py                       |   1 -
 autotest/gdrivers/byn.py                      |   1 -
 autotest/gdrivers/cals.py                     |   1 -
 autotest/gdrivers/ceos.py                     |   1 -
 autotest/gdrivers/cpg.py                      |   1 -
 autotest/gdrivers/ctg.py                      |   1 -
 autotest/gdrivers/daas.py                     |   1 -
 autotest/gdrivers/daas_real_instance.py       |   1 -
 .../data/bag/generate_test_georef_metadata.py |   1 -
 .../data/bag/generate_test_interpolated.py    |   1 -
 autotest/gdrivers/data/s102/generate_test.py  |   1 -
 autotest/gdrivers/data/s104/generate_test.py  |   1 -
 autotest/gdrivers/data/s111/generate_test.py  |   1 -
 .../gdrivers/data/zarr/generate_test_files.py |   1 -
 autotest/gdrivers/dds.py                      |   1 -
 autotest/gdrivers/derived.py                  |   1 -
 autotest/gdrivers/dimap.py                    |   1 -
 autotest/gdrivers/dipex.py                    |   1 -
 autotest/gdrivers/doq1.py                     |   1 -
 autotest/gdrivers/doq2.py                     |   1 -
 autotest/gdrivers/dted.py                     |   1 -
 autotest/gdrivers/ecrgtoc.py                  |   1 -
 autotest/gdrivers/ecw.py                      |   1 -
 autotest/gdrivers/eedai.py                    |   1 -
 autotest/gdrivers/ehdr.py                     |   1 -
 autotest/gdrivers/eir.py                      |   1 -
 autotest/gdrivers/elas.py                     |   1 -
 autotest/gdrivers/envi.py                     |   1 -
 autotest/gdrivers/envisat.py                  |   1 -
 autotest/gdrivers/ers.py                      |   1 -
 autotest/gdrivers/exr.py                      |   1 -
 autotest/gdrivers/fast.py                     |   1 -
 autotest/gdrivers/fit.py                      |   1 -
 autotest/gdrivers/fits.py                     |   1 -
 autotest/gdrivers/gdalhttp.py                 |   1 -
 autotest/gdrivers/genbin.py                   |   1 -
 autotest/gdrivers/generate_fits.py            |   1 -
 autotest/gdrivers/georaster.py                |   1 -
 autotest/gdrivers/gff.py                      |   1 -
 autotest/gdrivers/gif.py                      |   1 -
 autotest/gdrivers/gpkg.py                     |   1 -
 autotest/gdrivers/grassasciigrid.py           |   1 -
 autotest/gdrivers/grib.py                     |   1 -
 autotest/gdrivers/gribmultidim.py             |   1 -
 autotest/gdrivers/gsc.py                      |   1 -
 autotest/gdrivers/gsg.py                      |   1 -
 autotest/gdrivers/gta.py                      |   1 -
 autotest/gdrivers/gti.py                      |   1 -
 autotest/gdrivers/gxf.py                      |   1 -
 autotest/gdrivers/hdf5.py                     |   1 -
 autotest/gdrivers/hdf5multidim.py             |   1 -
 autotest/gdrivers/heif.py                     |   1 -
 autotest/gdrivers/hf2.py                      |   1 -
 autotest/gdrivers/hfa.py                      |   1 -
 autotest/gdrivers/idrisi.py                   |   1 -
 autotest/gdrivers/ilwis.py                    |   1 -
 autotest/gdrivers/iris.py                     |   1 -
 autotest/gdrivers/isce.py                     |   1 -
 autotest/gdrivers/isg.py                      |   1 -
 autotest/gdrivers/isis.py                     |   1 -
 autotest/gdrivers/isis2.py                    |   1 -
 autotest/gdrivers/jdem.py                     |   1 -
 autotest/gdrivers/jp2kak.py                   |   1 -
 autotest/gdrivers/jp2metadata.py              |   1 -
 autotest/gdrivers/jp2openjpeg.py              |   1 -
 autotest/gdrivers/jpeg.py                     |   1 -
 autotest/gdrivers/jpeg_profile.py             |   1 -
 autotest/gdrivers/jpegxl.py                   |   1 -
 autotest/gdrivers/kmlsuperoverlay.py          |   1 -
 autotest/gdrivers/kro.py                      |   1 -
 autotest/gdrivers/ktx2.py                     |   1 -
 autotest/gdrivers/l1b.py                      |   1 -
 autotest/gdrivers/lan.py                      |   1 -
 autotest/gdrivers/lcp.py                      |   1 -
 autotest/gdrivers/leveller.py                 |   1 -
 autotest/gdrivers/loslas.py                   |   1 -
 autotest/gdrivers/mbtiles.py                  |   1 -
 autotest/gdrivers/mem.py                      |   1 -
 autotest/gdrivers/memmultidim.py              |   1 -
 autotest/gdrivers/mff.py                      |   1 -
 autotest/gdrivers/mff2.py                     |   1 -
 autotest/gdrivers/mrf.py                      |   1 -
 autotest/gdrivers/mrsid.py                    |   1 -
 autotest/gdrivers/ndf.py                      |   1 -
 autotest/gdrivers/netcdf.py                   |   1 -
 autotest/gdrivers/netcdf_cf.py                |   1 -
 autotest/gdrivers/netcdf_multidim.py          |   1 -
 .../gdrivers/netcdf_multidim_pamproxydb.py    |   1 -
 autotest/gdrivers/ngsgeoid.py                 |   1 -
 autotest/gdrivers/ngw.py                      |   1 -
 autotest/gdrivers/nitf.py                     |   1 -
 autotest/gdrivers/noaa_b.py                   |   1 -
 autotest/gdrivers/nsidcbin.py                 |   1 -
 autotest/gdrivers/ntv2.py                     |   1 -
 autotest/gdrivers/nwt_grc.py                  |   1 -
 autotest/gdrivers/nwt_grd.py                  |   1 -
 autotest/gdrivers/ogcapi.py                   |   1 -
 autotest/gdrivers/ozi.py                      |   1 -
 autotest/gdrivers/paux.py                     |   1 -
 autotest/gdrivers/pcidsk.py                   |   1 -
 autotest/gdrivers/pcraster.py                 |   1 -
 autotest/gdrivers/pdf.py                      |   1 -
 autotest/gdrivers/pds.py                      |   1 -
 autotest/gdrivers/pds4.py                     |   1 -
 autotest/gdrivers/plmosaic.py                 |   1 -
 autotest/gdrivers/png.py                      |   1 -
 autotest/gdrivers/png_profile.py              |   1 -
 autotest/gdrivers/pnm.py                      |   1 -
 autotest/gdrivers/postgisraster.py            |   1 -
 autotest/gdrivers/r.py                        |   1 -
 autotest/gdrivers/rasterlite.py               |   1 -
 autotest/gdrivers/rcm.py                      |   1 -
 autotest/gdrivers/rik.py                      |   1 -
 autotest/gdrivers/rl2.py                      |   1 -
 autotest/gdrivers/rmf.py                      |   1 -
 autotest/gdrivers/roipac.py                   |   1 -
 autotest/gdrivers/rpftoc.py                   |   1 -
 autotest/gdrivers/rraster.py                  |   1 -
 autotest/gdrivers/rs2.py                      |   1 -
 autotest/gdrivers/s102.py                     |   1 -
 autotest/gdrivers/s104.py                     |   1 -
 autotest/gdrivers/s111.py                     |   1 -
 autotest/gdrivers/safe.py                     |   1 -
 autotest/gdrivers/saga.py                     |   1 -
 autotest/gdrivers/sar_ceos.py                 |   1 -
 autotest/gdrivers/sdts.py                     |   1 -
 autotest/gdrivers/sentinel2.py                |   1 -
 autotest/gdrivers/sgi.py                      |   1 -
 autotest/gdrivers/sigdem.py                   |   1 -
 autotest/gdrivers/snodas.py                   |   1 -
 autotest/gdrivers/srp.py                      |   1 -
 autotest/gdrivers/srtmhgt.py                  |   1 -
 autotest/gdrivers/stacit.py                   |   1 -
 autotest/gdrivers/stacta.py                   |   1 -
 autotest/gdrivers/test_validate_jp2.py        |   1 -
 autotest/gdrivers/tga.py                      |   1 -
 autotest/gdrivers/tiff_profile.py             |   1 -
 autotest/gdrivers/til.py                      |   1 -
 autotest/gdrivers/tiledb_multidim.py          |   1 -
 autotest/gdrivers/tiledb_read.py              |   1 -
 autotest/gdrivers/tiledb_write.py             |   1 -
 autotest/gdrivers/usgsdem.py                  |   1 -
 autotest/gdrivers/vicar.py                    |   1 -
 autotest/gdrivers/vrtderived.py               |   1 -
 autotest/gdrivers/vrtfilt.py                  |   1 -
 autotest/gdrivers/vrtlut.py                   |   1 -
 autotest/gdrivers/vrtmask.py                  |   1 -
 autotest/gdrivers/vrtmultidim.py              |   1 -
 autotest/gdrivers/vrtovr.py                   |   1 -
 autotest/gdrivers/vrtpansharpen.py            |   1 -
 autotest/gdrivers/vrtrawlink.py               |   1 -
 autotest/gdrivers/vrtwarp.py                  |   1 -
 autotest/gdrivers/wcs.py                      |   1 -
 autotest/gdrivers/webp.py                     |   1 -
 autotest/gdrivers/wms.py                      |   1 -
 autotest/gdrivers/wmts.py                     |   1 -
 autotest/gdrivers/xmp.py                      |   1 -
 autotest/gdrivers/xpm.py                      |   1 -
 autotest/gdrivers/xyz.py                      |   1 -
 autotest/gdrivers/zarr_driver.py              |   1 -
 autotest/gdrivers/zmap.py                     |   1 -
 autotest/generate_parquet_test_file.py        |   1 -
 autotest/gnm/gnm_test.py                      |   1 -
 .../kml_generate_test_files.py                |   1 -
 autotest/ogr/ogr_adbc.py                      |   1 -
 autotest/ogr/ogr_aivector.py                  |   1 -
 autotest/ogr/ogr_arrow.py                     |   1 -
 autotest/ogr/ogr_as_sqlite_extension.py       |   1 -
 autotest/ogr/ogr_avc.py                       |   1 -
 autotest/ogr/ogr_basic_test.py                |   1 -
 autotest/ogr/ogr_carto.py                     |   1 -
 autotest/ogr/ogr_csv.py                       |   1 -
 autotest/ogr/ogr_csw.py                       |   1 -
 autotest/ogr/ogr_db2_hack.py                  |   1 -
 autotest/ogr/ogr_dgn.py                       |   1 -
 autotest/ogr/ogr_dgnv8.py                     |   1 -
 autotest/ogr/ogr_dwg.py                       |   1 -
 autotest/ogr/ogr_dxf.py                       |   1 -
 autotest/ogr/ogr_edigeo.py                    |   1 -
 autotest/ogr/ogr_eeda.py                      |   1 -
 autotest/ogr/ogr_elasticsearch.py             |   1 -
 autotest/ogr/ogr_esrijson.py                  |   1 -
 autotest/ogr/ogr_factory.py                   |   1 -
 autotest/ogr/ogr_fgdb.py                      |   1 -
 autotest/ogr/ogr_fgdb_stress_test.py          |   1 -
 autotest/ogr/ogr_fielddomain.py               |   1 -
 autotest/ogr/ogr_flatgeobuf.py                |   1 -
 autotest/ogr/ogr_geoconcept.py                |   1 -
 autotest/ogr/ogr_geojson.py                   |   1 -
 autotest/ogr/ogr_geojsonseq.py                |   1 -
 autotest/ogr/ogr_geom.py                      |   1 -
 autotest/ogr/ogr_geos.py                      |   1 -
 autotest/ogr/ogr_gml.py                       |   1 -
 autotest/ogr/ogr_gml_fgd_read.py              |   1 -
 autotest/ogr/ogr_gml_geom.py                  |   1 -
 autotest/ogr/ogr_gmlas.py                     |   1 -
 autotest/ogr/ogr_gmt.py                       |   1 -
 autotest/ogr/ogr_gpkg.py                      |   1 -
 autotest/ogr/ogr_gpsbabel.py                  |   1 -
 autotest/ogr/ogr_gpx.py                       |   1 -
 autotest/ogr/ogr_gtfs.py                      |   1 -
 autotest/ogr/ogr_hana.py                      |   1 -
 autotest/ogr/ogr_idrisi.py                    |   1 -
 autotest/ogr/ogr_ili.py                       |   1 -
 autotest/ogr/ogr_index_test.py                |   1 -
 autotest/ogr/ogr_jml.py                       |   1 -
 autotest/ogr/ogr_join_test.py                 |   1 -
 autotest/ogr/ogr_jsonfg.py                    |   1 -
 autotest/ogr/ogr_kml.py                       |   1 -
 autotest/ogr/ogr_libkml.py                    |   1 -
 autotest/ogr/ogr_lvbag.py                     |   1 -
 autotest/ogr/ogr_mapml.py                     |   1 -
 autotest/ogr/ogr_mem.py                       |   1 -
 autotest/ogr/ogr_miramon_vector.py            |   1 -
 autotest/ogr/ogr_mitab.py                     |   1 -
 autotest/ogr/ogr_mongodbv3.py                 |   1 -
 autotest/ogr/ogr_mssqlspatial.py              |   1 -
 autotest/ogr/ogr_mvt.py                       |   1 -
 autotest/ogr/ogr_mysql.py                     |   1 -
 autotest/ogr/ogr_nas.py                       |   1 -
 autotest/ogr/ogr_ntf.py                       |   1 -
 autotest/ogr/ogr_oapif.py                     |   1 -
 autotest/ogr/ogr_oci.py                       |   1 -
 autotest/ogr/ogr_odbc.py                      |   1 -
 autotest/ogr/ogr_ods.py                       |   1 -
 autotest/ogr/ogr_ogdi.py                      |   1 -
 autotest/ogr/ogr_ogrtest.py                   |   1 -
 autotest/ogr/ogr_openfilegdb.py               |   1 -
 autotest/ogr/ogr_openfilegdb_write.py         |   1 -
 autotest/ogr/ogr_osm.py                       |   1 -
 autotest/ogr/ogr_parquet.py                   |   1 -
 autotest/ogr/ogr_pcidsk.py                    |   1 -
 autotest/ogr/ogr_pdf.py                       |   1 -
 autotest/ogr/ogr_pds.py                       |   1 -
 autotest/ogr/ogr_pds4.py                      |   1 -
 autotest/ogr/ogr_pg.py                        |   1 -
 autotest/ogr/ogr_pgdump.py                    |   1 -
 autotest/ogr/ogr_pgeo.py                      |   1 -
 autotest/ogr/ogr_plscenes.py                  |   1 -
 autotest/ogr/ogr_pmtiles.py                   |   1 -
 autotest/ogr/ogr_pythondrivers.py             |   1 -
 autotest/ogr/ogr_refcount.py                  |   1 -
 autotest/ogr/ogr_rfc30.py                     |   1 -
 autotest/ogr/ogr_rfc35.py                     |   1 -
 autotest/ogr/ogr_rfc41.py                     |   1 -
 autotest/ogr/ogr_s57.py                       |   1 -
 autotest/ogr/ogr_sdts.py                      |   1 -
 autotest/ogr/ogr_shape.py                     |   1 -
 autotest/ogr/ogr_shape_qix.py                 |   1 -
 autotest/ogr/ogr_shape_sbn.py                 |   1 -
 autotest/ogr/ogr_sosi.py                      |   1 -
 autotest/ogr/ogr_sql_rfc28.py                 |   1 -
 autotest/ogr/ogr_sql_sqlite.py                |   1 -
 autotest/ogr/ogr_sql_test.py                  |   1 -
 autotest/ogr/ogr_sqlite.py                    |   1 -
 autotest/ogr/ogr_style.py                     |   1 -
 autotest/ogr/ogr_svg.py                       |   1 -
 autotest/ogr/ogr_tiger.py                     |   1 -
 autotest/ogr/ogr_tiledb.py                    |   1 -
 autotest/ogr/ogr_topojson.py                  |   1 -
 autotest/ogr/ogr_vdv.py                       |   1 -
 autotest/ogr/ogr_vfk.py                       |   1 -
 autotest/ogr/ogr_virtualogr.py                |   1 -
 autotest/ogr/ogr_vrt.py                       |   1 -
 autotest/ogr/ogr_wfs.py                       |   1 -
 autotest/ogr/ogr_wkbwkt_geom.py               |   1 -
 autotest/ogr/ogr_wktempty.py                  |   1 -
 autotest/ogr/ogr_xls.py                       |   1 -
 autotest/ogr/ogr_xlsx.py                      |   1 -
 autotest/ogr/ograpispy.py                     |   1 -
 autotest/osr/osr_basic.py                     |   1 -
 autotest/osr/osr_basic_subprocess.py          |   1 -
 autotest/osr/osr_cf1.py                       |   1 -
 autotest/osr/osr_compd.py                     |   1 -
 autotest/osr/osr_ct.py                        |   1 -
 autotest/osr/osr_ct_proj.py                   |   1 -
 autotest/osr/osr_epsg.py                      |   1 -
 autotest/osr/osr_erm.py                       |   1 -
 autotest/osr/osr_esri.py                      |   1 -
 autotest/osr/osr_micoordsys.py                |   1 -
 autotest/osr/osr_ozi.py                       |   1 -
 autotest/osr/osr_pci.py                       |   1 -
 autotest/osr/osr_pm.py                        |   1 -
 autotest/osr/osr_proj4.py                     |   1 -
 autotest/osr/osr_url.py                       |   1 -
 autotest/osr/osr_usgs.py                      |   1 -
 autotest/osr/osr_validate.py                  |   1 -
 autotest/osr/osr_xml.py                       |   1 -
 autotest/pymod/gdaltest.py                    |   1 -
 autotest/pymod/ogrtest.py                     |   1 -
 autotest/pymod/test_cli_utilities.py          |   1 -
 autotest/pymod/test_py_scripts.py             |   1 -
 autotest/pymod/uffd.py                        |   1 -
 autotest/pymod/webserver.py                   |   1 -
 .../test_add_alpha_band_to_string_vrt.py      |   1 -
 .../test_add_gdal_warp_options_to_string.py   |   1 -
 autotest/pyscripts/gdal2tiles/test_logger.py  |   1 -
 .../gdal2tiles/test_nb_data_bands.py          |   1 -
 .../gdal2tiles/test_option_parser.py          |   1 -
 .../gdal2tiles/test_reproject_dataset.py      |   1 -
 .../gdal2tiles/test_setup_input_srs.py        |   1 -
 .../gdal2tiles/test_setup_no_data_value.py    |   1 -
 ...update_alpha_value_for_non_alpha_inputs.py |   1 -
 autotest/pyscripts/gdal2tiles/test_vsimem.py  |   1 -
 autotest/pyscripts/test_gdal2tiles.py         |   1 -
 autotest/pyscripts/test_gdal_edit.py          |   1 -
 autotest/pyscripts/test_gdal_fillnodata.py    |   1 -
 autotest/pyscripts/test_gdal_ls_py.py         |   1 -
 autotest/pyscripts/test_gdal_merge.py         |   1 -
 autotest/pyscripts/test_gdal_pansharpen.py    |   1 -
 autotest/pyscripts/test_gdal_polygonize.py    |   1 -
 autotest/pyscripts/test_gdal_proximity.py     |   1 -
 autotest/pyscripts/test_gdal_retile.py        |   1 -
 autotest/pyscripts/test_gdal_sieve.py         |   1 -
 autotest/pyscripts/test_gdalattachpct.py      |   1 -
 autotest/pyscripts/test_gdalbuildvrtofvrt.py  |   1 -
 autotest/pyscripts/test_gdalcompare.py        |   1 -
 autotest/pyscripts/test_gdalinfo_py.py        |   1 -
 .../pyscripts/test_gdallocationinfo_py.py     |   1 -
 autotest/pyscripts/test_gdalmove.py           |   1 -
 autotest/pyscripts/test_ogr_layer_algebra.py  |   1 -
 autotest/pyscripts/test_ogrinfo_py.py         |   1 -
 autotest/pyscripts/test_ogrmerge.py           |   1 -
 autotest/pyscripts/test_pct.py                |   1 -
 .../pyscripts/test_validate_geoparquet.py     |   1 -
 autotest/slow_tests/raster.py                 |   1 -
 autotest/test_random_tiff.py                  |   1 -
 autotest/utilities/test_gdal_contour.py       |   1 -
 autotest/utilities/test_gdal_create.py        |   1 -
 autotest/utilities/test_gdal_footprint.py     |   1 -
 autotest/utilities/test_gdal_footprint_lib.py |   1 -
 autotest/utilities/test_gdal_grid.py          |   1 -
 autotest/utilities/test_gdal_grid_lib.py      |   1 -
 autotest/utilities/test_gdal_rasterize.py     |   1 -
 autotest/utilities/test_gdal_rasterize_lib.py |   1 -
 autotest/utilities/test_gdal_translate.py     |   1 -
 autotest/utilities/test_gdal_translate_lib.py |   1 -
 autotest/utilities/test_gdal_viewshed.py      |   1 -
 autotest/utilities/test_gdaladdo.py           |   1 -
 autotest/utilities/test_gdalbuildvrt.py       |   1 -
 autotest/utilities/test_gdalbuildvrt_lib.py   |   1 -
 autotest/utilities/test_gdaldem.py            |   1 -
 autotest/utilities/test_gdaldem_lib.py        |   1 -
 autotest/utilities/test_gdalinfo.py           |   1 -
 autotest/utilities/test_gdalinfo_lib.py       |   1 -
 autotest/utilities/test_gdallocationinfo.py   |   1 -
 autotest/utilities/test_gdalmanage.py         |   1 -
 autotest/utilities/test_gdalmdiminfo.py       |   1 -
 autotest/utilities/test_gdalmdiminfo_lib.py   |   1 -
 autotest/utilities/test_gdalmdimtranslate.py  |   1 -
 .../utilities/test_gdalmdimtranslate_lib.py   |   1 -
 autotest/utilities/test_gdalsrsinfo.py        |   1 -
 autotest/utilities/test_gdaltindex.py         |   1 -
 autotest/utilities/test_gdaltindex_lib.py     |   1 -
 autotest/utilities/test_gdaltransform.py      |   1 -
 autotest/utilities/test_gdalwarp.py           |   1 -
 autotest/utilities/test_gdalwarp_lib.py       |   1 -
 autotest/utilities/test_gnmutils.py           |   1 -
 autotest/utilities/test_nearblack.py          |   1 -
 autotest/utilities/test_nearblack_lib.py      |   1 -
 autotest/utilities/test_ogr2ogr.py            |   1 -
 autotest/utilities/test_ogr2ogr_lib.py        |   1 -
 autotest/utilities/test_ogrinfo.py            |   1 -
 autotest/utilities/test_ogrtindex.py          |   1 -
 autotest/utilities/test_sozip.py              |   1 -
 frmts/aaigrid/aaigriddataset.h                |   1 -
 frmts/aigrid/aigccitt.c                       |   1 -
 frmts/aigrid/aigopen.c                        |   1 -
 frmts/aigrid/aigrid.h                         |   1 -
 frmts/aigrid/aitest.c                         |   1 -
 frmts/aigrid/gridlib.c                        |   1 -
 frmts/bsb/bsb2raw.c                           |   1 -
 frmts/bsb/bsb_read.c                          |   1 -
 frmts/bsb/bsb_read.h                          |   1 -
 frmts/ceos/ceosopen.c                         |   1 -
 frmts/ceos/ceosopen.h                         |   1 -
 frmts/ceos/ceostest.c                         |   1 -
 frmts/ceos2/ceos.c                            |   1 -
 frmts/ceos2/ceos.h                            |   1 -
 frmts/ceos2/ceosrecipe.c                      |   1 -
 frmts/ceos2/ceossar.c                         |   1 -
 frmts/ceos2/link.c                            |   1 -
 frmts/dted/dted_api.c                         |   1 -
 frmts/dted/dted_api.h                         |   1 -
 frmts/dted/dted_create.c                      |   1 -
 frmts/dted/dted_ptstream.c                    |   1 -
 frmts/dted/dted_test.c                        |   1 -
 frmts/ecw/gdal_ecw.h                          |   1 -
 frmts/ecw/lookup.py                           |   2 -
 frmts/envisat/EnvisatFile.c                   |   1 -
 frmts/envisat/EnvisatFile.h                   |   1 -
 frmts/envisat/adsrange.hpp                    |   2 -
 frmts/envisat/dumpgeo.c                       |   1 -
 frmts/envisat/envisat_dump.c                  |   1 -
 frmts/envisat/records.c                       |   1 -
 frmts/envisat/records.h                       |   1 -
 frmts/envisat/timedelta.hpp                   |   2 -
 frmts/fit/fit.h                               |   1 -
 frmts/fit/gstEndian.h                         |   1 -
 frmts/fit/gstTypes.h                          |   1 -
 frmts/gif/gifabstractdataset.h                |   1 -
 frmts/grib/gribdataset.h                      |   1 -
 frmts/gti/data/gdaltileindex.xsd              |   2 -
 frmts/gtiff/gt_citation.h                     |   1 -
 frmts/gtiff/gt_jpeg_copy.h                    |   1 -
 frmts/gtiff/gt_overview.h                     |   1 -
 frmts/gtiff/gt_wkt_srs.h                      |   1 -
 frmts/gtiff/gt_wkt_srs_for_gdal.h             |   1 -
 frmts/gtiff/gt_wkt_srs_priv.h                 |   1 -
 frmts/gtiff/gtiff.h                           |   1 -
 frmts/gtiff/libgeotiff/geo_extra.c            |   1 -
 frmts/gtiff/libgeotiff/geo_normalize.c        |   1 -
 frmts/gtiff/libgeotiff/geo_normalize.h        |   1 -
 frmts/gtiff/libgeotiff/geo_trans.c            |   1 -
 frmts/gtiff/libgeotiff/geotiff_proj4.c        |   1 -
 frmts/gtiff/libtiff/tif_hash_set.h            |   1 -
 frmts/gtiff/libtiff/tif_vsi.c                 |   1 -
 frmts/gtiff/tifvsi.h                          |   1 -
 frmts/gxf/gxf_ogcwkt.c                        |   1 -
 frmts/gxf/gxf_proj4.c                         |   1 -
 frmts/gxf/gxfopen.c                           |   1 -
 frmts/gxf/gxfopen.h                           |   1 -
 frmts/hdf4/hdf-eos/EHapi.c                    |   1 -
 frmts/hdf4/hdf-eos/GDapi.c                    |   1 -
 frmts/hdf4/hdf-eos/HdfEosDef.h                |   1 -
 frmts/hdf4/hdf-eos/SWapi.c                    |   1 -
 frmts/hdf4/hdf-eos/gctp_wrap.c                |   1 -
 frmts/hdf4/hdf4compat.h                       |   1 -
 frmts/hdf4/hdf4dataset.h                      |   1 -
 frmts/hdf5/gh5_convenience.h                  |   1 -
 frmts/hdf5/hdf5_api.h                         |   1 -
 frmts/hdf5/hdf5dataset.h                      |   1 -
 frmts/hdf5/hdf5eosparser.cpp                  |   1 -
 frmts/hdf5/hdf5eosparser.h                    |   1 -
 frmts/hfa/hfa.h                               |   1 -
 frmts/hfa/hfa_p.h                             |   1 -
 frmts/idrisi/idrisi.h                         |   1 -
 frmts/iso8211/iso8211.h                       |   1 -
 frmts/jp2kak/jp2kakdataset.h                  |   2 -
 frmts/jp2kak/subfile_source.h                 |   1 -
 frmts/jp2kak/vsil_target.h                    |   1 -
 frmts/jpeg/jpgdataset_12.cpp                  |   1 -
 frmts/jpeg/vsidataio.h                        |   1 -
 frmts/jpeg/vsidataio_12.cpp                   |   1 -
 frmts/jpipkak/jpipkakdataset.h                |   1 -
 frmts/kea/keaband.h                           |   1 -
 frmts/kea/keacopy.h                           |   1 -
 frmts/kea/keadataset.h                        |   1 -
 frmts/kea/keamaskband.h                       |   1 -
 frmts/kea/keaoverview.h                       |   1 -
 frmts/kea/kearat.h                            |   1 -
 .../kmlsuperoverlay/kmlsuperoverlaydataset.h  |   1 -
 frmts/mem/memdataset.h                        |   1 -
 frmts/msg/msgcommand.h                        |   1 -
 frmts/msg/msgdataset.h                        |   1 -
 frmts/msg/prologue.h                          |   1 -
 frmts/msg/reflectancecalculator.h             |   1 -
 frmts/msgn/msg_basic_types.h                  |   1 -
 frmts/msgn/msg_reader_core.h                  |   1 -
 frmts/netcdf/data/netcdf_config.xsd           |   2 -
 frmts/netcdf/netcdf_cf_constants.h            |   1 -
 frmts/netcdf/netcdfdataset.h                  |   1 -
 frmts/nitf/data/nitf_spec.xml                 |   2 -
 frmts/nitf/data/nitf_spec.xsd                 |   2 -
 frmts/nitf/mgrs.c                             |   1 -
 frmts/nitf/mgrs.h                             |   1 -
 frmts/nitf/nitfdataset.h                      |   1 -
 frmts/nitf/nitfdes.c                          |   1 -
 frmts/nitf/nitfdump.c                         |   1 -
 frmts/nitf/nitffile.c                         |   1 -
 frmts/nitf/nitfimage.c                        |   1 -
 frmts/nitf/nitflib.h                          |   1 -
 frmts/nitf/rpftoclib.h                        |   1 -
 frmts/northwood/northwood.h                   |   1 -
 frmts/pcidsk/pcidskdataset2.h                 |   1 -
 frmts/pcraster/pcrasterdataset.h              |   1 -
 frmts/pcraster/pcrasterrasterband.h           |   1 -
 frmts/pcraster/pcrasterutil.h                 |   1 -
 frmts/pdf/data/pdfcomposition.xsd             |   2 -
 frmts/pdf/gdal_pdf.h                          |   1 -
 frmts/pdf/pdfcreatecopy.h                     |   1 -
 frmts/pdf/pdfcreatefromcomposition.cpp        |   1 -
 frmts/pdf/pdfcreatefromcomposition.h          |   1 -
 frmts/pdf/pdfio.h                             |   1 -
 frmts/pdf/pdfobject.h                         |   1 -
 frmts/png/pngdataset.h                        |   1 -
 frmts/postgisraster/postgisraster.h           |   1 -
 frmts/postgisraster/postgisrasterdataset.cpp  |   1 -
 frmts/postgisraster/postgisrasterdriver.cpp   |   1 -
 .../postgisraster/postgisrasterdrivercore.cpp |   1 -
 frmts/postgisraster/postgisrasterdrivercore.h |   1 -
 .../postgisraster/postgisrasterrasterband.cpp |   1 -
 .../postgisrastertiledataset.cpp              |   1 -
 .../postgisrastertilerasterband.cpp           |   1 -
 frmts/postgisraster/postgisrastertools.cpp    |   1 -
 frmts/r/rdataset.h                            |   1 -
 frmts/rasterlite/rasterlitedataset.h          |   1 -
 frmts/raw/atlsci_spheroid.h                   |   1 -
 frmts/raw/envidataset.h                       |   1 -
 frmts/rdb/rdbdataset.cpp                      |   1 -
 frmts/rdb/rdbdataset.hpp                      |   2 -
 frmts/rmf/rmfdataset.h                        |   1 -
 frmts/sdts/sdts_al.h                          |   1 -
 frmts/vrt/data/gdalvrt.xsd                    |   2 -
 frmts/vrt/gdal_vrt.h                          |   1 -
 frmts/vrt/vrtdataset.h                        |   1 -
 frmts/vrt/vrtmultidim.cpp                     |   1 -
 frmts/wms/gdalhttp.h                          |   1 -
 frmts/wms/minidriver_arcgis_server.h          |   1 -
 frmts/wms/minidriver_iip.h                    |   1 -
 frmts/wms/minidriver_mrf.cpp                  |   1 -
 frmts/wms/minidriver_tileservice.h            |   1 -
 frmts/wms/minidriver_tms.h                    |   1 -
 frmts/wms/minidriver_virtualearth.h           |   1 -
 frmts/wms/minidriver_wms.h                    |   1 -
 frmts/wms/minidriver_worldwind.h              |   1 -
 frmts/wms/wmsdriver.h                         |   1 -
 frmts/wms/wmsmetadataset.h                    |   1 -
 frmts/zlib/adler32.c                          |   1 -
 frmts/zlib/compress.c                         |   1 -
 frmts/zlib/contrib/infback9/minified_zutil.c  |   1 -
 frmts/zlib/contrib/infback9/minified_zutil.h  |   1 -
 frmts/zlib/crc32.c                            |   1 -
 frmts/zlib/deflate.c                          |   1 -
 frmts/zlib/deflate.h                          |   1 -
 frmts/zlib/trees.c                            |   1 -
 frmts/zlib/uncompr.c                          |   1 -
 frmts/zlib/zconf.h                            |   1 -
 frmts/zlib/zutil.c                            |   1 -
 frmts/zlib/zutil.h                            |   1 -
 gcore/Version.rc                              | 194 +++++++++---------
 gcore/gdal.h                                  |   1 -
 gcore/gdal_frmts.h                            |   1 -
 gcore/gdal_mdreader.h                         |   1 -
 gcore/gdal_pam.h                              |   1 -
 gcore/gdal_priv.h                             |   1 -
 gcore/gdal_priv_templates.hpp                 |   1 -
 gcore/gdal_proxy.h                            |   1 -
 gcore/gdal_rat.h                              |   1 -
 gcore/gdal_version.h.in                       |   1 -
 gcore/gdalexif.h                              |   1 -
 gcore/gdalgeorefpamdataset.h                  |   1 -
 gcore/gdaljp2abstractdataset.h                |   1 -
 gcore/gdaljp2metadata.h                       |   1 -
 gcore/gdaljp2metadatagenerator.h              |   1 -
 gcore/gdalmultidim.cpp                        |   1 -
 gcore/gdalmultidim_gridded.cpp                |   1 -
 gcore/gdalsse_priv.h                          |   1 -
 gcore/mdreader/reader_alos.h                  |   1 -
 gcore/mdreader/reader_digital_globe.h         |   1 -
 gcore/mdreader/reader_eros.h                  |   1 -
 gcore/mdreader/reader_geo_eye.h               |   1 -
 gcore/mdreader/reader_kompsat.h               |   1 -
 gcore/mdreader/reader_landsat.h               |   1 -
 gcore/mdreader/reader_orb_view.h              |   1 -
 gcore/mdreader/reader_pleiades.h              |   1 -
 gcore/mdreader/reader_rapid_eye.h             |   1 -
 gcore/mdreader/reader_rdk1.h                  |   1 -
 gcore/mdreader/reader_spot.h                  |   1 -
 gcore/rawdataset.h                            |   1 -
 gnm/gnm.h                                     |   1 -
 gnm/gnm_api.h                                 |   1 -
 gnm/gnm_frmts/db/gnmdb.h                      |   1 -
 gnm/gnm_frmts/file/gnmfile.h                  |   1 -
 gnm/gnm_frmts/gnm_frmts.h                     |   1 -
 gnm/gnm_priv.h                                |   1 -
 gnm/gnmgraph.h                                |   1 -
 mkgdaldist.sh                                 |   2 -
 ogr/generate_encoding_table.c                 |   1 -
 ogr/ogr_api.h                                 |   1 -
 ogr/ogr_core.h                                |   1 -
 ogr/ogr_expat.h                               |   1 -
 ogr/ogr_feature.h                             |   1 -
 ogr/ogr_featurestyle.h                        |   1 -
 ogr/ogr_geo_utils.h                           |   1 -
 ogr/ogr_geocoding.h                           |   1 -
 ogr/ogr_geometry.h                            |   1 -
 ogr/ogr_geos.h                                |   1 -
 ogr/ogr_libs.h                                |   1 -
 ogr/ogr_p.h                                   |   1 -
 ogr/ogr_sfcgal.h                              |   1 -
 ogr/ogr_spatialref.h                          |   1 -
 ogr/ogr_srs_api.h                             |   1 -
 ogr/ogr_srs_cf1.h                             |   1 -
 ogr/ograpispy.h                               |   1 -
 ogr/ogrgeojsonwriter.h                        |   1 -
 ogr/ogrpgeogeometry.h                         |   1 -
 ogr/ogrpolyhedralsurface.cpp                  |   1 -
 ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h   |   1 -
 ogr/ogrsf_frmts/amigocloud/pkg/configure.in   |   2 -
 ogr/ogrsf_frmts/avc/avc.h                     |   1 -
 ogr/ogrsf_frmts/avc/avc_bin.cpp               |   1 -
 ogr/ogrsf_frmts/avc/avc_binwr.cpp             |   6 +-
 ogr/ogrsf_frmts/avc/avc_e00gen.cpp            |   1 -
 ogr/ogrsf_frmts/avc/avc_e00parse.cpp          |   1 -
 ogr/ogrsf_frmts/avc/avc_e00read.cpp           |   1 -
 ogr/ogrsf_frmts/avc/avc_e00write.cpp          |   1 -
 ogr/ogrsf_frmts/avc/avc_mbyte.cpp             |   3 +-
 ogr/ogrsf_frmts/avc/avc_mbyte.h               |   1 -
 ogr/ogrsf_frmts/avc/avc_misc.cpp              |   1 -
 ogr/ogrsf_frmts/avc/avc_rawbin.cpp            |   1 -
 ogr/ogrsf_frmts/avc/ogr_avc.h                 |   1 -
 ogr/ogrsf_frmts/carto/ogr_carto.h             |   1 -
 ogr/ogrsf_frmts/csv/ogr_csv.h                 |   1 -
 ogr/ogrsf_frmts/dgn/dgndump.cpp               |   1 -
 ogr/ogrsf_frmts/dgn/dgnlib.h                  |   1 -
 ogr/ogrsf_frmts/dgn/dgnlibp.h                 |   1 -
 ogr/ogrsf_frmts/dgn/dgnwritetest.cpp          |   1 -
 ogr/ogrsf_frmts/dgn/ogr_dgn.h                 |   1 -
 ogr/ogrsf_frmts/dwg/ogr_dwg.h                 |   1 -
 ogr/ogrsf_frmts/dxf/ogr_autocad_services.h    |   1 -
 ogr/ogrsf_frmts/dxf/ogr_dxf.h                 |   1 -
 ogr/ogrsf_frmts/edigeo/ogr_edigeo.h           |   1 -
 ogr/ogrsf_frmts/elastic/ogr_elastic.h         |   1 -
 ogr/ogrsf_frmts/filegdb/FGdbUtils.h           |   1 -
 ogr/ogrsf_frmts/filegdb/ogr_fgdb.h            |   1 -
 ogr/ogrsf_frmts/generic/ogr_gensql.h          |   1 -
 ogr/ogrsf_frmts/generic/ogreditablelayer.h    |   1 -
 .../generic/ogremulatedtransaction.h          |   1 -
 ogr/ogrsf_frmts/generic/ogrlayerdecorator.h   |   1 -
 ogr/ogrsf_frmts/generic/ogrlayerpool.h        |   1 -
 .../generic/ogrmutexeddatasource.h            |   1 -
 ogr/ogrsf_frmts/generic/ogrmutexedlayer.h     |   1 -
 ogr/ogrsf_frmts/generic/ogrunionlayer.h       |   1 -
 ogr/ogrsf_frmts/generic/ogrwarpedlayer.h      |   1 -
 ogr/ogrsf_frmts/geoconcept/geoconcept.c       |   1 -
 ogr/ogrsf_frmts/geojson/ogr_geojson.h         |   1 -
 ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h    |   1 -
 ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h     |   1 -
 ogr/ogrsf_frmts/gml/gmlreader.h               |   1 -
 ogr/ogrsf_frmts/gml/gmlreaderp.h              |   1 -
 ogr/ogrsf_frmts/gml/gmlregistry.h             |   1 -
 ogr/ogrsf_frmts/gml/ogr_gml.h                 |   1 -
 ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd      |   2 -
 ogr/ogrsf_frmts/gmlutils/gmlfeature.h         |   1 -
 ogr/ogrsf_frmts/gmlutils/gmlutils.h           |   1 -
 ogr/ogrsf_frmts/gmlutils/parsexsd.h           |   1 -
 ogr/ogrsf_frmts/gmt/ogr_gmt.h                 |   1 -
 ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h      |   1 -
 ogr/ogrsf_frmts/gpkg/ogr_geopackage.h         |   1 -
 ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h   |   1 -
 ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h       |   1 -
 ogr/ogrsf_frmts/gpx/ogr_gpx.h                 |   1 -
 ogr/ogrsf_frmts/idb/ogr_idb.h                 |   1 -
 ogr/ogrsf_frmts/idrisi/generate_test_files.c  |   1 -
 ogr/ogrsf_frmts/idrisi/ogr_idrisi.h           |   1 -
 ogr/ogrsf_frmts/ili/ili1reader.h              |   1 -
 ogr/ogrsf_frmts/ili/ili1readerp.h             |   1 -
 ogr/ogrsf_frmts/ili/ili2reader.h              |   1 -
 ogr/ogrsf_frmts/ili/ili2readerp.h             |   1 -
 ogr/ogrsf_frmts/ili/imdreader.h               |   1 -
 ogr/ogrsf_frmts/ili/ogr_ili1.h                |   1 -
 ogr/ogrsf_frmts/ili/ogr_ili2.h                |   1 -
 ogr/ogrsf_frmts/jml/ogr_jml.h                 |   1 -
 ogr/ogrsf_frmts/kml/kml.h                     |   1 -
 ogr/ogrsf_frmts/kml/kmlnode.h                 |   1 -
 ogr/ogrsf_frmts/kml/kmlutility.h              |   1 -
 ogr/ogrsf_frmts/kml/kmlvector.h               |   1 -
 ogr/ogrsf_frmts/kml/ogr_kml.h                 |   1 -
 ogr/ogrsf_frmts/mem/ogr_mem.h                 |   1 -
 ogr/ogrsf_frmts/miramon/ogrmiramon.h          |   1 -
 ogr/ogrsf_frmts/mitab/TODO.TXT                |   4 -
 ogr/ogrsf_frmts/mitab/mitab.h                 |   1 -
 ogr/ogrsf_frmts/mitab/mitab_geometry.h        |   1 -
 ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h      |   1 -
 ogr/ogrsf_frmts/mitab/mitab_priv.h            |   1 -
 ogr/ogrsf_frmts/mitab/mitab_utils.h           |   1 -
 .../mssqlspatial/ogr_mssqlspatial.h           |   1 -
 ogr/ogrsf_frmts/mysql/ogr_mysql.h             |   1 -
 ogr/ogrsf_frmts/nas/nasreaderp.h              |   1 -
 ogr/ogrsf_frmts/nas/ogr_nas.h                 |   1 -
 ogr/ogrsf_frmts/ntf/ntf.h                     |   1 -
 ogr/ogrsf_frmts/oci/ogr_oci.h                 |   1 -
 ogr/ogrsf_frmts/odbc/ogr_odbc.h               |   1 -
 ogr/ogrsf_frmts/ods/ods_formula.h             |   1 -
 ogr/ogrsf_frmts/ods/ogr_ods.h                 |   1 -
 ogr/ogrsf_frmts/ogdi/ogrogdi.h                |   1 -
 ogr/ogrsf_frmts/ogr_attrind.h                 |   1 -
 ogr/ogrsf_frmts/ogrsf_frmts.dox               |   2 -
 ogr/ogrsf_frmts/ogrsf_frmts.h                 |   1 -
 ogr/ogrsf_frmts/openfilegdb/filegdbtable.h    |   1 -
 .../openfilegdb/filegdbtable_priv.h           |   1 -
 ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h |   1 -
 ogr/ogrsf_frmts/osm/gpb.h                     |   1 -
 ogr/ogrsf_frmts/osm/ogr_osm.h                 |   1 -
 ogr/ogrsf_frmts/osm/osm2osm.cpp               |   1 -
 ogr/ogrsf_frmts/osm/osm_parser.h              |   1 -
 ogr/ogrsf_frmts/pds/ogr_pds.h                 |   1 -
 ogr/ogrsf_frmts/pg/ogr_pg.h                   |   1 -
 ogr/ogrsf_frmts/pg/ogrpgutility.h             |   1 -
 ogr/ogrsf_frmts/pgdump/ogr_pgdump.h           |   1 -
 ogr/ogrsf_frmts/pgeo/ogr_pgeo.h               |   1 -
 ogr/ogrsf_frmts/plscenes/ogr_plscenes.h       |   1 -
 ogr/ogrsf_frmts/s57/ogr_s57.h                 |   1 -
 ogr/ogrsf_frmts/s57/s57.h                     |   1 -
 ogr/ogrsf_frmts/sdts/ogr_sdts.h               |   1 -
 ogr/ogrsf_frmts/shape/ogrshape.h              |   1 -
 ogr/ogrsf_frmts/shape/shp_vsi.c               |   1 -
 ogr/ogrsf_frmts/shape/shp_vsi.h               |   1 -
 ogr/ogrsf_frmts/sosi/ogr_sosi.h               |   1 -
 ogr/ogrsf_frmts/sqlite/ogr_sqlite.h           |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h        |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h  |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h      |   1 -
 .../sqlite/ogrsqlitesqlfunctions.h            |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h     |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h         |   1 -
 ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h  |   1 -
 .../sqlite/test_load_virtual_ogr.c            |   1 -
 ogr/ogrsf_frmts/svg/ogr_svg.h                 |   1 -
 ogr/ogrsf_frmts/sxf/ogr_sxf.h                 |   1 -
 ogr/ogrsf_frmts/sxf/org_sxf_defs.h            |   1 -
 ogr/ogrsf_frmts/tiger/ogr_tiger.h             |   1 -
 ogr/ogrsf_frmts/vdv/data/vdv452.xml           |   2 -
 ogr/ogrsf_frmts/vdv/data/vdv452.xsd           |   2 -
 ogr/ogrsf_frmts/vdv/ogr_vdv.h                 |   1 -
 ogr/ogrsf_frmts/vfk/ogr_vfk.h                 |   1 -
 ogr/ogrsf_frmts/vfk/vfkreader.h               |   1 -
 ogr/ogrsf_frmts/vfk/vfkreaderp.h              |   1 -
 ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd           |   2 -
 ogr/ogrsf_frmts/vrt/ogr_vrt.h                 |   1 -
 ogr/ogrsf_frmts/wfs/ogr_wfs.h                 |   1 -
 ogr/ogrsf_frmts/xls/include_freexl.h          |   1 -
 ogr/ogrsf_frmts/xls/ogr_xls.h                 |   1 -
 ogr/ogrsf_frmts/xlsx/ogr_xlsx.h               |   1 -
 ogr/ogrtriangle.cpp                           |   1 -
 ogr/ogrtriangulatedsurface.cpp                |   1 -
 port/cpl_alibaba_oss.h                        |   1 -
 port/cpl_atomic_ops.h                         |   1 -
 port/cpl_auto_close.h                         |   1 -
 port/cpl_aws.h                                |   1 -
 port/cpl_config_extras.h                      |   1 -
 port/cpl_conv.h                               |   1 -
 port/cpl_csv.h                                |   1 -
 port/cpl_curl_priv.h                          |   1 -
 port/cpl_error.h                              |   1 -
 port/cpl_error_internal.h                     |   1 -
 port/cpl_float.cpp                            |   1 -
 port/cpl_float.h                              |   1 -
 port/cpl_hash_set.h                           |   1 -
 port/cpl_http.h                               |   1 -
 port/cpl_list.h                               |   1 -
 port/cpl_mask.h                               |   1 -
 port/cpl_minixml.h                            |   1 -
 port/cpl_minizip_ioapi.h                      |   1 -
 port/cpl_minizip_unzip.h                      |   1 -
 port/cpl_minizip_zip.h                        |   1 -
 port/cpl_multiproc.h                          |   1 -
 port/cpl_odbc.h                               |   1 -
 port/cpl_port.h                               |   1 -
 port/cpl_progress.h                           |   1 -
 port/cpl_quad_tree.h                          |   1 -
 port/cpl_sha256.h                             |   1 -
 port/cpl_spawn.h                              |   1 -
 port/cpl_string.h                             |   1 -
 port/cpl_time.h                               |   1 -
 port/cpl_virtualmem.h                         |   1 -
 port/cpl_vsi.h                                |   1 -
 port/cpl_vsi_error.h                          |   1 -
 port/cpl_vsi_virtual.h                        |   1 -
 port/cpl_vsil_curl_priv.h                     |   1 -
 port/cpl_worker_thread_pool.h                 |   1 -
 port/cplkeywordparser.h                       |   1 -
 port/gdal_csv.h                               |   1 -
 scripts/check_broken_links.py                 |   2 -
 scripts/completionFinder.py                   |   2 -
 scripts/fix_container_dot_size_zero.py        |   2 -
 scripts/fix_typos.sh                          |   2 -
 scripts/update_copyright.py                   |   2 -
 swig/csharp/apps/GDALAdjustContrast.cs        |   1 -
 swig/csharp/apps/GDALColorTable.cs            |   1 -
 swig/csharp/apps/GDALCreateCopy.cs            |   1 -
 swig/csharp/apps/GDALInfo.cs                  |   1 -
 swig/csharp/apps/GDALMemDataset.cs            |   1 -
 swig/csharp/apps/GDALOverviews.cs             |   1 -
 swig/csharp/apps/GDALRead.cs                  |   1 -
 swig/csharp/apps/GDALReadDirect.cs            |   1 -
 swig/csharp/apps/GDALWarp.cs                  |   1 -
 swig/csharp/apps/GDALWrite.cs                 |   1 -
 swig/csharp/apps/GetCRSInfo.cs                |   1 -
 swig/csharp/apps/OGRFeatureEdit.cs            |   1 -
 swig/csharp/apps/OGRGEOS.cs                   |   1 -
 swig/csharp/apps/OGRLayerAlg.cs               |   1 -
 swig/csharp/apps/OSRTransform.cs              |   1 -
 swig/csharp/apps/ReadXML.cs                   |   1 -
 swig/csharp/apps/VSIMem.cs                    |   1 -
 swig/csharp/apps/WKT2WKB.cs                   |   1 -
 swig/csharp/apps/createdata.cs                |   1 -
 swig/csharp/apps/ogrinfo.cs                   |   1 -
 swig/include/Band.i                           |   1 -
 swig/include/ColorTable.i                     |   1 -
 swig/include/Dataset.i                        |   1 -
 swig/include/Driver.i                         |   1 -
 swig/include/MajorObject.i                    |   1 -
 swig/include/MultiDimensional.i               |   1 -
 swig/include/Operations.i                     |   1 -
 swig/include/RasterAttributeTable.i           |   1 -
 swig/include/Relationship.i                   |   1 -
 swig/include/SubdatasetInfo.i                 |   1 -
 swig/include/Transform.i                      |   1 -
 swig/include/XMLNode.i                        |   1 -
 swig/include/cpl.i                            |   1 -
 swig/include/cpl_exceptions.i                 |   1 -
 swig/include/cplvirtualmem.i                  |   1 -
 swig/include/csharp/gdal_csharp.i             |   1 -
 swig/include/csharp/gdal_csharp_extend.i      |   1 -
 swig/include/csharp/gnm_csharp.i              |   1 -
 swig/include/csharp/ogr_csharp.i              |   1 -
 swig/include/csharp/ogr_csharp_extend.i       |   1 -
 swig/include/csharp/osr_csharp.i              |   1 -
 swig/include/csharp/swig_csharp_extensions.i  |   1 -
 swig/include/csharp/typemaps_csharp.i         |   1 -
 swig/include/gdal.i                           |   1 -
 swig/include/gdal_array.i                     |   1 -
 swig/include/gdal_typemaps.i                  |   1 -
 swig/include/gdalconst.i                      |   1 -
 swig/include/gnm.i                            |   1 -
 swig/include/java/gdal_java.i                 |   1 -
 swig/include/java/gdalconst_java.i            |   1 -
 swig/include/java/gnm_java.i                  |   1 -
 swig/include/java/ogr_java.i                  |   1 -
 swig/include/java/ogr_java_extend.i           |   1 -
 swig/include/java/osr_java.i                  |   1 -
 swig/include/java/typemaps_java.i             |   1 -
 swig/include/ogr.i                            |   1 -
 swig/include/ogr_error_map.i                  |   1 -
 swig/include/osr.i                            |   1 -
 swig/include/python/gdal_python.i             |   1 -
 swig/include/python/gnm_python.i              |   1 -
 swig/include/python/ogr_python.i              |   1 -
 swig/include/python/osr_python.i              |   1 -
 swig/include/python/python_strings.i          |   1 -
 swig/include/python/typemaps_python.i         |   1 -
 swig/java/add_javadoc.c                       |   2 -
 swig/java/apps/GDALOverviews.java             |   1 -
 swig/java/apps/GDALProximity.java             |   1 -
 swig/java/apps/GDALTestIO.java                |   1 -
 swig/java/apps/GDALTestMultiDim.java          |   1 -
 swig/java/apps/GDALtest.java                  |   1 -
 swig/java/apps/OGRFeature.java                |   1 -
 swig/java/apps/OGRTestGC.java                 |   1 -
 swig/java/apps/OSRTransform.java              |   1 -
 swig/java/apps/ReadXML.java                   |   1 -
 swig/java/apps/WKT2WKB.java                   |   1 -
 swig/java/apps/gdalinfo.java                  |   1 -
 swig/java/apps/gdalmajorobject.java           |   1 -
 swig/java/apps/gdaltransformer.java           |   1 -
 swig/java/apps/multireadtest.java             |   1 -
 swig/java/apps/ogr2ogr.java                   |   1 -
 swig/java/apps/ogr2ogr_new.java               |   1 -
 swig/java/apps/ogrinfo.java                   |   1 -
 swig/java/apps/ogrtindex.java                 |   1 -
 swig/java/apps/test_ogrfielddomains.java      |   1 -
 swig/java/apps/testgetpoints.java             |   1 -
 swig/java/javadoc.java                        |   1 -
 .../osgeo_utils/auxiliary/osr_util.py         |   1 -
 .../osgeo_utils/auxiliary/progress.py         |   1 -
 .../gdal-utils/osgeo_utils/gdal2tiles.py      |   1 -
 .../python/gdal-utils/osgeo_utils/gdal2xyz.py |   1 -
 .../gdal-utils/osgeo_utils/gdal_edit.py       |   1 -
 .../gdal-utils/osgeo_utils/gdal_fillnodata.py |   1 -
 .../gdal-utils/osgeo_utils/gdal_merge.py      |   1 -
 .../gdal-utils/osgeo_utils/gdal_pansharpen.py |   1 -
 .../gdal-utils/osgeo_utils/gdal_polygonize.py |   1 -
 .../gdal-utils/osgeo_utils/gdal_proximity.py  |   1 -
 .../gdal-utils/osgeo_utils/gdal_retile.py     |   1 -
 .../gdal-utils/osgeo_utils/gdal_sieve.py      |   1 -
 .../gdal-utils/osgeo_utils/gdalattachpct.py   |   1 -
 .../osgeo_utils/ogr_layer_algebra.py          |   1 -
 .../python/gdal-utils/osgeo_utils/ogrmerge.py |   1 -
 swig/python/gdal-utils/osgeo_utils/pct2rgb.py |   1 -
 swig/python/gdal-utils/osgeo_utils/rgb2pct.py |   1 -
 .../osgeo_utils/samples/assemblepoly.py       |   1 -
 .../osgeo_utils/samples/build_jp2_from_xml.py |   1 -
 .../gdal-utils/osgeo_utils/samples/densify.py |   1 -
 .../osgeo_utils/samples/dump_jp2.py           |   1 -
 .../gdal-utils/osgeo_utils/samples/epsg_tr.py |   1 -
 .../gdal-utils/osgeo_utils/samples/fft.py     |   1 -
 .../osgeo_utils/samples/fix_gpkg.py           |   1 -
 .../osgeo_utils/samples/gcps2ogr.py           |   1 -
 .../osgeo_utils/samples/gcps2vec.py           |   1 -
 .../osgeo_utils/samples/gcps2wld.py           |   1 -
 .../osgeo_utils/samples/gdal2grd.py           |   1 -
 .../osgeo_utils/samples/gdal_auth.py          |   1 -
 .../gdal-utils/osgeo_utils/samples/gdal_cp.py |   1 -
 .../osgeo_utils/samples/gdal_create_pdf.py    |   1 -
 .../gdal-utils/osgeo_utils/samples/gdal_ls.py |   1 -
 .../osgeo_utils/samples/gdal_mkdir.py         |   1 -
 .../samples/gdal_remove_towgs84.py            |   1 -
 .../gdal-utils/osgeo_utils/samples/gdal_rm.py |   1 -
 .../osgeo_utils/samples/gdal_rmdir.py         |   1 -
 .../osgeo_utils/samples/gdalchksum.py         |   1 -
 .../osgeo_utils/samples/gdalcopyproj.py       |   1 -
 .../osgeo_utils/samples/gdalfilter.py         |   1 -
 .../osgeo_utils/samples/gdalident.py          |   1 -
 .../osgeo_utils/samples/gdalimport.py         |   1 -
 .../osgeo_utils/samples/gdalinfo.py           |   1 -
 .../osgeo_utils/samples/gdallocationinfo.py   |   1 -
 .../osgeo_utils/samples/get_soundg.py         |   1 -
 .../gdal-utils/osgeo_utils/samples/histrep.py |   1 -
 .../osgeo_utils/samples/hsv_merge.py          |   1 -
 .../samples/jpeg_in_tiff_extract.py           |   1 -
 .../osgeo_utils/samples/load2odbc.py          |   1 -
 .../samples/make_fuzzer_friendly_archive.py   |   1 -
 .../osgeo_utils/samples/mkgraticule.py        |   1 -
 .../gdal-utils/osgeo_utils/samples/ogr2vrt.py |   1 -
 .../samples/ogr_build_junction_table.py       |   2 -
 .../osgeo_utils/samples/ogr_dispatch.py       |   1 -
 .../gdal-utils/osgeo_utils/samples/ogrinfo.py |   1 -
 .../osgeo_utils/samples/ogrupdate.py          |   1 -
 .../gdal-utils/osgeo_utils/samples/rel.py     |   1 -
 .../osgeo_utils/samples/tigerpoly.py          |   1 -
 .../samples/tile_extent_from_raster.py        |   1 -
 .../osgeo_utils/samples/tolatlong.py          |   1 -
 .../osgeo_utils/samples/val_repl.py           |   1 -
 .../validate_cloud_optimized_geotiff.py       |   1 -
 .../samples/validate_geoparquet.py            |   1 -
 .../osgeo_utils/samples/validate_gpkg.py      |   1 -
 .../osgeo_utils/samples/validate_jp2.py       |   1 -
 .../gdal-utils/osgeo_utils/samples/vec_tr.py  |   1 -
 .../osgeo_utils/samples/vec_tr_spat.py        |   1 -
 .../osgeo_utils/samples/wcs_virtds_params.py  |   1 -
 1041 files changed, 98 insertions(+), 1171 deletions(-)

diff --git a/apps/commonutils.h b/apps/commonutils.h
index 4365877b6d79..453c858f3bf1 100644
--- a/apps/commonutils.h
+++ b/apps/commonutils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Utilities
  * Purpose:  Common utility routines
diff --git a/apps/gdal_utils.h b/apps/gdal_utils.h
index 063534a3db96..27df34d21d03 100644
--- a/apps/gdal_utils.h
+++ b/apps/gdal_utils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Utilities
  * Purpose:  GDAL Utilities Public Declarations.
diff --git a/apps/gdal_utils_priv.h b/apps/gdal_utils_priv.h
index 460656b62f8d..357fa08e065d 100644
--- a/apps/gdal_utils_priv.h
+++ b/apps/gdal_utils_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Utilities
  * Purpose:  GDAL Utilities Private Declarations.
diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 2d9cae11cc3d..95d8dc8d326a 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALApplyVerticalShiftGrid algorithm.
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index ef0493f67284..aec23f48adc5 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ContourGenerate() testing
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index 7187b8964803..fb060617f66c 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test the image reprojection functions. Try to test as many
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 14c960e78cf9..e8b7e4adac0c 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal.ComputeMedianCutPCT() and gdal.DitherRGB2PCT()
diff --git a/autotest/alg/fillnodata.py b/autotest/alg/fillnodata.py
index 801469114a8f..caf59c14cf41 100755
--- a/autotest/alg/fillnodata.py
+++ b/autotest/alg/fillnodata.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GDALFillNoData() testing
diff --git a/autotest/alg/los.py b/autotest/alg/los.py
index b4ae6ae66d08..57b7ca275bf8 100644
--- a/autotest/alg/los.py
+++ b/autotest/alg/los.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal.LineOfSightVisible algorithm.
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index e0bee334af59..f3f71ddd1cc8 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Polygonize() algorithm.
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index a26c94e45e06..9bc4bd9e2186 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ComputeProximity() algorithm.
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 6d5a7c624cca..6a666c797370 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RasterizeLayer() and related calls.
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 98527a04280d..86dc9b95171a 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ReprojectImage() algorithm.
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 069158047b28..260a92dd980b 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SieveFilter() algorithm.
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index c8035ddfe16b..4e280c8b28fe 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test TransformGeoloc algorithm.
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index 7d78c845a219..1ef52f7cdcac 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test the image reprojection functions. Try to test as many
diff --git a/autotest/benchmark/conftest.py b/autotest/benchmark/conftest.py
index 9a95f2d2ebfb..1b3b0f39d50d 100755
--- a/autotest/benchmark/conftest.py
+++ b/autotest/benchmark/conftest.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking
diff --git a/autotest/benchmark/test_gdalwarp.py b/autotest/benchmark/test_gdalwarp.py
index 4b86fed8b1c2..e550c4a8a401 100755
--- a/autotest/benchmark/test_gdalwarp.py
+++ b/autotest/benchmark/test_gdalwarp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of gdalwarp
diff --git a/autotest/benchmark/test_gtiff.py b/autotest/benchmark/test_gtiff.py
index 7eeb1ad96d0f..e9813fa9b1be 100755
--- a/autotest/benchmark/test_gtiff.py
+++ b/autotest/benchmark/test_gtiff.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of GeoTIFF driver
diff --git a/autotest/benchmark/test_ogr2ogr.py b/autotest/benchmark/test_ogr2ogr.py
index c221855c73ca..0e9b1b08c824 100755
--- a/autotest/benchmark/test_ogr2ogr.py
+++ b/autotest/benchmark/test_ogr2ogr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of ogr2ogr
diff --git a/autotest/benchmark/test_ogr_gpkg.py b/autotest/benchmark/test_ogr_gpkg.py
index 8e347e245dcb..9cbbb6cc80c9 100755
--- a/autotest/benchmark/test_ogr_gpkg.py
+++ b/autotest/benchmark/test_ogr_gpkg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of GeoPackage driver
diff --git a/autotest/cpp/bug1488.cpp b/autotest/cpp/bug1488.cpp
index 704e5025dfac..137625aff365 100644
--- a/autotest/cpp/bug1488.cpp
+++ b/autotest/cpp/bug1488.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test fix for https://github.com/OSGeo/gdal/issues/1488 (concurrency
diff --git a/autotest/cpp/test_alg.cpp b/autotest/cpp/test_alg.cpp
index b3fa1706d580..2e09c9fa8ab2 100644
--- a/autotest/cpp/test_alg.cpp
+++ b/autotest/cpp/test_alg.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Test alg
diff --git a/autotest/cpp/test_deferred_plugin.cpp b/autotest/cpp/test_deferred_plugin.cpp
index d9f83f0be95a..052b8ceed0bb 100644
--- a/autotest/cpp/test_deferred_plugin.cpp
+++ b/autotest/cpp/test_deferred_plugin.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Test deferred plugin loading
diff --git a/autotest/cpp/test_marching_squares_contour.cpp b/autotest/cpp/test_marching_squares_contour.cpp
index 47718ed67787..3a00a79da087 100644
--- a/autotest/cpp/test_marching_squares_contour.cpp
+++ b/autotest/cpp/test_marching_squares_contour.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm
diff --git a/autotest/cpp/test_marching_squares_polygon.cpp b/autotest/cpp/test_marching_squares_polygon.cpp
index 3b1edf6d36cf..72d62d1580fe 100644
--- a/autotest/cpp/test_marching_squares_polygon.cpp
+++ b/autotest/cpp/test_marching_squares_polygon.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm
diff --git a/autotest/cpp/test_marching_squares_square.cpp b/autotest/cpp/test_marching_squares_square.cpp
index c1ffec9eef72..0c84dd3bdec2 100644
--- a/autotest/cpp/test_marching_squares_square.cpp
+++ b/autotest/cpp/test_marching_squares_square.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm
diff --git a/autotest/cpp/test_marching_squares_tile.cpp b/autotest/cpp/test_marching_squares_tile.cpp
index 3151593e20c7..7c94a5fc997c 100644
--- a/autotest/cpp/test_marching_squares_tile.cpp
+++ b/autotest/cpp/test_marching_squares_tile.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm
diff --git a/autotest/cpp/test_osr_set_proj_search_paths.cpp b/autotest/cpp/test_osr_set_proj_search_paths.cpp
index 7a41c072130d..b5c68a6fd56d 100644
--- a/autotest/cpp/test_osr_set_proj_search_paths.cpp
+++ b/autotest/cpp/test_osr_set_proj_search_paths.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test OSRSetPROJSearchPaths()
diff --git a/autotest/cpp/test_triangulation.cpp b/autotest/cpp/test_triangulation.cpp
index 0241c2df11b6..ecc82d7ad5b0 100644
--- a/autotest/cpp/test_triangulation.cpp
+++ b/autotest/cpp/test_triangulation.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Test Delaunay triangulation
diff --git a/autotest/cpp/testblockcache.cpp b/autotest/cpp/testblockcache.cpp
index 2f0459375294..e426d07eb223 100644
--- a/autotest/cpp/testblockcache.cpp
+++ b/autotest/cpp/testblockcache.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache under multi-threading
diff --git a/autotest/cpp/testblockcachelimits.cpp b/autotest/cpp/testblockcachelimits.cpp
index 6531c2cd6a1b..446bfbeed502 100644
--- a/autotest/cpp/testblockcachelimits.cpp
+++ b/autotest/cpp/testblockcachelimits.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache under multi-threading
diff --git a/autotest/cpp/testblockcachewrite.cpp b/autotest/cpp/testblockcachewrite.cpp
index e6141ca9dc3b..2a0cef3a79dc 100644
--- a/autotest/cpp/testblockcachewrite.cpp
+++ b/autotest/cpp/testblockcachewrite.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache & writing behaviour under multi-threading
diff --git a/autotest/cpp/testclosedondestroydm.cpp b/autotest/cpp/testclosedondestroydm.cpp
index efc7e056456c..62ee755c96bd 100644
--- a/autotest/cpp/testclosedondestroydm.cpp
+++ b/autotest/cpp/testclosedondestroydm.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache & writing behaviour under multi-threading
diff --git a/autotest/cpp/testcopywords.cpp b/autotest/cpp/testcopywords.cpp
index f69947ba942c..2fbdcdd3f50b 100644
--- a/autotest/cpp/testcopywords.cpp
+++ b/autotest/cpp/testcopywords.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test GDALCopyWords().
diff --git a/autotest/cpp/testdestroy.cpp b/autotest/cpp/testdestroy.cpp
index 823413681538..f07232ecbb0e 100644
--- a/autotest/cpp/testdestroy.cpp
+++ b/autotest/cpp/testdestroy.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test GDALDestroy().
diff --git a/autotest/cpp/testlog.cpp b/autotest/cpp/testlog.cpp
index 0f03b458f432..aa9534a64d52 100644
--- a/autotest/cpp/testlog.cpp
+++ b/autotest/cpp/testlog.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Test CPL_LOG
diff --git a/autotest/cpp/testthreadcond.cpp b/autotest/cpp/testthreadcond.cpp
index 557b404510d9..9e2a2ccb6c6c 100644
--- a/autotest/cpp/testthreadcond.cpp
+++ b/autotest/cpp/testthreadcond.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test thread API
diff --git a/autotest/cpp/testvirtualmem.cpp b/autotest/cpp/testvirtualmem.cpp
index e9f30dc55b5b..e073fb45e1d1 100644
--- a/autotest/cpp/testvirtualmem.cpp
+++ b/autotest/cpp/testvirtualmem.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Test Delaunay triangulation
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index f8e42235490f..103024e78301 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test AsyncReader interface
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index aad4af0b5abc..cf5263ea3bc5 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic GDAL open
diff --git a/autotest/gcore/basic_test_subprocess.py b/autotest/gcore/basic_test_subprocess.py
index 254a29e4c354..31533351bbcc 100755
--- a/autotest/gcore/basic_test_subprocess.py
+++ b/autotest/gcore/basic_test_subprocess.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic GDAL open
diff --git a/autotest/gcore/bmp_read.py b/autotest/gcore/bmp_read.py
index 96088185a675..28d76800a075 100755
--- a/autotest/gcore/bmp_read.py
+++ b/autotest/gcore/bmp_read.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for a all datatypes from a BMP file.
diff --git a/autotest/gcore/bmp_write.py b/autotest/gcore/bmp_write.py
index 95a8b6fda00c..14cf8e0232dd 100755
--- a/autotest/gcore/bmp_write.py
+++ b/autotest/gcore/bmp_write.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for Microsoft Bitmap (.bmp)
diff --git a/autotest/gcore/cog.py b/autotest/gcore/cog.py
index c65989e7cdcc..fe334a67ff72 100755
--- a/autotest/gcore/cog.py
+++ b/autotest/gcore/cog.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  COG driver testing
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 6390d38260bf..c03a65d8bcfe 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functioning of the GDALColorTable.  Mostly this tests
diff --git a/autotest/gcore/envi_read.py b/autotest/gcore/envi_read.py
index 44ab971b0317..5f947d4819ed 100755
--- a/autotest/gcore/envi_read.py
+++ b/autotest/gcore/envi_read.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for a all datatypes from an ENVI file.
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 369eac85dab6..e438e077bf70 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test core numeric operations and statistics calculations
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index 8bdd0cde4d6e..eb5460b2587b 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Geolocation warper.
diff --git a/autotest/gcore/gtiff_subdatasetinfo.py b/autotest/gcore/gtiff_subdatasetinfo.py
index 53c56042c5bb..f45e643dd008 100644
--- a/autotest/gcore/gtiff_subdatasetinfo.py
+++ b/autotest/gcore/gtiff_subdatasetinfo.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GetSubdatasetInfo API on GeoTIFF.
diff --git a/autotest/gcore/gtiff_write.py b/autotest/gcore/gtiff_write.py
index 7908c404d8ec..b53f9ee93763 100755
--- a/autotest/gcore/gtiff_write.py
+++ b/autotest/gcore/gtiff_write.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for GTiff driver.
diff --git a/autotest/gcore/hdf4_read.py b/autotest/gcore/hdf4_read.py
index 54204dd346b7..de7e7017bcc8 100755
--- a/autotest/gcore/hdf4_read.py
+++ b/autotest/gcore/hdf4_read.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for a all datatypes from a HDF file.
diff --git a/autotest/gcore/hdf4_write.py b/autotest/gcore/hdf4_write.py
index 49e92aa39e6c..3761ff1ada7e 100755
--- a/autotest/gcore/hdf4_write.py
+++ b/autotest/gcore/hdf4_write.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for HDF4 driver.
diff --git a/autotest/gcore/hdf4multidim.py b/autotest/gcore/hdf4multidim.py
index c8185b49432d..68c5732624e1 100644
--- a/autotest/gcore/hdf4multidim.py
+++ b/autotest/gcore/hdf4multidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in HDF4 driver
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index 46b5c6a4d29b..2b55853a5d7d 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for all datatypes from a HFA file.
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 452fba977b2a..1ddcf2bf34bc 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Tests Raster Attribute Table support in the HFA driver and in
diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index 64b00d85ff2b..0f5f55fdc35b 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write round-tripping of SRS for HFA/Imagine format.
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index 5ab4cc6ee4db..4ebcc7314245 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for Erdas Imagine (.img) HFA driver.
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index f6b6d555c205..c042b5941b3d 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functioning of the IdentifyDriver functionality.
diff --git a/autotest/gcore/interpolateatpoint.py b/autotest/gcore/interpolateatpoint.py
index 767a144e54dd..d3ee6add3249 100755
--- a/autotest/gcore/interpolateatpoint.py
+++ b/autotest/gcore/interpolateatpoint.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test InterpolateAtPoint functionality
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 9e53178fedc9..999da3cb1589 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RFC 15 "mask band" default functionality (nodata/alpha/etc)
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index 449506553d8b..2d1b98881140 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Minixml services from Python.
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 2c4b1d70c1a3..5d0cc0395344 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Various test of GDAL core.
diff --git a/autotest/gcore/multidim.py b/autotest/gcore/multidim.py
index 3c038588aa33..0cf75f777868 100644
--- a/autotest/gcore/multidim.py
+++ b/autotest/gcore/multidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test non-driver specific multidimensional support
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 3bf93f101f9d..8cfe3c5945f3 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALNoDataMaskBand
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index ac3d388478d9..666146fbe8dc 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic integration with numpy.
diff --git a/autotest/gcore/numpy_rw_multidim.py b/autotest/gcore/numpy_rw_multidim.py
index 5b2d558a9467..d5e90dce3c42 100755
--- a/autotest/gcore/numpy_rw_multidim.py
+++ b/autotest/gcore/numpy_rw_multidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support with numpy
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index acb19f34ba01..71030afa11c9 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALOverviewDataset
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 110daffaef3f..7ad0489f7ac5 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functioning of the PAM metadata support.
diff --git a/autotest/gcore/pamproxydb.py b/autotest/gcore/pamproxydb.py
index 6a791b592882..fffaded9ae9a 100755
--- a/autotest/gcore/pamproxydb.py
+++ b/autotest/gcore/pamproxydb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functioning of the ProxyDB PAM metadata support
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index dfb528788134..06f030af380d 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test pixel functions support.
diff --git a/autotest/gcore/pnm_read.py b/autotest/gcore/pnm_read.py
index c2e0570ba4a4..4fcfbfca0184 100755
--- a/autotest/gcore/pnm_read.py
+++ b/autotest/gcore/pnm_read.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for a all datatypes from a PNM file.
diff --git a/autotest/gcore/pnm_write.py b/autotest/gcore/pnm_write.py
index 0bc4a319ff65..8f2d106c4647 100755
--- a/autotest/gcore/pnm_write.py
+++ b/autotest/gcore/pnm_write.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for portable anymap file format
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index c0e8d3ee95ed..ccc474ca1db2 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test default implementation of GDALRasterBand::IRasterIO
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index d6ec55609915..271caf86ca37 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RasterAttributeTables services from Python.
diff --git a/autotest/gcore/relationship.py b/autotest/gcore/relationship.py
index 15906ad4dd0e..1f614d887035 100755
--- a/autotest/gcore/relationship.py
+++ b/autotest/gcore/relationship.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALRelationship
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index 12c9324930f7..dbea026d6900 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RFC 30 (UTF filename handling) support.
diff --git a/autotest/gcore/test_driver_metadata.py b/autotest/gcore/test_driver_metadata.py
index 7f1bee6eb8a1..d36628be4055 100644
--- a/autotest/gcore/test_driver_metadata.py
+++ b/autotest/gcore/test_driver_metadata.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test driver metadata
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 53f7c0c53953..a92e14a7b6d5 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDAL functions not bound SWIG with ctypes
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index fb2f32c3a776..764b6ee26918 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Python threading
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 990b3d84aa5d..323fd5423e69 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Overview Support (mostly a GeoTIFF issue).
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 150276bd0b79..de908a0b4657 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for a all datatypes from a TIFF file.
diff --git a/autotest/gcore/tiff_read_subifds.py b/autotest/gcore/tiff_read_subifds.py
index 8aec882e5177..2b0eba5abf95 100755
--- a/autotest/gcore/tiff_read_subifds.py
+++ b/autotest/gcore/tiff_read_subifds.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for tiff files using overviews in subifds
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index f4069357001d..2a035b4c0503 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write round-tripping of SRS for GeoTIFF format.
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 3e2c8d9de67b..1de431a85d64 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for GeoTIFF format.
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index 28d4b9acaac2..45e25e627bae 100644
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test the GenImgProjTransformer capabilities.
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index 3de02dd1e3aa..ffa947a506bf 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALVirtualMem interface
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 3503a55c21d8..4f24787e176e 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for a all datatypes from a VRT file.
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index 52bd757867d0..32b8d891c749 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Misc tests of VRT driver
diff --git a/autotest/gcore/vsi7z.py b/autotest/gcore/vsi7z.py
index 105332cbbbf9..6f2693fa5e2b 100755
--- a/autotest/gcore/vsi7z.py
+++ b/autotest/gcore/vsi7z.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsi7z/
diff --git a/autotest/gcore/vsiadls.py b/autotest/gcore/vsiadls.py
index cc61c8f38c6d..57fea1d59525 100755
--- a/autotest/gcore/vsiadls.py
+++ b/autotest/gcore/vsiadls.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiadls
diff --git a/autotest/gcore/vsiadls_real_instance.py b/autotest/gcore/vsiadls_real_instance.py
index d61996a3edfc..8f5d2e02e83c 100755
--- a/autotest/gcore/vsiadls_real_instance.py
+++ b/autotest/gcore/vsiadls_real_instance.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiadls
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index 348f794b44dd..1859c7be49c0 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiaz
diff --git a/autotest/gcore/vsiaz_real_instance_auto.py b/autotest/gcore/vsiaz_real_instance_auto.py
index 43d88e4f5067..9e92cae56fa1 100644
--- a/autotest/gcore/vsiaz_real_instance_auto.py
+++ b/autotest/gcore/vsiaz_real_instance_auto.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiaz
diff --git a/autotest/gcore/vsiaz_real_instance_manual.py b/autotest/gcore/vsiaz_real_instance_manual.py
index b29fb576db60..eb97536117e6 100644
--- a/autotest/gcore/vsiaz_real_instance_manual.py
+++ b/autotest/gcore/vsiaz_real_instance_manual.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiaz
diff --git a/autotest/gcore/vsicached.py b/autotest/gcore/vsicached.py
index b526493c5506..f7bb9050f501 100755
--- a/autotest/gcore/vsicached.py
+++ b/autotest/gcore/vsicached.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsicached?
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 6ac558599173..057f386dcf2e 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsicrypt/
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 305641d1d1ca..3e8c9df5cd0e 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsicurl
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index d3ded6ed2d3a..bf1a892a1ef7 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsicurl_streaming
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 12b69d9eaca7..5cdd483e39e7 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VSI file primitives
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index dd78ab9cffc2..52d6f1b5522b 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsigs
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index 755477082728..b47a77e58894 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VSI file primitives
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index 7dda14517f16..d037ab953e6d 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsioss
diff --git a/autotest/gcore/vsipathspecificoption.py b/autotest/gcore/vsipathspecificoption.py
index 9b1182bdf529..d7ea5b3f26bf 100755
--- a/autotest/gcore/vsipathspecificoption.py
+++ b/autotest/gcore/vsipathspecificoption.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VSI path specific options
diff --git a/autotest/gcore/vsirar.py b/autotest/gcore/vsirar.py
index 6710b95848df..8c3ffd3df489 100755
--- a/autotest/gcore/vsirar.py
+++ b/autotest/gcore/vsirar.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsirar/
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index 77cbbee6a6ef..28d30e0d2fec 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsis3
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index d7c0b6780d1f..546baae496b3 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsistdin/
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 8b239cc1fddd..81b6de90eac6 100755
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiswift
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 28403e113e3a..808812bcc4c1 100755
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsiwebhdfs
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index 8942fc4f42ff..4a3f66b854dd 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test /vsizip/vsimem/
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index 77fbf5e935a8..669641e713dd 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Arc/Info ASCII Grid support.
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index ad3a194ff6d2..202fab7f30ff 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ACE2 driver
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 3fe1ead3e2b4..b373759cbce4 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for ADRG driver.
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index c68ef8545abd..227739f1a142 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for AIGRID driver.
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index 4a4adfdf3cfc..9c99ed32fac7 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for BAG driver.
diff --git a/autotest/gdrivers/basisu.py b/autotest/gdrivers/basisu.py
index 2d5c28d5b125..4e56084fb9bf 100755
--- a/autotest/gdrivers/basisu.py
+++ b/autotest/gdrivers/basisu.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test BASISU driver
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index f84c4caffb06..2edc448e43ef 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test BLX support.
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index b62d129311d6..af3acd80075e 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  BSB Testing.
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index 8a7233a4bf27..2aba56e14f9a 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for BT driver.
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index 39edc2e85463..3027fb12a724 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  National Resources Canada - Vertical Datum Transformation
 # Purpose:  Test read/write functionality for BYN driver.
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index b562d23b3d00..197e2ee7f3ed 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test CALS driver
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index 57446e45b8d6..d83d4ceedb62 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test conventional CEOS driver.
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index 2efca291d71c..0571ea29189e 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test CPG driver
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index 611b232d2361..556beddd257b 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test CTG driver
diff --git a/autotest/gdrivers/daas.py b/autotest/gdrivers/daas.py
index c2abeb58d32c..a1f6e7ef91b1 100755
--- a/autotest/gdrivers/daas.py
+++ b/autotest/gdrivers/daas.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  DAAS driver test suite.
diff --git a/autotest/gdrivers/daas_real_instance.py b/autotest/gdrivers/daas_real_instance.py
index ffa99a86f464..5fd83a8807aa 100755
--- a/autotest/gdrivers/daas_real_instance.py
+++ b/autotest/gdrivers/daas_real_instance.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  DAAS driver test suite.
diff --git a/autotest/gdrivers/data/bag/generate_test_georef_metadata.py b/autotest/gdrivers/data/bag/generate_test_georef_metadata.py
index 03ac88cf9bed..72f0edd9c551 100755
--- a/autotest/gdrivers/data/bag/generate_test_georef_metadata.py
+++ b/autotest/gdrivers/data/bag/generate_test_georef_metadata.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate test files
diff --git a/autotest/gdrivers/data/bag/generate_test_interpolated.py b/autotest/gdrivers/data/bag/generate_test_interpolated.py
index 09af6bb9e4e8..dc8866994e89 100755
--- a/autotest/gdrivers/data/bag/generate_test_interpolated.py
+++ b/autotest/gdrivers/data/bag/generate_test_interpolated.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate test_interpolated.bag
diff --git a/autotest/gdrivers/data/s102/generate_test.py b/autotest/gdrivers/data/s102/generate_test.py
index d00b5c1581e4..836c9964b671 100755
--- a/autotest/gdrivers/data/s102/generate_test.py
+++ b/autotest/gdrivers/data/s102/generate_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate test_s102.h5
diff --git a/autotest/gdrivers/data/s104/generate_test.py b/autotest/gdrivers/data/s104/generate_test.py
index 8104232cde1b..0eea62d391e3 100755
--- a/autotest/gdrivers/data/s104/generate_test.py
+++ b/autotest/gdrivers/data/s104/generate_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate test_s104.h5
diff --git a/autotest/gdrivers/data/s111/generate_test.py b/autotest/gdrivers/data/s111/generate_test.py
index f7c13aa27e88..7481898bd33e 100755
--- a/autotest/gdrivers/data/s111/generate_test.py
+++ b/autotest/gdrivers/data/s111/generate_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate test_s111.h5
diff --git a/autotest/gdrivers/data/zarr/generate_test_files.py b/autotest/gdrivers/data/zarr/generate_test_files.py
index 416d2d78d727..73d41ce15ce0 100644
--- a/autotest/gdrivers/data/zarr/generate_test_files.py
+++ b/autotest/gdrivers/data/zarr/generate_test_files.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Zarr driver
diff --git a/autotest/gdrivers/dds.py b/autotest/gdrivers/dds.py
index 35771deeceb1..d2161a0465c3 100644
--- a/autotest/gdrivers/dds.py
+++ b/autotest/gdrivers/dds.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DDS driver
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 9d67fe14d896..d9450aa5a810 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test derived driver
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 6e3378512ac3..e282c3cb7b46 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SPOT DIMAP driver.
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index 7ee22a86a99a..b1f36662580a 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DIPEx driver
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index 248e7210f9fb..84f9a0764088 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DOQ1 driver
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index f838f6cfcaac..9976a49859f8 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for DOQ2 driver.
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index a18a034247f4..deec68ce3e82 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DTED support.
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index 8ada6bd9a73e..bc6a3e910e57 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for ECRGTOC driver.
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 2ef47be51da9..0eaac23100a0 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for ECW driver.
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 6e94c5352403..5aa72bdd9295 100755
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Earth Engine Data API Images driver test suite.
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index d5687c8f08c0..f9d5dfdfe075 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test EHdr format driver.
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index e6bce73bcf58..4758a2558e13 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test EIR driver
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index 7bba07b144fc..baff705655a6 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ELAS driver
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index d415c1e2cb57..0b6b22349d03 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ENVI format driver.
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 768cb241be2e..ac4e8b369d52 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for ENVISAT driver.
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 0bfd6abf93f8..595629a67140 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ERS format driver.
diff --git a/autotest/gdrivers/exr.py b/autotest/gdrivers/exr.py
index 56a6c785eddd..e3fc3ffa30e9 100644
--- a/autotest/gdrivers/exr.py
+++ b/autotest/gdrivers/exr.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test EXR driver
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index bcfbf9a1c705..b77ccbbaaec3 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test EOSAT FAST Format support.
diff --git a/autotest/gdrivers/fit.py b/autotest/gdrivers/fit.py
index 404c0f74c8fe..654f8cf19732 100755
--- a/autotest/gdrivers/fit.py
+++ b/autotest/gdrivers/fit.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for FIT driver.
diff --git a/autotest/gdrivers/fits.py b/autotest/gdrivers/fits.py
index ca18ee7372c3..f4feafdb3de3 100755
--- a/autotest/gdrivers/fits.py
+++ b/autotest/gdrivers/fits.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for FITS driver.
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 40231a90e658..2bad4875f302 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test HTTP Driver.
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 732ac3e8b2fa..4bc1d8d267e7 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Generic Binary format driver.
diff --git a/autotest/gdrivers/generate_fits.py b/autotest/gdrivers/generate_fits.py
index 9001f7d00b93..30e95b3088e9 100644
--- a/autotest/gdrivers/generate_fits.py
+++ b/autotest/gdrivers/generate_fits.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate FITS samples
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index db5956f5f007..4217eee6f168 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GeoRaster Testing.
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index 71b903c8882f..3f83a2a70f82 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GFF driver
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 32288405d39a..6fa0e25b2252 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for GIF driver.
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 7896951a17ec..f791c8369568 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GeoPackage raster functionality.
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index 320b45adc8a8..718dab85f892 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GRASS ASCII Grid support.
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index f8a0c12002fd..2631cc1ee68e 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GRIB driver.
diff --git a/autotest/gdrivers/gribmultidim.py b/autotest/gdrivers/gribmultidim.py
index be55bec53338..b16e317a976f 100755
--- a/autotest/gdrivers/gribmultidim.py
+++ b/autotest/gdrivers/gribmultidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in GRIB driver
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index 82e8b4a6a22f..c362288cbfd6 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GSC driver
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 4af7a31f4b55..8773e5e1b671 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Golden Software ASCII and binary grid format.
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index cef89095a7c0..35d1db54288d 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GTA driver
diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index c9691ebd0574..58bbcca3ef1f 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALTileIndexDataset support.
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index d1657b6d0d99..458fe466b744 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for GXF driver.
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 48b0eede7fac..fc5628621cb8 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for HDF5 driver.
diff --git a/autotest/gdrivers/hdf5multidim.py b/autotest/gdrivers/hdf5multidim.py
index 2a2280a615b6..7dcc5e6889b8 100755
--- a/autotest/gdrivers/hdf5multidim.py
+++ b/autotest/gdrivers/hdf5multidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in HDF5 driver
diff --git a/autotest/gdrivers/heif.py b/autotest/gdrivers/heif.py
index 9bcefc45779a..d7d0b3912890 100644
--- a/autotest/gdrivers/heif.py
+++ b/autotest/gdrivers/heif.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test HEIF driver
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index 6499a65c83db..e0a86d811376 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for HF2 driver.
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index 3b72e082dcc2..eb9d83343816 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some functions of HFA driver.  Most testing in ../gcore/hfa_*
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index 28be6e5fd407..5dfce5da35bd 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for RST/Idrisi driver.
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index fccb9d336167..e31ebde7f9c4 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ILWIS format driver.
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 09da26c8f18b..2a4f9a7019c1 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test IRIS driver
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 45f5255edede..2aaa7d20c9c7 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ISCE format driver.
diff --git a/autotest/gdrivers/isg.py b/autotest/gdrivers/isg.py
index 0b76a16303e8..8fe793ab48e4 100755
--- a/autotest/gdrivers/isg.py
+++ b/autotest/gdrivers/isg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ISG support.
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 798b5a0f3392..f39b4e724125 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ISIS3 formats.
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index 8adb883f2f46..94657211d39b 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for ISIS2 driver.
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index 4cd6f4702c09..a04600f1629c 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test JDEM driver
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 21549b715484..891726aab1e6 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for JP2KAK JPEG2000 driver.
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index a981c3138dec..302b53b91b61 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test JP2 metadata support.
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 1aa3439bba66..e3b8e20dbbdf 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for JP2OpenJPEG driver.
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 1afece500db4..b04c358b321c 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test JPEG format driver.
diff --git a/autotest/gdrivers/jpeg_profile.py b/autotest/gdrivers/jpeg_profile.py
index b2678b324659..5e34d5700a7b 100755
--- a/autotest/gdrivers/jpeg_profile.py
+++ b/autotest/gdrivers/jpeg_profile.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic support for ICC profile in JPEG file.
diff --git a/autotest/gdrivers/jpegxl.py b/autotest/gdrivers/jpegxl.py
index e02a40992155..4c324eada3c5 100755
--- a/autotest/gdrivers/jpegxl.py
+++ b/autotest/gdrivers/jpegxl.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for JPEGXL driver.
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index 4f71b22d539f..2b799113416f 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test write functionality for KMLSUPEROVERLAY driver.
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index fe10bd74bbf1..05c3d1b1c94b 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Even Rouault, <even dot rouault at spatialys.com>
diff --git a/autotest/gdrivers/ktx2.py b/autotest/gdrivers/ktx2.py
index 2162d942a88d..15b19e215c33 100755
--- a/autotest/gdrivers/ktx2.py
+++ b/autotest/gdrivers/ktx2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test KTX2 driver
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index fcc6dca84cc4..c039b3e76c5e 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for L1B driver.
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index af971d9433eb..9fd6d16bce40 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test LAN driver
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index 20a72dcabaaf..1ce6ea65e92e 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for LCP driver.
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index 800d5a58938c..8ab9a11683e0 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Leveller driver support.
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index 306521139612..68828b19e2d2 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  LOS/LAS Testing.
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index 50f0b3feb64e..0b0484de2db2 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for MBTiles driver.
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index 878155dda27b..28eb05409655 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test MEM format driver.
diff --git a/autotest/gdrivers/memmultidim.py b/autotest/gdrivers/memmultidim.py
index a1b33c5a5ecc..3d9fa42ec75b 100755
--- a/autotest/gdrivers/memmultidim.py
+++ b/autotest/gdrivers/memmultidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in MEM driver
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index f2db3f9d3daa..b7d3202fccd8 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test MFF driver
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index 534cc844ee20..f6c096387438 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test MFF2 driver
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 7cbe7b6376db..35320035fe45 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for MRF driver.
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index a1c887b31357..c6a94e28562e 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for MrSID driver.
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index e31bba57a01d..93ca5729e9f2 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test NLAPS/NDF driver.
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 6622974f49b4..e4cd0b35893e 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test NetCDF driver support.
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index 7e60718ed431..8432b6ef7408 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test NetCDF driver support.
diff --git a/autotest/gdrivers/netcdf_multidim.py b/autotest/gdrivers/netcdf_multidim.py
index 253cb99b7197..9ee29822c564 100755
--- a/autotest/gdrivers/netcdf_multidim.py
+++ b/autotest/gdrivers/netcdf_multidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in netCDF driver
diff --git a/autotest/gdrivers/netcdf_multidim_pamproxydb.py b/autotest/gdrivers/netcdf_multidim_pamproxydb.py
index f2884ab73c6d..43d9ef3fec81 100755
--- a/autotest/gdrivers/netcdf_multidim_pamproxydb.py
+++ b/autotest/gdrivers/netcdf_multidim_pamproxydb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in netCDF driver
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index 31cc41ef3b7f..f7cd59b0c2f2 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for NGSGEOID driver.
diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
index 71c3a8b76dd5..86cb45df2647 100755
--- a/autotest/gdrivers/ngw.py
+++ b/autotest/gdrivers/ngw.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test NGW support.
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index 0efaf689b8f4..bf84bf230cd4 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for NITF driver.
diff --git a/autotest/gdrivers/noaa_b.py b/autotest/gdrivers/noaa_b.py
index 464bc69e3a41..820bf2ed6ddb 100755
--- a/autotest/gdrivers/noaa_b.py
+++ b/autotest/gdrivers/noaa_b.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functionality of NOAA_B driver.
diff --git a/autotest/gdrivers/nsidcbin.py b/autotest/gdrivers/nsidcbin.py
index 3818289f94be..7d1fa8652981 100644
--- a/autotest/gdrivers/nsidcbin.py
+++ b/autotest/gdrivers/nsidcbin.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test NSIDCbin format driver.
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index fc98584b6d0a..8f930746c3a9 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  NTv2 Testing.
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 72f9d2aeb8f5..8efc5e163170 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Northwood GRC driver
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index 40e3cafae287..79e57877cffe 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Northwood GRD driver
diff --git a/autotest/gdrivers/ogcapi.py b/autotest/gdrivers/ogcapi.py
index 4edd36cbff41..34d9162dccca 100644
--- a/autotest/gdrivers/ogcapi.py
+++ b/autotest/gdrivers/ogcapi.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  OGCAPI driver testing.
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 59af83a14160..fbf5034d7634 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  OZI Testing.
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 4f9f62647ee9..eb27fa7edc22 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for PAux driver.
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index 37a5524e8214..3edaa46f78e6 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for PCIDSK driver.
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index 753c36854648..f387128dfcd6 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test PCRaster driver support.
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 7b74e9b5384c..6239ea6b8bf1 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  PDF Testing.
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index 9bc9b5d40f37..4c14235457f2 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for PDS driver.
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index dcf31e28ca28..ae4434459d1b 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test PDS4 format
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 3c7edb225155..51ae26d24543 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  PlanetLabs mosaic driver test suite.
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index 4136217e6e4f..7260ec251484 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for PNG driver.
diff --git a/autotest/gdrivers/png_profile.py b/autotest/gdrivers/png_profile.py
index d48f406b0d5a..ba13d9bf1528 100755
--- a/autotest/gdrivers/png_profile.py
+++ b/autotest/gdrivers/png_profile.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic support for ICC profile in PNG file.
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index c1119c8260bf..ca73c80d06b6 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  PNM (Portable Anyware Map) Testing.
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index ae8d53c2e244..553ea229e68e 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  PostGISRaster Testing.
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index 831872ab2784..ec02766b8abe 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test R driver support.
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index c9083dd72a93..2f9f8d1ce5aa 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for Rasterlite driver.
diff --git a/autotest/gdrivers/rcm.py b/autotest/gdrivers/rcm.py
index 556e446bddbe..b39dfc1a5d76 100755
--- a/autotest/gdrivers/rcm.py
+++ b/autotest/gdrivers/rcm.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RCM driver
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index 4e6d00ce89cf..26150be40556 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  RIK Testing.
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index b21743ee4036..48f02e75eb0d 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for SQLite RasterLite2 driver.
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index ac73d5a85dcb..bc1aed810491 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Raster Matrix Format used in GISes "Panorama"/"Integratsia".
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 29e5b925e60d..d30b07a2468f 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ROI_PAC format driver.
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index b77d085a33a0..f13af13a24d3 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for RPFTOC driver.
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index 87ecff82741e..1c7ad96d5347 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RRASTER format driver.
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index fa034343d36f..5b30ac22e656 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RS2 driver
diff --git a/autotest/gdrivers/s102.py b/autotest/gdrivers/s102.py
index 171f40cfa44a..e7734048a868 100755
--- a/autotest/gdrivers/s102.py
+++ b/autotest/gdrivers/s102.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for S102 driver.
diff --git a/autotest/gdrivers/s104.py b/autotest/gdrivers/s104.py
index ca05884f2858..c0e6ea63989d 100755
--- a/autotest/gdrivers/s104.py
+++ b/autotest/gdrivers/s104.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for S104 driver.
diff --git a/autotest/gdrivers/s111.py b/autotest/gdrivers/s111.py
index 95d9e2dae3bd..ac572537cd68 100755
--- a/autotest/gdrivers/s111.py
+++ b/autotest/gdrivers/s111.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for S111 driver.
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index df2656e19c30..3f228e407a12 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SAFE driver
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index 9e8811871d1f..866303fce7e0 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SAGA GIS Binary driver
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 1f463ee77b72..8ff713c9e499 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SAR_CEOS driver.
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index 485613447c81..958c7bd212ea 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for SDTS driver.
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index e72ae4ba2d8c..7b9f6dd4bb1f 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Sentinel2 support.
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index 3ec03db2f091..5b4343e23f3c 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  PNM (Portable Anyware Map) Testing.
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index d491eb7fcfbf..1a61e223f79e 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Scaled Integer Gridded Elevation Model support.
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index 115d6c13153b..f58a8521e534 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SNODAS driver
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index bf186bb169d4..ebffbe654a24 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for SRP driver.
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 06eae960314c..35e8848dd0cd 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SRTMHGT support.
diff --git a/autotest/gdrivers/stacit.py b/autotest/gdrivers/stacit.py
index 8c14463ae675..eaec895eb94a 100755
--- a/autotest/gdrivers/stacit.py
+++ b/autotest/gdrivers/stacit.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test STACIT driver
diff --git a/autotest/gdrivers/stacta.py b/autotest/gdrivers/stacta.py
index 7bce7f6e5054..0f157c34b410 100755
--- a/autotest/gdrivers/stacta.py
+++ b/autotest/gdrivers/stacta.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test STACTA driver
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index b652701feda7..32fdfb6aa068 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test validate_jp2 script
diff --git a/autotest/gdrivers/tga.py b/autotest/gdrivers/tga.py
index b09dfdd5f4e9..88204a099d72 100644
--- a/autotest/gdrivers/tga.py
+++ b/autotest/gdrivers/tga.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test TGA driver
diff --git a/autotest/gdrivers/tiff_profile.py b/autotest/gdrivers/tiff_profile.py
index 5be3ef47aa88..2f3deff13cd8 100755
--- a/autotest/gdrivers/tiff_profile.py
+++ b/autotest/gdrivers/tiff_profile.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic support for ICC profile in TIFF file.
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index 8c7fe3b2407b..831cb5852f3f 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test TIL driver
diff --git a/autotest/gdrivers/tiledb_multidim.py b/autotest/gdrivers/tiledb_multidim.py
index 738ad873d0a9..6a6cfa69e818 100755
--- a/autotest/gdrivers/tiledb_multidim.py
+++ b/autotest/gdrivers/tiledb_multidim.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write multidimensional functionality for TileDB format.
diff --git a/autotest/gdrivers/tiledb_read.py b/autotest/gdrivers/tiledb_read.py
index 13f11e010777..fa27edca2f9e 100755
--- a/autotest/gdrivers/tiledb_read.py
+++ b/autotest/gdrivers/tiledb_read.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic read support for all datatypes from a TileDB array.
diff --git a/autotest/gdrivers/tiledb_write.py b/autotest/gdrivers/tiledb_write.py
index 31107fd4b0c8..c75a73b0095d 100755
--- a/autotest/gdrivers/tiledb_write.py
+++ b/autotest/gdrivers/tiledb_write.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for GeoTIFF format.
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 72737b7b5852..87494d5dc63d 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for USGSDEM driver.
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 0ed10e2d1ad8..505cbe74e26f 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for PDS driver.
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index a5b5a39368ac..0a07de55c24c 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test AddBand() with VRTDerivedRasterBand.
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index fa1d9879936d..5b33941c98f4 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VRT driver based filtering.
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index ce7f80fed916..9781914725ff 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test LUT translation in VRT driver
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 3a5b7cfc8101..7b80b8824ca0 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test mask bands in VRT driver
diff --git a/autotest/gdrivers/vrtmultidim.py b/autotest/gdrivers/vrtmultidim.py
index b05271c1b18f..310d2df3584e 100755
--- a/autotest/gdrivers/vrtmultidim.py
+++ b/autotest/gdrivers/vrtmultidim.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test multidimensional support in VRT driver
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index 89382fd65bf7..91f5a21dbad6 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test overviews support in VRT driver
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index 6df41becf6c4..f5022e682b62 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VRTPansharpenedDataset support.
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index a8d1d226b05f..bed093c423d1 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VRTRawRasterBand support.
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 5532084e1fbd..b5f424d3b42b 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test VRTWarpedDataset support.
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index aff6ea11e8d1..a758925bc374 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test WCS client support.
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 1e67cca72500..0067dd408f3b 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test WEBP driver
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index dee274fdabd6..6049ebd13fc1 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test WMS client support.
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index f0e7b985157b..89d96baf2b95 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  WMTS driver test suite.
diff --git a/autotest/gdrivers/xmp.py b/autotest/gdrivers/xmp.py
index 4196f201209b..2fbefc678000 100755
--- a/autotest/gdrivers/xmp.py
+++ b/autotest/gdrivers/xmp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test XMP metadata reading.
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 514b28dd09db..ae67f81158ba 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for XPM driver.
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index ac63ff4284fe..0f1cc36c935c 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for XYZ driver.
diff --git a/autotest/gdrivers/zarr_driver.py b/autotest/gdrivers/zarr_driver.py
index 7d118e00c4d0..79217d38542d 100644
--- a/autotest/gdrivers/zarr_driver.py
+++ b/autotest/gdrivers/zarr_driver.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Zarr driver
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index 8edf855053bc..1d4ed057b915 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for ZMap driver.
diff --git a/autotest/generate_parquet_test_file.py b/autotest/generate_parquet_test_file.py
index 3f8b723de818..5a038b2a1b63 100644
--- a/autotest/generate_parquet_test_file.py
+++ b/autotest/generate_parquet_test_file.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR Parquet driver.
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index f82cbaf71270..d3bddcb6846c 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic GNMGdalNetwork class functionality.
diff --git a/autotest/ogc_cite_testing/kml_generate_test_files.py b/autotest/ogc_cite_testing/kml_generate_test_files.py
index f18ee7c6f9ca..095f35540316 100755
--- a/autotest/ogc_cite_testing/kml_generate_test_files.py
+++ b/autotest/ogc_cite_testing/kml_generate_test_files.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Generate test files that can be used to exercise the points tested
diff --git a/autotest/ogr/ogr_adbc.py b/autotest/ogr/ogr_adbc.py
index 8ee1da12a50f..15b094696a23 100755
--- a/autotest/ogr/ogr_adbc.py
+++ b/autotest/ogr/ogr_adbc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR ADBC driver.
diff --git a/autotest/ogr/ogr_aivector.py b/autotest/ogr/ogr_aivector.py
index 32c194666cc9..fb3998bbd0b3 100755
--- a/autotest/ogr/ogr_aivector.py
+++ b/autotest/ogr/ogr_aivector.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR AIVector driver.
diff --git a/autotest/ogr/ogr_arrow.py b/autotest/ogr/ogr_arrow.py
index 8ffbe0c11913..a1c532d0e4e1 100755
--- a/autotest/ogr/ogr_arrow.py
+++ b/autotest/ogr/ogr_arrow.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functionality for OGR Arrow driver.
diff --git a/autotest/ogr/ogr_as_sqlite_extension.py b/autotest/ogr/ogr_as_sqlite_extension.py
index 6efa4ccf0317..427dad4cab92 100755
--- a/autotest/ogr/ogr_as_sqlite_extension.py
+++ b/autotest/ogr/ogr_as_sqlite_extension.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDAL as a SQLite3 dynamically loaded extension
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index cd2bcd0aaaf7..eced12b367c7 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR AVCE00 and AVCBin drivers
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index 09703b7deaf5..ec91a3647f30 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic OGR functionality against test shapefiles.
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index 30cf4d025291..ca10084c1a2b 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Carto driver testing.
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 0ab07472aed8..ef22bab214c9 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR CSV driver functionality.
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 715b75f12be5..52ff8e9e7a85 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  CSW driver testing.
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 154a1cab5030..a3da39717f12 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DB2 V7.2 WKB support. DB2 7.2 had a corrupt WKB format
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 5cf724fc168c..0c7675a4d404 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Some DGN Driver features.
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index aa3c9c61cf46..beab608593c4 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DGNv8 Driver.
diff --git a/autotest/ogr/ogr_dwg.py b/autotest/ogr/ogr_dwg.py
index 17df5abb4921..11a5c0478ba2 100755
--- a/autotest/ogr/ogr_dwg.py
+++ b/autotest/ogr/ogr_dwg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test DWG Driver.
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index a7570c3fe3c0..161cef93883d 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR DXF driver functionality.
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 66b42e578c1d..3dfc9434a864 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR EDIGEO driver.
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index a08ce389d481..b1f0ecb6fc9f 100755
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Earth Engine Data API driver test suite.
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index c6f22e9b4fbe..319cce9fc427 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Elasticsearch driver testing (with fake server)
diff --git a/autotest/ogr/ogr_esrijson.py b/autotest/ogr/ogr_esrijson.py
index fd11a2ce5dc4..e5b682ffe50e 100755
--- a/autotest/ogr/ogr_esrijson.py
+++ b/autotest/ogr/ogr_esrijson.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ESRIJson driver test suite.
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index 6de4499166d2..6ed4f3070aec 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some geometry factory methods, like arc stroking.
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index efdafd567434..ae63385d6cfa 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  FGDB driver testing.
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index e72a6e87cab1..a5758c19de6f 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  FGDB driver stress testing of CreateFeature() with user set FID
diff --git a/autotest/ogr/ogr_fielddomain.py b/autotest/ogr/ogr_fielddomain.py
index 8994bf5d7779..5a748ccbf8f8 100755
--- a/autotest/ogr/ogr_fielddomain.py
+++ b/autotest/ogr/ogr_fielddomain.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGRFieldDomain
diff --git a/autotest/ogr/ogr_flatgeobuf.py b/autotest/ogr/ogr_flatgeobuf.py
index bdbd0819e106..08afa12f1df2 100644
--- a/autotest/ogr/ogr_flatgeobuf.py
+++ b/autotest/ogr/ogr_flatgeobuf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  FlatGeobuf driver test suite.
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 32df14e4e900..efac45717588 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR Geoconcept driver functionality.
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index d80279983b3b..71ce18f27424 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GeoJSON driver test suite.
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index c041f1735b06..f3114a40853a 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGRGeoJSONSeq driver.
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 67911355b88c..53274e595e64 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Misc. OGRGeometry operations.
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index fee81566d24f..a071fc0cc536 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GEOS integration in OGR - geometric operations.
diff --git a/autotest/ogr/ogr_gml.py b/autotest/ogr/ogr_gml.py
index da3a16c808e6..2783dbb29ed9 100755
--- a/autotest/ogr/ogr_gml.py
+++ b/autotest/ogr/ogr_gml.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GML driver testing.
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index 3c1f305d5ad4..51087481b64a 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GML Reading Driver for Japanese FGD GML v4 testing.
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 2343e8f7bf3b..cb36dad469b6 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic OGR translation of WKT and WKB geometries.
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 5f333300d3d9..44afdf241d1a 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GMLAS driver testing.
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 5d178a2be551..0d0124f6811e 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR GMT driver functionality.
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 3d8ad7ceb46a..40105017167b 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GeoPackage driver functionality.
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index 4b5ce9f5bf57..88db09946b7c 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR GPSBabel driver.
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 457f262c80e2..5e8c5a4deebf 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GPX driver functionality.
diff --git a/autotest/ogr/ogr_gtfs.py b/autotest/ogr/ogr_gtfs.py
index 17856c0875ea..f48a78ab460a 100755
--- a/autotest/ogr/ogr_gtfs.py
+++ b/autotest/ogr/ogr_gtfs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GTFS driver testing
diff --git a/autotest/ogr/ogr_hana.py b/autotest/ogr/ogr_hana.py
index 16b4de256a25..4ef318c6e2ab 100644
--- a/autotest/ogr/ogr_hana.py
+++ b/autotest/ogr/ogr_hana.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SAP HANA driver functionality.
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index 4e65ad3cf60d..25863fab768e 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR Idrisi driver.
diff --git a/autotest/ogr/ogr_ili.py b/autotest/ogr/ogr_ili.py
index 1be3348f3772..9321132503db 100755
--- a/autotest/ogr/ogr_ili.py
+++ b/autotest/ogr/ogr_ili.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Interlis driver testing.
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index 6b8fa6f5b10b..c2cd3e5bbb50 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR INDEX support.
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 13da36faf116..a6c93f3390bb 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test JML driver functionality.
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index d2bea80434de..07a84031cea5 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR JOIN support.
diff --git a/autotest/ogr/ogr_jsonfg.py b/autotest/ogr/ogr_jsonfg.py
index 4c23584e2eea..16286c94cf76 100755
--- a/autotest/ogr/ogr_jsonfg.py
+++ b/autotest/ogr/ogr_jsonfg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test functionality for OGR JSONFG driver.
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index 957d93cb35f7..fa6d952d24a5 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  KML Driver testing.
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 52ece2b7786f..e0880763d8e5 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  LIBKML Driver testing.
diff --git a/autotest/ogr/ogr_lvbag.py b/autotest/ogr/ogr_lvbag.py
index c72cfb621e8b..912edd8c927f 100644
--- a/autotest/ogr/ogr_lvbag.py
+++ b/autotest/ogr/ogr_lvbag.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test LVBAG driver functionality.
diff --git a/autotest/ogr/ogr_mapml.py b/autotest/ogr/ogr_mapml.py
index 50038cf2ab6b..eb51e55c5806 100755
--- a/autotest/ogr/ogr_mapml.py
+++ b/autotest/ogr/ogr_mapml.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR MapML driver functionality.
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index e763eb031d7c..01c31f4953d8 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR Memory driver functionality.
diff --git a/autotest/ogr/ogr_miramon_vector.py b/autotest/ogr/ogr_miramon_vector.py
index 2f69a8158c26..3cfebb9b3ba6 100644
--- a/autotest/ogr/ogr_miramon_vector.py
+++ b/autotest/ogr/ogr_miramon_vector.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR MiraMon vector driver.
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index c692563b6809..09a6969378ff 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  MapInfo driver testing.
diff --git a/autotest/ogr/ogr_mongodbv3.py b/autotest/ogr/ogr_mongodbv3.py
index 0c932ce0601f..a8088e0bf8fd 100755
--- a/autotest/ogr/ogr_mongodbv3.py
+++ b/autotest/ogr/ogr_mongodbv3.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  MongoDBv3 driver testing.
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 914c6f8e2093..4c5629005e1a 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test MSSQLSpatial driver functionality.
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 92ec8d2c9666..3a6ad1dde9f8 100755
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR MVT driver functionality.
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index d490c69b736c..b00a6a3a336a 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test MySQL driver functionality.
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 07fc94749fd3..778c47f68177 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  NAS Reading Driver testing.
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index fdc1c5589915..0ed29c805724 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR NTF driver.
diff --git a/autotest/ogr/ogr_oapif.py b/autotest/ogr/ogr_oapif.py
index 6f62b21c13a4..8159efad971f 100755
--- a/autotest/ogr/ogr_oapif.py
+++ b/autotest/ogr/ogr_oapif.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  OAPIF driver testing.
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index 02e3683cbea4..a837c9b36fe5 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Oracle OCI driver functionality.
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index ebd0745ce184..6e5d274f9f5a 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR ODBC driver.
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 491665b09783..3beadd813382 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR ODS driver.
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 3d9accf1d891..9e8883b7d866 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR OGDI driver.
diff --git a/autotest/ogr/ogr_ogrtest.py b/autotest/ogr/ogr_ogrtest.py
index f30057122f61..98a4b8ab197f 100644
--- a/autotest/ogr/ogr_ogrtest.py
+++ b/autotest/ogr/ogr_ogrtest.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Tests of ogrtest utility functions
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 34abc6d8c257..da4e529509f2 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  OpenFileGDB driver testing.
diff --git a/autotest/ogr/ogr_openfilegdb_write.py b/autotest/ogr/ogr_openfilegdb_write.py
index d2b0486267a4..d0916bf3ad23 100755
--- a/autotest/ogr/ogr_openfilegdb_write.py
+++ b/autotest/ogr/ogr_openfilegdb_write.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  OpenFileGDB driver testing (write side)
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 70f664fc5b28..b692bbc481c3 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR OSM driver.
diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
index 912ca56c34e3..fde937ad629c 100755
--- a/autotest/ogr/ogr_parquet.py
+++ b/autotest/ogr/ogr_parquet.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read/write functionality for OGR Parquet driver.
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index 2f225ca5d02d..2c43c8d14718 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test PCIDSK driver functionality.
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 9be31d4db7bd..2bfb7d9bc168 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR PDF driver.
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index 341886c301b9..af54059a7ed4 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR PDS driver.
diff --git a/autotest/ogr/ogr_pds4.py b/autotest/ogr/ogr_pds4.py
index 900ccf2db52c..25aa00fc83c8 100755
--- a/autotest/ogr/ogr_pds4.py
+++ b/autotest/ogr/ogr_pds4.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test PDS4 format
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index 4efceeff0d1e..ec066ab30171 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test PostGIS driver functionality.
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 1472b05f5aa3..e97071951547 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR PGDump driver.
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index a1dfcfa7af60..4d399b428051 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR PGEO driver.
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index aae005636025..178f26b98556 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  PlanetLabs scene driver test suite.
diff --git a/autotest/ogr/ogr_pmtiles.py b/autotest/ogr/ogr_pmtiles.py
index 242a85124d9d..1e0689150794 100755
--- a/autotest/ogr/ogr_pmtiles.py
+++ b/autotest/ogr/ogr_pmtiles.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test PMTiles driver vector functionality.
diff --git a/autotest/ogr/ogr_pythondrivers.py b/autotest/ogr/ogr_pythondrivers.py
index 8d173c2f3271..f8e27026c572 100644
--- a/autotest/ogr/ogr_pythondrivers.py
+++ b/autotest/ogr/ogr_pythondrivers.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Python drivers
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index d76c0304ee4b..3e11f0561863 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test "shared" open, and various refcount based stuff.
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index 7efb6f955cb2..532481839c56 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RFC 30 (UTF filename handling) support.
diff --git a/autotest/ogr/ogr_rfc35.py b/autotest/ogr/ogr_rfc35.py
index 2688e1199088..0c9adfec95c8 100755
--- a/autotest/ogr/ogr_rfc35.py
+++ b/autotest/ogr/ogr_rfc35.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RFC35 for several drivers
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 9e8cccbd9c19..65aab747f6d2 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RFC41
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index 40f461a3800e..4f0364bad25b 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR S-57 driver functionality.
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index 97a18a0c6bf2..3fd0bd4bd838 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR SDTS driver functionality.
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index d777a11e41bc..0df5c2359e33 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Shapefile driver testing.
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 6ed720fec125..ae6829102d52 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test shapefile spatial index mechanism (.qix files). This can serve
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index 152af2f39818..6c47ed3b21f1 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ESRI shapefile spatial index mechanism (.sbn files). This can serve
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index 572059c1b753..a171de541a45 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR SOSI driver.
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 4405220bfb17..9ae9c57b7681 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR SQL capabilities added as part of RFC 28 implementation.
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index b6b1bafb2ead..63130f113f5b 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  SQLite SQL dialect testing.
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index fe517750e5d3..2d0e5505263c 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test various OGR SQL support options.
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 0d5d22526c2c..9bbd8382f69c 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SQLite driver functionality.
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 982df084a2be..6b8c390f03f4 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Style testing.
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index 7d564b3d28fa..34f4d48ea6f5 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SVG driver functionality.
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 636896ccf980..e24371d11087 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR TIGER driver.
diff --git a/autotest/ogr/ogr_tiledb.py b/autotest/ogr/ogr_tiledb.py
index 067f9e35906c..b4cb4826e994 100644
--- a/autotest/ogr/ogr_tiledb.py
+++ b/autotest/ogr/ogr_tiledb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test TileDB driver vector functionality.
diff --git a/autotest/ogr/ogr_topojson.py b/autotest/ogr/ogr_topojson.py
index 9dc502868aee..a83f23e5c6fa 100755
--- a/autotest/ogr/ogr_topojson.py
+++ b/autotest/ogr/ogr_topojson.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  TopJSON driver test suite.
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index aa0a277f2b96..57b9f9a85daa 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR VDV driver.
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index 73a2ffc24e63..f7d316cbbbcd 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR VFK driver functionality.
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 91a4fdebc03c..22530d9772ac 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  VirtualOGR testing
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index 43e8c612a548..8c46606b026a 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGR VRT driver functionality.
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 2908533afd09..8bf514f18ac0 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  WFS driver testing.
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 0033a03433b6..0eea9e119530 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic OGR translation of WKT and WKB geometries.
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 3047cbd63b75..508dcef5d845 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test support for the various "EMPTY" WKT geometry representations.
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index fd61c88fcad8..88597a5ab2b3 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR XLS driver.
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index a4b8cc287935..611f20368ffe 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test read functionality for OGR XLSX driver.
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index f1d77deb337c..f432b754d0bc 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OGRAPISPY
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index c14da1d0b007..af8ea798ead7 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Basic tests of OGRSpatialReference (OSR) operation, not including
diff --git a/autotest/osr/osr_basic_subprocess.py b/autotest/osr/osr_basic_subprocess.py
index 9c7712ad5b4d..ee0589ddc2cc 100755
--- a/autotest/osr/osr_basic_subprocess.py
+++ b/autotest/osr/osr_basic_subprocess.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test unsafe OSR operations
diff --git a/autotest/osr/osr_cf1.py b/autotest/osr/osr_cf1.py
index 8c672d26c553..84aa164a1382 100755
--- a/autotest/osr/osr_cf1.py
+++ b/autotest/osr/osr_cf1.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test CF1 spatial reference implementation.
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 854ebb783873..6cac426b1eee 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test COMPD_CS support.
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index a12c3675b768..89363f23935c 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test coordinate transformations.
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index ae896689ad03..68fe515a6a08 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test reprojection of points of many different projections.
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 0053cc91eec5..0a982c6fe9c3 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test aspects of EPSG code lookup.
diff --git a/autotest/osr/osr_erm.py b/autotest/osr/osr_erm.py
index 3e5403e828cc..9ea0afa02899 100755
--- a/autotest/osr/osr_erm.py
+++ b/autotest/osr/osr_erm.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ERMapper spatial reference implementation.
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index b439340bbb46..404708fd3344 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some ESRI specific translation issues.
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index b79827fc8286..93c59109d0f5 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some MITAB specific translation issues.
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 356f1bcaf6fd..c721bf391cd4 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OZI projection and datum support
diff --git a/autotest/osr/osr_pci.py b/autotest/osr/osr_pci.py
index 117ca0392234..f23113d7521f 100755
--- a/autotest/osr/osr_pci.py
+++ b/autotest/osr/osr_pci.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some PCI specific translation issues.
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 513bdff9bee8..4d04e29fec71 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some prime meridian related issues with EPSG translation
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 50932e4ec749..ca5a6d44cf95 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some PROJ.4 specific translation issues.
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 17dc87c5f06d..7bce453f5bc9 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some URL specific translation issues.
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 582886cfdf59..ff2c6bd52d88 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test some USGS specific translation issues.
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 73a5f3c2020b..fc4e92eeb8d9 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test (error cases of) OSRValidate
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 9822297909f4..88ca91240f4d 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test OSR XML import/export
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 2a119424df1b..3c6625889723 100755
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Python Library supporting GDAL/OGR Test Suite
diff --git a/autotest/pymod/ogrtest.py b/autotest/pymod/ogrtest.py
index fae366bc013e..a7696b0e2b8f 100755
--- a/autotest/pymod/ogrtest.py
+++ b/autotest/pymod/ogrtest.py
@@ -1,5 +1,4 @@
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Support functions for OGR tests.
diff --git a/autotest/pymod/test_cli_utilities.py b/autotest/pymod/test_cli_utilities.py
index 57864cab5ed0..4565c1899f29 100755
--- a/autotest/pymod/test_cli_utilities.py
+++ b/autotest/pymod/test_cli_utilities.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Helper functions for testing CLI utilities
diff --git a/autotest/pymod/test_py_scripts.py b/autotest/pymod/test_py_scripts.py
index 21a4aa99c95b..bf6fa76bd054 100755
--- a/autotest/pymod/test_py_scripts.py
+++ b/autotest/pymod/test_py_scripts.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Helper functions for testing python utilities
diff --git a/autotest/pymod/uffd.py b/autotest/pymod/uffd.py
index 74ee71341de2..81a3eb3c5aeb 100755
--- a/autotest/pymod/uffd.py
+++ b/autotest/pymod/uffd.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Python Library supporting GDAL/OGR Test Suite
diff --git a/autotest/pymod/webserver.py b/autotest/pymod/webserver.py
index e619a097c6c6..d702fcbe7d02 100755
--- a/autotest/pymod/webserver.py
+++ b/autotest/pymod/webserver.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Fake HTTP server
diff --git a/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py b/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py
index 913658e522c4..f5a31711a630 100644
--- a/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py
+++ b/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py b/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py
index be4e762bbcba..523572e9bc75 100644
--- a/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py
+++ b/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_logger.py b/autotest/pyscripts/gdal2tiles/test_logger.py
index ca32fd84d68b..fbfad0f0af74 100644
--- a/autotest/pyscripts/gdal2tiles/test_logger.py
+++ b/autotest/pyscripts/gdal2tiles/test_logger.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py b/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py
index 21db8db7fd20..00fa4901b173 100644
--- a/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py
+++ b/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_option_parser.py b/autotest/pyscripts/gdal2tiles/test_option_parser.py
index f6fecc232197..b2c4b9138694 100644
--- a/autotest/pyscripts/gdal2tiles/test_option_parser.py
+++ b/autotest/pyscripts/gdal2tiles/test_option_parser.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py b/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py
index 43318166be37..e475f3467d8b 100644
--- a/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py
+++ b/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py b/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py
index a8905b403e98..5eaa852c5915 100644
--- a/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py
+++ b/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py b/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py
index c41a07e8c860..27fa1e39ba9c 100644
--- a/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py
+++ b/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py b/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py
index 29ea02992966..fac268b69a5c 100644
--- a/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py
+++ b/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/gdal2tiles/test_vsimem.py b/autotest/pyscripts/gdal2tiles/test_vsimem.py
index f09b3825e2fc..fbd6ab42c297 100644
--- a/autotest/pyscripts/gdal2tiles/test_vsimem.py
+++ b/autotest/pyscripts/gdal2tiles/test_vsimem.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index e4012ce41468..cbcdc7380243 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal2tiles.py testing
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 8f5adbda27a7..8f89a28b388d 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_edit.py testing
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index b24323242393..c32b0b21d06e 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_fillnodata.py testing
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 54b03771de05..7b8ffc0535b5 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_ls.py testing
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index ab39d60ea2f3..ac5e9815fdb2 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_merge.py testing
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 584f9d9b81ea..44835137ec97 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_pansharpen testing
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index 4319d29aa739..a995419dd2e9 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal_polygonize.py script
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index a09ce5a4e461..6459bf291653 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal_proximity.py script
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index 25c1359862d3..49acd9a6978a 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_retile.py testing
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index e61699f159dc..329440abbf0e 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal_sieve.py utility
diff --git a/autotest/pyscripts/test_gdalattachpct.py b/autotest/pyscripts/test_gdalattachpct.py
index 6954b55444f3..dbff30cd91cd 100755
--- a/autotest/pyscripts/test_gdalattachpct.py
+++ b/autotest/pyscripts/test_gdalattachpct.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalattachpct.py testing
diff --git a/autotest/pyscripts/test_gdalbuildvrtofvrt.py b/autotest/pyscripts/test_gdalbuildvrtofvrt.py
index db3001f3a618..7fb89c84cbd9 100755
--- a/autotest/pyscripts/test_gdalbuildvrtofvrt.py
+++ b/autotest/pyscripts/test_gdalbuildvrtofvrt.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalbuildvrtofvrt.py testing
diff --git a/autotest/pyscripts/test_gdalcompare.py b/autotest/pyscripts/test_gdalcompare.py
index 1a021580202a..6a569f5b3c5e 100644
--- a/autotest/pyscripts/test_gdalcompare.py
+++ b/autotest/pyscripts/test_gdalcompare.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalcompare.py testing
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index b5527c71d371..5e98041ef412 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalinfo.py testing
diff --git a/autotest/pyscripts/test_gdallocationinfo_py.py b/autotest/pyscripts/test_gdallocationinfo_py.py
index 3ca9312ece20..cd71f9182988 100644
--- a/autotest/pyscripts/test_gdallocationinfo_py.py
+++ b/autotest/pyscripts/test_gdallocationinfo_py.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdallocationinfo.py testing
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 84080916d47f..274862b7e6ab 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalmove testing
diff --git a/autotest/pyscripts/test_ogr_layer_algebra.py b/autotest/pyscripts/test_ogr_layer_algebra.py
index 2a16fc5412ef..2b83faa22288 100644
--- a/autotest/pyscripts/test_ogr_layer_algebra.py
+++ b/autotest/pyscripts/test_ogr_layer_algebra.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  To test the functionality of ogr_layer_algebra script
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 7be7d6546465..998bfcb242d0 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ogrinfo.py testing
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index e6600485e86c..c7cc62cb57f7 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ogrmerge.py testing
diff --git a/autotest/pyscripts/test_pct.py b/autotest/pyscripts/test_pct.py
index c549685ea5ff..1378d280f5a1 100755
--- a/autotest/pyscripts/test_pct.py
+++ b/autotest/pyscripts/test_pct.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  rgb2pct.py and pct2rgb.py testing
diff --git a/autotest/pyscripts/test_validate_geoparquet.py b/autotest/pyscripts/test_validate_geoparquet.py
index b29c6b70cc2c..a4ecd5571a3b 100755
--- a/autotest/pyscripts/test_validate_geoparquet.py
+++ b/autotest/pyscripts/test_validate_geoparquet.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  validate_geoparquet testing
diff --git a/autotest/slow_tests/raster.py b/autotest/slow_tests/raster.py
index e6927afa5ff8..6712ee0e455e 100644
--- a/autotest/slow_tests/raster.py
+++ b/autotest/slow_tests/raster.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Raster testing
diff --git a/autotest/test_random_tiff.py b/autotest/test_random_tiff.py
index 8115fa3b27da..f40a1c8d1bb0 100755
--- a/autotest/test_random_tiff.py
+++ b/autotest/test_random_tiff.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test "random" TIFF files
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index c46f277afa2e..538096b63b28 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_contour testing
diff --git a/autotest/utilities/test_gdal_create.py b/autotest/utilities/test_gdal_create.py
index 7e50e54df7f8..db6a0c71a00a 100755
--- a/autotest/utilities/test_gdal_create.py
+++ b/autotest/utilities/test_gdal_create.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_create testing
diff --git a/autotest/utilities/test_gdal_footprint.py b/autotest/utilities/test_gdal_footprint.py
index bb24662d55f4..e5885e66ef9e 100755
--- a/autotest/utilities/test_gdal_footprint.py
+++ b/autotest/utilities/test_gdal_footprint.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_footprint testing
diff --git a/autotest/utilities/test_gdal_footprint_lib.py b/autotest/utilities/test_gdal_footprint_lib.py
index 2b80576444c4..48f85f73e551 100755
--- a/autotest/utilities/test_gdal_footprint_lib.py
+++ b/autotest/utilities/test_gdal_footprint_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_footprint testing
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 48ebb0a0a9d7..ed732ce60be6 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_grid testing
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 2c25a4a18258..0e9222015b16 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_grid testing
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index bb81108e3e4b..8a015a30ec6c 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_rasterize testing
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index bc44636d5fc2..ff508a9e2390 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_rasterize testing
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 6d21dfc75720..ba8905d167d3 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_translate testing
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 6d58bf601e0c..21fdd873cca2 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test librarified gdal_translate
diff --git a/autotest/utilities/test_gdal_viewshed.py b/autotest/utilities/test_gdal_viewshed.py
index 945ae886727d..6cb72171e5b5 100755
--- a/autotest/utilities/test_gdal_viewshed.py
+++ b/autotest/utilities/test_gdal_viewshed.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdal_viewshed testing
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index b55a16dc61c7..d8d8821a8f4c 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdaladdo testing
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 42e6b33aed7b..3994b5cd9caa 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalbuildvrt testing
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index 1b1b9b0a67d1..8645f6bbdcd9 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test librarified gdalbuildvrt
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 1c934c8f272a..d250cd4baa1e 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdaldem testing
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index f7254e2280e5..e348592f2ca2 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdaldem testing
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index 744f1bdb34e1..9e0447302d48 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalinfo testing
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 8333b30d1c02..b067abc97bd6 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test librarified gdalinfo
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 4e75959308a3..8ebebf2b471b 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdallocationinfo testing
diff --git a/autotest/utilities/test_gdalmanage.py b/autotest/utilities/test_gdalmanage.py
index dbf4ed454a09..ec18d8945bdc 100644
--- a/autotest/utilities/test_gdalmanage.py
+++ b/autotest/utilities/test_gdalmanage.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalmanage testing
diff --git a/autotest/utilities/test_gdalmdiminfo.py b/autotest/utilities/test_gdalmdiminfo.py
index 65567314d562..6fd2cfb6eb84 100755
--- a/autotest/utilities/test_gdalmdiminfo.py
+++ b/autotest/utilities/test_gdalmdiminfo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalmdiminfo testing
diff --git a/autotest/utilities/test_gdalmdiminfo_lib.py b/autotest/utilities/test_gdalmdiminfo_lib.py
index 2a159b72f4c1..bcd3c6add848 100755
--- a/autotest/utilities/test_gdalmdiminfo_lib.py
+++ b/autotest/utilities/test_gdalmdiminfo_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test librarified gdalmdiminfo
diff --git a/autotest/utilities/test_gdalmdimtranslate.py b/autotest/utilities/test_gdalmdimtranslate.py
index d6aedd37fbff..bdd19ea2fde4 100755
--- a/autotest/utilities/test_gdalmdimtranslate.py
+++ b/autotest/utilities/test_gdalmdimtranslate.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test command line gdalmdimtranslate
diff --git a/autotest/utilities/test_gdalmdimtranslate_lib.py b/autotest/utilities/test_gdalmdimtranslate_lib.py
index acd81ff4312a..c036e5ff2393 100755
--- a/autotest/utilities/test_gdalmdimtranslate_lib.py
+++ b/autotest/utilities/test_gdalmdimtranslate_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test librarified gdalmdimtranslate
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index fcc82d958368..c1fd91560ea1 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalsrsinfo testing
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index a3eab02708dc..35a3d499c3d7 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdaltindex testing
diff --git a/autotest/utilities/test_gdaltindex_lib.py b/autotest/utilities/test_gdaltindex_lib.py
index 505093b0d2f7..c7ddd3d8bd25 100644
--- a/autotest/utilities/test_gdaltindex_lib.py
+++ b/autotest/utilities/test_gdaltindex_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Library version of gdaltindex testing
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 34a163b7855e..24ab3dc13408 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdaltransform testing
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index 6c499ab8fd66..7ccda69a57a0 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  gdalwarp testing
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index b3d0363ca362..29d12991e966 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -1,7 +1,6 @@
 # ve!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  test librarified gdalwarp
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index e8e27a6eec84..ecbfa2bc57a7 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test basic GNMGdalNetwork class functionality.
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index 0b44ad3ae37b..c423a9d22879 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  nearblack testing
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 8d23b24da7b3..1dc6c98219ff 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  nearblack testing
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index 791fddcf0b00..a214fa9b39fe 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ogr2ogr testing
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 2526163097a2..cc17c4c076c2 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  librarified ogr2ogr testing
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 25fcda0584a3..bdb9d089cc28 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ogrinfo testing
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index 4c35a9d4d184..c962a0856eb3 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ogrtindex testing
diff --git a/autotest/utilities/test_sozip.py b/autotest/utilities/test_sozip.py
index c94b18457903..6c8765e96ffe 100755
--- a/autotest/utilities/test_sozip.py
+++ b/autotest/utilities/test_sozip.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  sozip testing
diff --git a/frmts/aaigrid/aaigriddataset.h b/frmts/aaigrid/aaigriddataset.h
index 0cbf4dfdc2fa..67ec6d6c544a 100644
--- a/frmts/aaigrid/aaigriddataset.h
+++ b/frmts/aaigrid/aaigriddataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Implements Arc/Info ASCII Grid Format.
diff --git a/frmts/aigrid/aigccitt.c b/frmts/aigrid/aigccitt.c
index 81f18307be1b..a5e983ab7a45 100644
--- a/frmts/aigrid/aigccitt.c
+++ b/frmts/aigrid/aigccitt.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc/Info Binary Grid Translator
  * Purpose:  Code for decoding CCITT RLE (G1) compressed data.
diff --git a/frmts/aigrid/aigopen.c b/frmts/aigrid/aigopen.c
index c3db7ba6dcf5..f61e2b5022a6 100644
--- a/frmts/aigrid/aigopen.c
+++ b/frmts/aigrid/aigopen.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc/Info Binary Grid Translator
  * Purpose:  Grid file access cover API for non-GDAL use.
diff --git a/frmts/aigrid/aigrid.h b/frmts/aigrid/aigrid.h
index 1ef9da9792c9..f9efbfa2c8ea 100644
--- a/frmts/aigrid/aigrid.h
+++ b/frmts/aigrid/aigrid.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc/Info Binary Grid Translator
  * Purpose:  Grid file access include file.
diff --git a/frmts/aigrid/aitest.c b/frmts/aigrid/aitest.c
index d14fe567205a..3217c0a91c41 100644
--- a/frmts/aigrid/aitest.c
+++ b/frmts/aigrid/aitest.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc/Info Binary Grid Translator
  * Purpose:  Test mainline for examining AIGrid files.
diff --git a/frmts/aigrid/gridlib.c b/frmts/aigrid/gridlib.c
index f35bfcb4a6d0..fb1ae8a1be4f 100644
--- a/frmts/aigrid/gridlib.c
+++ b/frmts/aigrid/gridlib.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc/Info Binary Grid Translator
  * Purpose:  Grid file reading code.
diff --git a/frmts/bsb/bsb2raw.c b/frmts/bsb/bsb2raw.c
index 9758b84d4913..6bc7e2922243 100644
--- a/frmts/bsb/bsb2raw.c
+++ b/frmts/bsb/bsb2raw.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  BSB Reader
  * Purpose:  Test program for dumping BSB to PPM raster format.
diff --git a/frmts/bsb/bsb_read.c b/frmts/bsb/bsb_read.c
index 8f437bde0fff..ede8061a0ab7 100644
--- a/frmts/bsb/bsb_read.c
+++ b/frmts/bsb/bsb_read.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  BSB Reader
  * Purpose:  Low level BSB Access API Implementation (non-GDAL).
diff --git a/frmts/bsb/bsb_read.h b/frmts/bsb/bsb_read.h
index 95e191853dfc..c660196ef53d 100644
--- a/frmts/bsb/bsb_read.h
+++ b/frmts/bsb/bsb_read.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  BSB Reader
  * Purpose:  non-GDAL BSB API Declarations
diff --git a/frmts/ceos/ceosopen.c b/frmts/ceos/ceosopen.c
index aa3c83d80d5d..68580b7eb096 100644
--- a/frmts/ceos/ceosopen.c
+++ b/frmts/ceos/ceosopen.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CEOS Translator
  * Purpose:  Implementation of non-GDAL dependent CEOS support.
diff --git a/frmts/ceos/ceosopen.h b/frmts/ceos/ceosopen.h
index f1c8fde51a7e..40a76e0ab006 100644
--- a/frmts/ceos/ceosopen.h
+++ b/frmts/ceos/ceosopen.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CEOS Translator
  * Purpose:  Public (C callable) interface for CEOS and related formats such
diff --git a/frmts/ceos/ceostest.c b/frmts/ceos/ceostest.c
index 6ad4726b1bf8..6a8350511e2d 100644
--- a/frmts/ceos/ceostest.c
+++ b/frmts/ceos/ceostest.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CEOS Translator
  * Purpose:  Test mainline.
diff --git a/frmts/ceos2/ceos.c b/frmts/ceos2/ceos.c
index 5104882db32f..164600d0830f 100644
--- a/frmts/ceos2/ceos.c
+++ b/frmts/ceos2/ceos.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ASI CEOS Translator
  * Purpose:  Core CEOS functions.
diff --git a/frmts/ceos2/ceos.h b/frmts/ceos2/ceos.h
index 54fd760396e8..c10a4057d186 100644
--- a/frmts/ceos2/ceos.h
+++ b/frmts/ceos2/ceos.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ASI CEOS Translator
  * Purpose:  CEOS library prototypes
diff --git a/frmts/ceos2/ceosrecipe.c b/frmts/ceos2/ceosrecipe.c
index 82a0960f6c12..9babc5c2601a 100644
--- a/frmts/ceos2/ceosrecipe.c
+++ b/frmts/ceos2/ceosrecipe.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ASI CEOS Translator
  * Purpose:  CEOS field layout recipes.
diff --git a/frmts/ceos2/ceossar.c b/frmts/ceos2/ceossar.c
index 405147b44089..e1c2c13b8d24 100644
--- a/frmts/ceos2/ceossar.c
+++ b/frmts/ceos2/ceossar.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ASI CEOS Translator
  * Purpose:  Functions related to CeosSARVolume_t.
diff --git a/frmts/ceos2/link.c b/frmts/ceos2/link.c
index 769984cb23d6..05e399c03b28 100644
--- a/frmts/ceos2/link.c
+++ b/frmts/ceos2/link.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ASI CEOS Translator
  * Purpose:  Link list function replacements.
diff --git a/frmts/dted/dted_api.c b/frmts/dted/dted_api.c
index 2cbe82c02506..7f94a426a393 100644
--- a/frmts/dted/dted_api.c
+++ b/frmts/dted/dted_api.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DTED Translator
  * Purpose:  Implementation of DTED/CDED access functions.
diff --git a/frmts/dted/dted_api.h b/frmts/dted/dted_api.h
index 3d7d61793f4a..26427ba3cf0e 100644
--- a/frmts/dted/dted_api.h
+++ b/frmts/dted/dted_api.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DTED Translator
  * Purpose:  Public (C callable) interface for DTED/CDED reading.
diff --git a/frmts/dted/dted_create.c b/frmts/dted/dted_create.c
index 47efd71fbc16..94225d27b754 100644
--- a/frmts/dted/dted_create.c
+++ b/frmts/dted/dted_create.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DTED Translator
  * Purpose:  Implementation of DTEDCreate() portion of DTED API.
diff --git a/frmts/dted/dted_ptstream.c b/frmts/dted/dted_ptstream.c
index 6dbd11563652..0e722f0a49d4 100644
--- a/frmts/dted/dted_ptstream.c
+++ b/frmts/dted/dted_ptstream.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DTED Translator
  * Purpose:  DTED Point Stream Writer.
diff --git a/frmts/dted/dted_test.c b/frmts/dted/dted_test.c
index 0ee60a4454f2..947a419fc9df 100644
--- a/frmts/dted/dted_test.c
+++ b/frmts/dted/dted_test.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DTED Translator
  * Purpose:  Test mainline for DTED writer.
diff --git a/frmts/ecw/gdal_ecw.h b/frmts/ecw/gdal_ecw.h
index a6eed743c0bf..70ec8ec3464d 100644
--- a/frmts/ecw/gdal_ecw.h
+++ b/frmts/ecw/gdal_ecw.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  ECW (ERDAS Wavelet Compression Format) Driver Definitions
diff --git a/frmts/ecw/lookup.py b/frmts/ecw/lookup.py
index a8a3d1d7693f..fe794d4765c1 100644
--- a/frmts/ecw/lookup.py
+++ b/frmts/ecw/lookup.py
@@ -1,6 +1,4 @@
 # ******************************************************************************
-#  $Id$
-#
 #  Project:  GDAL ECW Driver
 #  Purpose:  Script to lookup ECW (GDT) coordinate systems and translate
 #            into OGC WKT for storage in $GDAL_HOME/data/ecw_cs.wkt.
diff --git a/frmts/envisat/EnvisatFile.c b/frmts/envisat/EnvisatFile.c
index f1d5b4de5dc7..cac22675b3fb 100644
--- a/frmts/envisat/EnvisatFile.c
+++ b/frmts/envisat/EnvisatFile.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  APP ENVISAT Support
  * Purpose:  Low Level Envisat file access (read/write) API.
diff --git a/frmts/envisat/EnvisatFile.h b/frmts/envisat/EnvisatFile.h
index c4797377dc02..fcfeaffe9cc1 100644
--- a/frmts/envisat/EnvisatFile.h
+++ b/frmts/envisat/EnvisatFile.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  APP ENVISAT Support
  * Purpose:  Low Level Envisat file access (read/write) API.
diff --git a/frmts/envisat/adsrange.hpp b/frmts/envisat/adsrange.hpp
index 9dc8c96b9868..96410b8d8f7d 100644
--- a/frmts/envisat/adsrange.hpp
+++ b/frmts/envisat/adsrange.hpp
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id$
- *
  * Project:  APP ENVISAT Support
  * Purpose:  Detect range of ADS records matching the MDS records
  * Author:   Martin Paces, martin.paces@eox.at
diff --git a/frmts/envisat/dumpgeo.c b/frmts/envisat/dumpgeo.c
index e89adc345186..8cda98b6361e 100644
--- a/frmts/envisat/dumpgeo.c
+++ b/frmts/envisat/dumpgeo.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  APP ENVISAT Support
  * Purpose:  Test mainline for dumping ENVISAT format files.
diff --git a/frmts/envisat/envisat_dump.c b/frmts/envisat/envisat_dump.c
index 083fbd575eb6..851b9ae093d2 100644
--- a/frmts/envisat/envisat_dump.c
+++ b/frmts/envisat/envisat_dump.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  APP ENVISAT Support
  * Purpose:  Test mainline for dumping ENVISAT format files.
diff --git a/frmts/envisat/records.c b/frmts/envisat/records.c
index e2d50cefbff0..665053775355 100644
--- a/frmts/envisat/records.c
+++ b/frmts/envisat/records.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  APP ENVISAT Support
  * Purpose:  Low Level Envisat file access (read/write) API.
diff --git a/frmts/envisat/records.h b/frmts/envisat/records.h
index 3b12745239c9..a59e0db67fd9 100644
--- a/frmts/envisat/records.h
+++ b/frmts/envisat/records.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  APP ENVISAT Support
  * Purpose:  Low Level Envisat file access (read/write) API.
diff --git a/frmts/envisat/timedelta.hpp b/frmts/envisat/timedelta.hpp
index 4ecbc50b48c5..78f4ab6ab01f 100644
--- a/frmts/envisat/timedelta.hpp
+++ b/frmts/envisat/timedelta.hpp
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id$
- *
  * Project:  APP ENVISAT Support
  * Purpose:  time difference class for handling of Envisat MJD time
  * Author:   Martin Paces, martin.paces@eox.at
diff --git a/frmts/fit/fit.h b/frmts/fit/fit.h
index 938725f62e3c..db52fe18ef41 100644
--- a/frmts/fit/fit.h
+++ b/frmts/fit/fit.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  FIT Driver
  * Purpose:  Implement FIT Support - not using the SGI iflFIT library.
diff --git a/frmts/fit/gstEndian.h b/frmts/fit/gstEndian.h
index 15fd3038de16..bc1fb813a25c 100644
--- a/frmts/fit/gstEndian.h
+++ b/frmts/fit/gstEndian.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  FIT Driver
  * Purpose:  Implement FIT Support - not using the SGI iflFIT library.
diff --git a/frmts/fit/gstTypes.h b/frmts/fit/gstTypes.h
index 02e5f82c30ea..4c2ce3b44a03 100644
--- a/frmts/fit/gstTypes.h
+++ b/frmts/fit/gstTypes.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  FIT Driver
  * Purpose:  Implement FIT Support - not using the SGI iflFIT library.
diff --git a/frmts/gif/gifabstractdataset.h b/frmts/gif/gifabstractdataset.h
index f8aeeeeaba24..9da42f0b608d 100644
--- a/frmts/gif/gifabstractdataset.h
+++ b/frmts/gif/gifabstractdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GIF Driver
  * Purpose:  GIF Abstract Dataset
diff --git a/frmts/grib/gribdataset.h b/frmts/grib/gribdataset.h
index 0f48cbb14b2e..17be07f5e16d 100644
--- a/frmts/grib/gribdataset.h
+++ b/frmts/grib/gribdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GRIB Driver
  * Purpose:  GDALDataset driver for GRIB translator for read support
diff --git a/frmts/gti/data/gdaltileindex.xsd b/frmts/gti/data/gdaltileindex.xsd
index 9aad7a6b28e4..9289018c5f7e 100644
--- a/frmts/gti/data/gdaltileindex.xsd
+++ b/frmts/gti/data/gdaltileindex.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL/OGR
  * Purpose:  XML Schema for GDAL GTI files.
  * Author:   Even Rouault, <even dot rouault at spatialys dot com>
diff --git a/frmts/gtiff/gt_citation.h b/frmts/gtiff/gt_citation.h
index 6dd992fce4f0..9b55105f690b 100644
--- a/frmts/gtiff/gt_citation.h
+++ b/frmts/gtiff/gt_citation.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Implements special parsing of Imagine citation strings, and
diff --git a/frmts/gtiff/gt_jpeg_copy.h b/frmts/gtiff/gt_jpeg_copy.h
index 7ae3c326caa5..67fae0488107 100644
--- a/frmts/gtiff/gt_jpeg_copy.h
+++ b/frmts/gtiff/gt_jpeg_copy.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Specialized copy of JPEG content into TIFF.
diff --git a/frmts/gtiff/gt_overview.h b/frmts/gtiff/gt_overview.h
index 5baec0358106..9216aa22e4d0 100644
--- a/frmts/gtiff/gt_overview.h
+++ b/frmts/gtiff/gt_overview.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Code to build overviews of external databases as a TIFF file.
diff --git a/frmts/gtiff/gt_wkt_srs.h b/frmts/gtiff/gt_wkt_srs.h
index a90a15e07629..a1015b9b957b 100644
--- a/frmts/gtiff/gt_wkt_srs.h
+++ b/frmts/gtiff/gt_wkt_srs.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Implements translation between GeoTIFF normalized projection
diff --git a/frmts/gtiff/gt_wkt_srs_for_gdal.h b/frmts/gtiff/gt_wkt_srs_for_gdal.h
index 28e8dc8ee656..105b03f36c00 100644
--- a/frmts/gtiff/gt_wkt_srs_for_gdal.h
+++ b/frmts/gtiff/gt_wkt_srs_for_gdal.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Read/Write in-memory GeoTIFF file
diff --git a/frmts/gtiff/gt_wkt_srs_priv.h b/frmts/gtiff/gt_wkt_srs_priv.h
index 01183dc1501c..38279d548289 100644
--- a/frmts/gtiff/gt_wkt_srs_priv.h
+++ b/frmts/gtiff/gt_wkt_srs_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Internal methods of gt_wkt_srs.cpp shared with gt_citation.cpp
diff --git a/frmts/gtiff/gtiff.h b/frmts/gtiff/gtiff.h
index 02fdf07691e5..cf75c0468244 100644
--- a/frmts/gtiff/gtiff.h
+++ b/frmts/gtiff/gtiff.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  GDAL GeoTIFF support.
diff --git a/frmts/gtiff/libgeotiff/geo_extra.c b/frmts/gtiff/libgeotiff/geo_extra.c
index 924e4810de7c..f13c703b4574 100644
--- a/frmts/gtiff/libgeotiff/geo_extra.c
+++ b/frmts/gtiff/libgeotiff/geo_extra.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  libgeotiff
  * Purpose:  Code to normalize a few common PCS values
diff --git a/frmts/gtiff/libgeotiff/geo_normalize.c b/frmts/gtiff/libgeotiff/geo_normalize.c
index 8c2703ea11d0..538fffbab003 100644
--- a/frmts/gtiff/libgeotiff/geo_normalize.c
+++ b/frmts/gtiff/libgeotiff/geo_normalize.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  libgeotiff
  * Purpose:  Code to normalize PCS and other composite codes in a GeoTIFF file.
diff --git a/frmts/gtiff/libgeotiff/geo_normalize.h b/frmts/gtiff/libgeotiff/geo_normalize.h
index da70c4e5dbf9..c132b40aaa01 100644
--- a/frmts/gtiff/libgeotiff/geo_normalize.h
+++ b/frmts/gtiff/libgeotiff/geo_normalize.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  libgeotiff
  * Purpose:  Include file related to geo_normalize.c containing Code to
diff --git a/frmts/gtiff/libgeotiff/geo_trans.c b/frmts/gtiff/libgeotiff/geo_trans.c
index 0e8208f3199c..5d63cda80e2d 100644
--- a/frmts/gtiff/libgeotiff/geo_trans.c
+++ b/frmts/gtiff/libgeotiff/geo_trans.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  libgeotiff
  * Purpose:  Code to abstract translation between pixel/line and PCS
diff --git a/frmts/gtiff/libgeotiff/geotiff_proj4.c b/frmts/gtiff/libgeotiff/geotiff_proj4.c
index 77041bcdaab7..2f6665de1bfa 100644
--- a/frmts/gtiff/libgeotiff/geotiff_proj4.c
+++ b/frmts/gtiff/libgeotiff/geotiff_proj4.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  libgeotiff
  * Purpose:  Code to convert a normalized GeoTIFF definition into a PROJ.4
diff --git a/frmts/gtiff/libtiff/tif_hash_set.h b/frmts/gtiff/libtiff/tif_hash_set.h
index f60e2c675e53..3f7721775f16 100644
--- a/frmts/gtiff/libtiff/tif_hash_set.h
+++ b/frmts/gtiff/libtiff/tif_hash_set.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     tif_hash_set.h
  * Project:  TIFF - Common Portability Library
diff --git a/frmts/gtiff/libtiff/tif_vsi.c b/frmts/gtiff/libtiff/tif_vsi.c
index 71e41a6b7669..72bc75fd56dd 100644
--- a/frmts/gtiff/libtiff/tif_vsi.c
+++ b/frmts/gtiff/libtiff/tif_vsi.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Implement system hook functions for libtiff on top of CPL/VSI,
diff --git a/frmts/gtiff/tifvsi.h b/frmts/gtiff/tifvsi.h
index 023bd5335e6e..ed7dbaa26be6 100644
--- a/frmts/gtiff/tifvsi.h
+++ b/frmts/gtiff/tifvsi.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Implement system hook functions for libtiff on top of CPL/VSI,
diff --git a/frmts/gxf/gxf_ogcwkt.c b/frmts/gxf/gxf_ogcwkt.c
index 1cd589492f40..d5f66dd770df 100644
--- a/frmts/gxf/gxf_ogcwkt.c
+++ b/frmts/gxf/gxf_ogcwkt.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GXF Reader
  * Purpose:  Handle GXF to OGC WKT projection transformation.
diff --git a/frmts/gxf/gxf_proj4.c b/frmts/gxf/gxf_proj4.c
index 6499e8f1291d..dfa3de3b1436 100644
--- a/frmts/gxf/gxf_proj4.c
+++ b/frmts/gxf/gxf_proj4.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GXF Reader
  * Purpose:  Handle GXF to PROJ.4 projection transformation.
diff --git a/frmts/gxf/gxfopen.c b/frmts/gxf/gxfopen.c
index abb131481071..bac9178bb54b 100644
--- a/frmts/gxf/gxfopen.c
+++ b/frmts/gxf/gxfopen.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GXF Reader
  * Purpose:  Majority of Geosoft GXF reading code.
diff --git a/frmts/gxf/gxfopen.h b/frmts/gxf/gxfopen.h
index 7e591bce170e..da485374df09 100644
--- a/frmts/gxf/gxfopen.h
+++ b/frmts/gxf/gxfopen.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GXF Reader
  * Purpose:  GXF-3 access function declarations.
diff --git a/frmts/hdf4/hdf-eos/EHapi.c b/frmts/hdf4/hdf-eos/EHapi.c
index 46f1d4bb17fd..51557f5b4e58 100644
--- a/frmts/hdf4/hdf-eos/EHapi.c
+++ b/frmts/hdf4/hdf-eos/EHapi.c
@@ -1,5 +1,4 @@
 /*****************************************************************************
- * $Id$
  *
  * This module has a number of additions and improvements over the original
  * implementation to be suitable for usage in GDAL HDF driver.
diff --git a/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c
index 1a8be985d47b..4c79a99694ef 100644
--- a/frmts/hdf4/hdf-eos/GDapi.c
+++ b/frmts/hdf4/hdf-eos/GDapi.c
@@ -1,5 +1,4 @@
 /*****************************************************************************
- * $Id$
  *
  * This module has a number of additions and improvements over the original
  * implementation to be suitable for usage in GDAL HDF driver.
diff --git a/frmts/hdf4/hdf-eos/HdfEosDef.h b/frmts/hdf4/hdf-eos/HdfEosDef.h
index 88f65dddbd2d..adb0d6d257da 100644
--- a/frmts/hdf4/hdf-eos/HdfEosDef.h
+++ b/frmts/hdf4/hdf-eos/HdfEosDef.h
@@ -1,5 +1,4 @@
 /*****************************************************************************
- * $Id$
  *
  * This module has a number of additions and improvements over the original
  * implementation to be suitable for usage in GDAL HDF driver.
diff --git a/frmts/hdf4/hdf-eos/SWapi.c b/frmts/hdf4/hdf-eos/SWapi.c
index 4ceb690b3cce..c5c8b10c548a 100644
--- a/frmts/hdf4/hdf-eos/SWapi.c
+++ b/frmts/hdf4/hdf-eos/SWapi.c
@@ -1,5 +1,4 @@
 /*****************************************************************************
- * $Id$
  *
  * This module has a number of additions and improvements over the original
  * implementation to be suitable for usage in GDAL HDF driver.
diff --git a/frmts/hdf4/hdf-eos/gctp_wrap.c b/frmts/hdf4/hdf-eos/gctp_wrap.c
index a3795f6a129c..38fe18e5318a 100644
--- a/frmts/hdf4/hdf-eos/gctp_wrap.c
+++ b/frmts/hdf4/hdf-eos/gctp_wrap.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 4 (HDF4)
  * Purpose:  This is the wrapper code to use OGR Coordinate Transformation
diff --git a/frmts/hdf4/hdf4compat.h b/frmts/hdf4/hdf4compat.h
index 135dd5c06f5c..6d0a5d97dc4c 100644
--- a/frmts/hdf4/hdf4compat.h
+++ b/frmts/hdf4/hdf4compat.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 4 (HDF4)
  * Purpose:  Header file for HDF4 compatibility
diff --git a/frmts/hdf4/hdf4dataset.h b/frmts/hdf4/hdf4dataset.h
index 9660f36f7190..3f5367c11dc4 100644
--- a/frmts/hdf4/hdf4dataset.h
+++ b/frmts/hdf4/hdf4dataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 4 (HDF4)
  * Purpose:  Header file for HDF4 datasets reader.
diff --git a/frmts/hdf5/gh5_convenience.h b/frmts/hdf5/gh5_convenience.h
index 026b113c13b2..83c8b4a38936 100644
--- a/frmts/hdf5/gh5_convenience.h
+++ b/frmts/hdf5/gh5_convenience.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 5 (HDF5)
  * Purpose:  HDF5 convenience functions.
diff --git a/frmts/hdf5/hdf5_api.h b/frmts/hdf5/hdf5_api.h
index 7cd02c4df293..888579b65035 100644
--- a/frmts/hdf5/hdf5_api.h
+++ b/frmts/hdf5/hdf5_api.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 5 (HDF5)
  * Purpose:  Import HDF5 public API
diff --git a/frmts/hdf5/hdf5dataset.h b/frmts/hdf5/hdf5dataset.h
index cf271945ac83..9b9c148ac03d 100644
--- a/frmts/hdf5/hdf5dataset.h
+++ b/frmts/hdf5/hdf5dataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 5 (HDF5)
  * Purpose:  Header file for HDF5 datasets reader.
diff --git a/frmts/hdf5/hdf5eosparser.cpp b/frmts/hdf5/hdf5eosparser.cpp
index 5fecc7f6dcbc..8ff928064fd5 100644
--- a/frmts/hdf5/hdf5eosparser.cpp
+++ b/frmts/hdf5/hdf5eosparser.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 5 (HDF5)
  * Purpose:  Implementation of HDF5 HDFEOS parser
diff --git a/frmts/hdf5/hdf5eosparser.h b/frmts/hdf5/hdf5eosparser.h
index 1ccb3f3e5c4a..1acd9376a28c 100644
--- a/frmts/hdf5/hdf5eosparser.h
+++ b/frmts/hdf5/hdf5eosparser.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Hierarchical Data Format Release 5 (HDF5)
  * Purpose:  Header file for HDF5 HDFEOS parser
diff --git a/frmts/hfa/hfa.h b/frmts/hfa/hfa.h
index eaa66790cc2e..4f0698024a77 100644
--- a/frmts/hfa/hfa.h
+++ b/frmts/hfa/hfa.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Erdas Imagine (.img) Translator
  * Purpose:  Public (C callable) interface for the Erdas Imagine reading
diff --git a/frmts/hfa/hfa_p.h b/frmts/hfa/hfa_p.h
index c1adec5e09d6..8576f83f62ea 100644
--- a/frmts/hfa/hfa_p.h
+++ b/frmts/hfa/hfa_p.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Erdas Imagine (.img) Translator
  * Purpose:  Private class declarations for the HFA classes used to read
diff --git a/frmts/idrisi/idrisi.h b/frmts/idrisi/idrisi.h
index c79b41fd4b9f..a606e98d7801 100644
--- a/frmts/idrisi/idrisi.h
+++ b/frmts/idrisi/idrisi.h
@@ -1,5 +1,4 @@
 /*****************************************************************************
- * $Id$
  *
  * Project:  Idrisi Raster Image File Driver
  * Purpose:  Read/write Idrisi Raster Image Format RST
diff --git a/frmts/iso8211/iso8211.h b/frmts/iso8211/iso8211.h
index 8d59e4da0266..f2efed91b71c 100644
--- a/frmts/iso8211/iso8211.h
+++ b/frmts/iso8211/iso8211.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ISO 8211 Access
  * Purpose:  Main declarations for ISO 8211.
diff --git a/frmts/jp2kak/jp2kakdataset.h b/frmts/jp2kak/jp2kakdataset.h
index 3c6c366c787a..8096bd4a40f3 100644
--- a/frmts/jp2kak/jp2kakdataset.h
+++ b/frmts/jp2kak/jp2kakdataset.h
@@ -11,8 +11,6 @@
  * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
-// $Id$
-
 #include <cstring>
 #include <algorithm>
 #include <cmath>
diff --git a/frmts/jp2kak/subfile_source.h b/frmts/jp2kak/subfile_source.h
index 7f41eb5f13e5..c6af4ee5cea9 100644
--- a/frmts/jp2kak/subfile_source.h
+++ b/frmts/jp2kak/subfile_source.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JPEG-2000
  * Purpose:  Implements read-only virtual io on a subregion of a file.
diff --git a/frmts/jp2kak/vsil_target.h b/frmts/jp2kak/vsil_target.h
index 30e7a3486e05..53ebcbf9b2ed 100644
--- a/frmts/jp2kak/vsil_target.h
+++ b/frmts/jp2kak/vsil_target.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JPEG-2000
  * Purpose:  Implements VSI*L based writer.
diff --git a/frmts/jpeg/jpgdataset_12.cpp b/frmts/jpeg/jpgdataset_12.cpp
index 76d0c1183708..bf85d2e49682 100644
--- a/frmts/jpeg/jpgdataset_12.cpp
+++ b/frmts/jpeg/jpgdataset_12.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JPEG JFIF Driver
  * Purpose:  Implement GDAL JPEG Support based on IJG libjpeg.
diff --git a/frmts/jpeg/vsidataio.h b/frmts/jpeg/vsidataio.h
index bb5d4a6d892b..1e4b8132b427 100644
--- a/frmts/jpeg/vsidataio.h
+++ b/frmts/jpeg/vsidataio.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JPEG JFIF Driver
  * Purpose:  Implement JPEG read/write io indirection through VSI.
diff --git a/frmts/jpeg/vsidataio_12.cpp b/frmts/jpeg/vsidataio_12.cpp
index e7c1ecfd6bec..8405bcdeba6b 100644
--- a/frmts/jpeg/vsidataio_12.cpp
+++ b/frmts/jpeg/vsidataio_12.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JPEG JFIF Driver
  * Purpose:  Implement JPEG read/write io indirection through VSI.
diff --git a/frmts/jpipkak/jpipkakdataset.h b/frmts/jpipkak/jpipkakdataset.h
index ab177f958dc0..bba6e939360d 100644
--- a/frmts/jpipkak/jpipkakdataset.h
+++ b/frmts/jpipkak/jpipkakdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  jpip read driver
  * Purpose:  GDAL bindings for JPIP.
diff --git a/frmts/kea/keaband.h b/frmts/kea/keaband.h
index 5d4ba590b9cf..19aac784f91d 100644
--- a/frmts/kea/keaband.h
+++ b/frmts/kea/keaband.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *  keaband.h
  *
  *  Created by Pete Bunting on 01/08/2012.
diff --git a/frmts/kea/keacopy.h b/frmts/kea/keacopy.h
index 5042789795a9..344c8f7abcff 100644
--- a/frmts/kea/keacopy.h
+++ b/frmts/kea/keacopy.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *  keacopy.h
  *
  *  Created by Pete Bunting on 01/08/2012.
diff --git a/frmts/kea/keadataset.h b/frmts/kea/keadataset.h
index c517ecf99356..5f55d5a181b4 100644
--- a/frmts/kea/keadataset.h
+++ b/frmts/kea/keadataset.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *  keadataset.h
  *
  *  Created by Pete Bunting on 01/08/2012.
diff --git a/frmts/kea/keamaskband.h b/frmts/kea/keamaskband.h
index 657a83c7fbaa..acddd4383359 100644
--- a/frmts/kea/keamaskband.h
+++ b/frmts/kea/keamaskband.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *  keamaskband.h
  *
  *  Created by Pete Bunting on 01/08/2012.
diff --git a/frmts/kea/keaoverview.h b/frmts/kea/keaoverview.h
index d81165dcf5a3..d407506a0350 100644
--- a/frmts/kea/keaoverview.h
+++ b/frmts/kea/keaoverview.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *  keaoverview.h
  *
  *  Created by Pete Bunting on 01/08/2012.
diff --git a/frmts/kea/kearat.h b/frmts/kea/kearat.h
index 19a970544d67..64ee1f3e4e5e 100644
--- a/frmts/kea/kearat.h
+++ b/frmts/kea/kearat.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *  kearat.h
  *
  *  Created by Pete Bunting on 01/08/2012.
diff --git a/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h
index e2d241a6d6b3..400c0caa9015 100644
--- a/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h
+++ b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KmlSuperOverlay
  * Purpose:  Implements write support for KML superoverlay - KMZ.
diff --git a/frmts/mem/memdataset.h b/frmts/mem/memdataset.h
index 3ffac7fd60d7..190d950512a5 100644
--- a/frmts/mem/memdataset.h
+++ b/frmts/mem/memdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Memory Array Translator
  * Purpose:  Declaration of MEMDataset, and MEMRasterBand.
diff --git a/frmts/msg/msgcommand.h b/frmts/msg/msgcommand.h
index 51bb48b27f84..f26e7f4bea04 100644
--- a/frmts/msg/msgcommand.h
+++ b/frmts/msg/msgcommand.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Purpose:  Interface of MSGCommand class. Parse the src_dataset string
  *           that is meant for the MSG driver.
diff --git a/frmts/msg/msgdataset.h b/frmts/msg/msgdataset.h
index 53571c20b44e..53761c885f19 100644
--- a/frmts/msg/msgdataset.h
+++ b/frmts/msg/msgdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  MSG Driver
  * Purpose:  GDALDataset driver for MSG translator for read support.
diff --git a/frmts/msg/prologue.h b/frmts/msg/prologue.h
index 0b1ac917a960..71f6a12834f5 100644
--- a/frmts/msg/prologue.h
+++ b/frmts/msg/prologue.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Purpose:  Interface of Prologue class. Parse the prologue of one repeat
  *           cycle and keep the interesting info.
diff --git a/frmts/msg/reflectancecalculator.h b/frmts/msg/reflectancecalculator.h
index fed4fbc5d104..1aa23483ac3e 100644
--- a/frmts/msg/reflectancecalculator.h
+++ b/frmts/msg/reflectancecalculator.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Purpose:  Interface of ReflectanceCalculator class. Calculate reflectance
  *           values from radiance, for visual bands.
diff --git a/frmts/msgn/msg_basic_types.h b/frmts/msgn/msg_basic_types.h
index 451c0b15f6ee..2fed6575dc1c 100644
--- a/frmts/msgn/msg_basic_types.h
+++ b/frmts/msgn/msg_basic_types.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  MSG Native Reader
  * Purpose:  Basic types implementation.
diff --git a/frmts/msgn/msg_reader_core.h b/frmts/msgn/msg_reader_core.h
index 13d234e3751b..48eed381fe5d 100644
--- a/frmts/msgn/msg_reader_core.h
+++ b/frmts/msgn/msg_reader_core.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  MSG Native Reader
  * Purpose:  Base class for reading in the headers of MSG native images
diff --git a/frmts/netcdf/data/netcdf_config.xsd b/frmts/netcdf/data/netcdf_config.xsd
index b4c333efe95e..061ffd146984 100644
--- a/frmts/netcdf/data/netcdf_config.xsd
+++ b/frmts/netcdf/data/netcdf_config.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  netCDF driver
  * Purpose:  Schema of netCDF writer configuration files
  * Author:   Even Rouault, <even dot rouault at spatialys dot com>
diff --git a/frmts/netcdf/netcdf_cf_constants.h b/frmts/netcdf/netcdf_cf_constants.h
index cb5f53598a80..60faafe8d20c 100644
--- a/frmts/netcdf/netcdf_cf_constants.h
+++ b/frmts/netcdf/netcdf_cf_constants.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  netCDF read/write Driver
  * Purpose:  GDAL bindings over netCDF library.
diff --git a/frmts/netcdf/netcdfdataset.h b/frmts/netcdf/netcdfdataset.h
index cfbf3ba1336a..46b2b8b7e1ba 100644
--- a/frmts/netcdf/netcdfdataset.h
+++ b/frmts/netcdf/netcdfdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  netCDF read/write Driver
  * Purpose:  GDAL bindings over netCDF library.
diff --git a/frmts/nitf/data/nitf_spec.xml b/frmts/nitf/data/nitf_spec.xml
index 4250c8cd5f2b..b602be967ded 100644
--- a/frmts/nitf/data/nitf_spec.xml
+++ b/frmts/nitf/data/nitf_spec.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  NITF Library
  * Purpose:  Description of NITF TREs
  * Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/frmts/nitf/data/nitf_spec.xsd b/frmts/nitf/data/nitf_spec.xsd
index a47e24c647c6..d4a46b089036 100644
--- a/frmts/nitf/data/nitf_spec.xsd
+++ b/frmts/nitf/data/nitf_spec.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  NITF Library
  * Purpose:  Schema of description of NITF TREs
  * Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/frmts/nitf/mgrs.c b/frmts/nitf/mgrs.c
index 332c19524426..5a23e8f13b99 100644
--- a/frmts/nitf/mgrs.c
+++ b/frmts/nitf/mgrs.c
@@ -1,5 +1,4 @@
 /***************************************************************************
- * $Id$
  *
  * Project:  MGRS Converter
  * Purpose:  Geotrans code for MGRS translation (slightly adapted)
diff --git a/frmts/nitf/mgrs.h b/frmts/nitf/mgrs.h
index 81501a657e5c..57e89cb9bce2 100644
--- a/frmts/nitf/mgrs.h
+++ b/frmts/nitf/mgrs.h
@@ -2,7 +2,6 @@
 #define MGRS_H
 
 /***************************************************************************
- * $Id$
  *
  * Project:  MGRS Converter
  * Purpose:  Geotrans declarations for MGRS translation (slightly adapted)
diff --git a/frmts/nitf/nitfdataset.h b/frmts/nitf/nitfdataset.h
index ed986f2a12c5..0d90c122bc1c 100644
--- a/frmts/nitf/nitfdataset.h
+++ b/frmts/nitf/nitfdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NITF Read/Write Translator
  * Purpose:  GDALDataset/GDALRasterBand declarations.
diff --git a/frmts/nitf/nitfdes.c b/frmts/nitf/nitfdes.c
index 6c37dd16b953..31f137f8b636 100644
--- a/frmts/nitf/nitfdes.c
+++ b/frmts/nitf/nitfdes.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NITF Read/Write Library
  * Purpose:  Module responsible for implementation of DE segments.
diff --git a/frmts/nitf/nitfdump.c b/frmts/nitf/nitfdump.c
index 99d593ef96d4..e13d9c37c81c 100644
--- a/frmts/nitf/nitfdump.c
+++ b/frmts/nitf/nitfdump.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NITF Read/Write Library
  * Purpose:  Simple test mainline to dump info about NITF file.
diff --git a/frmts/nitf/nitffile.c b/frmts/nitf/nitffile.c
index 1f7e79a2b2bc..d346c6a13fa9 100644
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NITF Read/Write Library
  * Purpose:  Module responsible for opening NITF file, populating NITFFile
diff --git a/frmts/nitf/nitfimage.c b/frmts/nitf/nitfimage.c
index 2ea3abad1eb7..cb991ef0a1f2 100644
--- a/frmts/nitf/nitfimage.c
+++ b/frmts/nitf/nitfimage.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NITF Read/Write Library
  * Purpose:  Module responsible for implementation of most NITFImage
diff --git a/frmts/nitf/nitflib.h b/frmts/nitf/nitflib.h
index 60cce7b2e72f..056ea5046f9b 100644
--- a/frmts/nitf/nitflib.h
+++ b/frmts/nitf/nitflib.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NITF Read/Write Library
  * Purpose:  Main GDAL independent include file for NITF support.
diff --git a/frmts/nitf/rpftoclib.h b/frmts/nitf/rpftoclib.h
index 392929d7f2f4..1272d182cd2d 100644
--- a/frmts/nitf/rpftoclib.h
+++ b/frmts/nitf/rpftoclib.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  RPF A.TOC read Library
  * Purpose:  Main GDAL independent include file for RPF TOC support.
diff --git a/frmts/northwood/northwood.h b/frmts/northwood/northwood.h
index d6a10466f1d1..7026de3449f2 100644
--- a/frmts/northwood/northwood.h
+++ b/frmts/northwood/northwood.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GRC/GRD Reader
  * Purpose:  Northwood Technologies Grid format declarations
diff --git a/frmts/pcidsk/pcidskdataset2.h b/frmts/pcidsk/pcidskdataset2.h
index cc5af3e98498..07c30966a218 100644
--- a/frmts/pcidsk/pcidskdataset2.h
+++ b/frmts/pcidsk/pcidskdataset2.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PCIDSK Database File
  * Purpose:  Read/write PCIDSK Database File used by the PCI software, using
diff --git a/frmts/pcraster/pcrasterdataset.h b/frmts/pcraster/pcrasterdataset.h
index a75b380a22cb..45ba12c2bbaa 100644
--- a/frmts/pcraster/pcrasterdataset.h
+++ b/frmts/pcraster/pcrasterdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PCRaster Integration
  * Purpose:  PCRaster CSF 2.0 raster file driver declarations.
diff --git a/frmts/pcraster/pcrasterrasterband.h b/frmts/pcraster/pcrasterrasterband.h
index 5072155620ea..38d6b2e7ad13 100644
--- a/frmts/pcraster/pcrasterrasterband.h
+++ b/frmts/pcraster/pcrasterrasterband.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PCRaster Integration
  * Purpose:  PCRaster raster band declaration.
diff --git a/frmts/pcraster/pcrasterutil.h b/frmts/pcraster/pcrasterutil.h
index 50bfc1e75edc..0a686d3786ad 100644
--- a/frmts/pcraster/pcrasterutil.h
+++ b/frmts/pcraster/pcrasterutil.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PCRaster Integration
  * Purpose:  PCRaster driver support declarations.
diff --git a/frmts/pdf/data/pdfcomposition.xsd b/frmts/pdf/data/pdfcomposition.xsd
index 940bdf526c1d..540ab1d14d90 100644
--- a/frmts/pdf/data/pdfcomposition.xsd
+++ b/frmts/pdf/data/pdfcomposition.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL/OGR
  * Purpose:  XML Schema for GDAL PDF driver composition files.
  * Author:   Even Rouault, <even dot rouault at spatialys dot com>
diff --git a/frmts/pdf/gdal_pdf.h b/frmts/pdf/gdal_pdf.h
index 800ea8d6d18e..38b64bc51ea4 100644
--- a/frmts/pdf/gdal_pdf.h
+++ b/frmts/pdf/gdal_pdf.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDF Translator
  * Purpose:  Definition of classes for OGR .pdf driver.
diff --git a/frmts/pdf/pdfcreatecopy.h b/frmts/pdf/pdfcreatecopy.h
index 7a4309e9bd00..dd657f88c73d 100644
--- a/frmts/pdf/pdfcreatecopy.h
+++ b/frmts/pdf/pdfcreatecopy.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
diff --git a/frmts/pdf/pdfcreatefromcomposition.cpp b/frmts/pdf/pdfcreatefromcomposition.cpp
index 8588a90a119d..f245ac5cb84c 100644
--- a/frmts/pdf/pdfcreatefromcomposition.cpp
+++ b/frmts/pdf/pdfcreatefromcomposition.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
diff --git a/frmts/pdf/pdfcreatefromcomposition.h b/frmts/pdf/pdfcreatefromcomposition.h
index 04fd7da9a90c..4c7f72a45f78 100644
--- a/frmts/pdf/pdfcreatefromcomposition.h
+++ b/frmts/pdf/pdfcreatefromcomposition.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
index d942b4162641..10e0a5aaf5d9 100644
--- a/frmts/pdf/pdfio.h
+++ b/frmts/pdf/pdfio.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
diff --git a/frmts/pdf/pdfobject.h b/frmts/pdf/pdfobject.h
index 73c3a277409a..877ca76ff37e 100644
--- a/frmts/pdf/pdfobject.h
+++ b/frmts/pdf/pdfobject.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
diff --git a/frmts/png/pngdataset.h b/frmts/png/pngdataset.h
index 19b726011b53..e8de608ea8fe 100644
--- a/frmts/png/pngdataset.h
+++ b/frmts/png/pngdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PNG Driver
  * Purpose:  Implement GDAL PNG Support
diff --git a/frmts/postgisraster/postgisraster.h b/frmts/postgisraster/postgisraster.h
index 5e21eb147938..7bf33c92bf0a 100644
--- a/frmts/postgisraster/postgisraster.h
+++ b/frmts/postgisraster/postgisraster.h
@@ -7,7 +7,6 @@
  *
  * Author:   David Zwarg, dzwarg@azavea.com
  *
- * Last changes: $Id$
  *
  ***********************************************************************
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
diff --git a/frmts/postgisraster/postgisrasterdataset.cpp b/frmts/postgisraster/postgisrasterdataset.cpp
index 25fa88210afa..dccb40854fba 100644
--- a/frmts/postgisraster/postgisrasterdataset.cpp
+++ b/frmts/postgisraster/postgisrasterdataset.cpp
@@ -7,7 +7,6 @@
  *
  * Author:       David Zwarg, dzwarg@azavea.com
  *
- * Last changes: $Id$
  *
  ***********************************************************************
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
diff --git a/frmts/postgisraster/postgisrasterdriver.cpp b/frmts/postgisraster/postgisrasterdriver.cpp
index 2a2e3175eaa2..c71f0db0eab4 100644
--- a/frmts/postgisraster/postgisrasterdriver.cpp
+++ b/frmts/postgisraster/postgisrasterdriver.cpp
@@ -4,7 +4,6 @@
  * Purpose:  Implements PostGIS Raster driver class methods
  * Author:   Jorge Arevalo, jorge.arevalo@deimos-space.com
  *
- * Last changes: $Id$
  *
  ******************************************************************************
  * Copyright (c) 2010, Jorge Arevalo, jorge.arevalo@deimos-space.com
diff --git a/frmts/postgisraster/postgisrasterdrivercore.cpp b/frmts/postgisraster/postgisrasterdrivercore.cpp
index 81a64d076d1a..379b3fc4ea8b 100644
--- a/frmts/postgisraster/postgisrasterdrivercore.cpp
+++ b/frmts/postgisraster/postgisrasterdrivercore.cpp
@@ -4,7 +4,6 @@
  * Purpose:  Implements PostGIS Raster driver class methods
  * Author:   Jorge Arevalo, jorge.arevalo@deimos-space.com
  *
- * Last changes: $Id$
  *
  ******************************************************************************
  * Copyright (c) 2010, Jorge Arevalo, jorge.arevalo@deimos-space.com
diff --git a/frmts/postgisraster/postgisrasterdrivercore.h b/frmts/postgisraster/postgisrasterdrivercore.h
index 102d7242d0b6..6eff97c2c01e 100644
--- a/frmts/postgisraster/postgisrasterdrivercore.h
+++ b/frmts/postgisraster/postgisrasterdrivercore.h
@@ -4,7 +4,6 @@
  * Purpose:  Implements PostGIS Raster driver class methods
  * Author:   Jorge Arevalo, jorge.arevalo@deimos-space.com
  *
- * Last changes: $Id$
  *
  ******************************************************************************
  * Copyright (c) 2010, Jorge Arevalo, jorge.arevalo@deimos-space.com
diff --git a/frmts/postgisraster/postgisrasterrasterband.cpp b/frmts/postgisraster/postgisrasterrasterband.cpp
index 17d2e05bc7d3..316e9a56d50f 100644
--- a/frmts/postgisraster/postgisrasterrasterband.cpp
+++ b/frmts/postgisraster/postgisrasterrasterband.cpp
@@ -7,7 +7,6 @@
  *
  * Author:       David Zwarg, dzwarg@azavea.com
  *
- * Last changes: $Id$
  *
  ***********************************************************************
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
diff --git a/frmts/postgisraster/postgisrastertiledataset.cpp b/frmts/postgisraster/postgisrastertiledataset.cpp
index 82490d5d83cb..f5f227b7b2f1 100644
--- a/frmts/postgisraster/postgisrastertiledataset.cpp
+++ b/frmts/postgisraster/postgisrastertiledataset.cpp
@@ -5,7 +5,6 @@
  * Author:   Jorge Arevalo, jorge.arevalo@deimos-space.com
  *                          jorgearevalo@libregis.org
  *
- * Last changes: $Id$
  *
  ***********************************************************************
  * Copyright (c) 2013, Jorge Arevalo
diff --git a/frmts/postgisraster/postgisrastertilerasterband.cpp b/frmts/postgisraster/postgisrastertilerasterband.cpp
index 4d74a96afce8..3dede355d6c3 100644
--- a/frmts/postgisraster/postgisrastertilerasterband.cpp
+++ b/frmts/postgisraster/postgisrastertilerasterband.cpp
@@ -5,7 +5,6 @@
  * driver
  * Author:   Jorge Arevalo, jorge.arevalo@deimos-space.com
  *                          jorgearevalo@libregis.org
- * Last changes: $Id$
  *
  ***********************************************************************
  * Copyright (c) 2009 - 2013, Jorge Arevalo
diff --git a/frmts/postgisraster/postgisrastertools.cpp b/frmts/postgisraster/postgisrastertools.cpp
index 3c4de4e78671..0c3c4e824032 100644
--- a/frmts/postgisraster/postgisrastertools.cpp
+++ b/frmts/postgisraster/postgisrastertools.cpp
@@ -7,7 +7,6 @@
  *
  * Author:       David Zwarg, dzwarg@azavea.com
  *
- * Last changes: $Id$
  *
  ***********************************************************************
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
diff --git a/frmts/r/rdataset.h b/frmts/r/rdataset.h
index d3ed41cf1d53..94e1f8c46d00 100644
--- a/frmts/r/rdataset.h
+++ b/frmts/r/rdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  R Format Driver
  * Purpose:  Read/write R stats package object format.
diff --git a/frmts/rasterlite/rasterlitedataset.h b/frmts/rasterlite/rasterlitedataset.h
index 227c549f5a46..55a82c43df0d 100644
--- a/frmts/rasterlite/rasterlitedataset.h
+++ b/frmts/rasterlite/rasterlitedataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Rasterlite driver
  * Purpose:  Implement GDAL Rasterlite support using OGR SQLite driver
diff --git a/frmts/raw/atlsci_spheroid.h b/frmts/raw/atlsci_spheroid.h
index 8549d8479336..bc1862fdeffc 100644
--- a/frmts/raw/atlsci_spheroid.h
+++ b/frmts/raw/atlsci_spheroid.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Spheroid classes
  * Purpose:  Provide spheroid lookup table base classes.
diff --git a/frmts/raw/envidataset.h b/frmts/raw/envidataset.h
index 0001a7f1b566..b42b50f5759d 100644
--- a/frmts/raw/envidataset.h
+++ b/frmts/raw/envidataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ENVI .hdr Driver
  * Purpose:  Implementation of ENVI .hdr labelled raw raster support.
diff --git a/frmts/rdb/rdbdataset.cpp b/frmts/rdb/rdbdataset.cpp
index 17db35c4d0fb..d4c087404538 100644
--- a/frmts/rdb/rdbdataset.cpp
+++ b/frmts/rdb/rdbdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  RIEGL RDB 2 driver
  * Purpose:  Add support for reading *.mpx RDB 2 files.
diff --git a/frmts/rdb/rdbdataset.hpp b/frmts/rdb/rdbdataset.hpp
index 48756efdcb20..89a83b78d2c4 100644
--- a/frmts/rdb/rdbdataset.hpp
+++ b/frmts/rdb/rdbdataset.hpp
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id$
- *
  * Project:  RIEGL RDB 2 driver
  * Purpose:  Add support for reading *.mpx RDB 2 files.
  * Author:   RIEGL Laser Measurement Systems GmbH (support@riegl.com)
diff --git a/frmts/rmf/rmfdataset.h b/frmts/rmf/rmfdataset.h
index 10b7c02965f4..be8842e58fbb 100644
--- a/frmts/rmf/rmfdataset.h
+++ b/frmts/rmf/rmfdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Raster Matrix Format
  * Purpose:  Private class declarations for the RMF classes used to read/write
diff --git a/frmts/sdts/sdts_al.h b/frmts/sdts/sdts_al.h
index db1b50f78838..5abad8fd3a82 100644
--- a/frmts/sdts/sdts_al.h
+++ b/frmts/sdts/sdts_al.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  SDTS Translator
  * Purpose:  Include file for entire SDTS Abstraction Layer functions.
diff --git a/frmts/vrt/data/gdalvrt.xsd b/frmts/vrt/data/gdalvrt.xsd
index a6eb50e28270..397a7c0f17ee 100644
--- a/frmts/vrt/data/gdalvrt.xsd
+++ b/frmts/vrt/data/gdalvrt.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL/OGR
  * Purpose:  XML Schema for GDAL VRT files.
  * Author:   Even Rouault, <even dot rouault at spatialys dot com>
diff --git a/frmts/vrt/gdal_vrt.h b/frmts/vrt/gdal_vrt.h
index 6f0f36dbd723..ab3d7a1efe50 100644
--- a/frmts/vrt/gdal_vrt.h
+++ b/frmts/vrt/gdal_vrt.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Virtual GDAL Datasets
  * Purpose:  C/Public declarations of virtual GDAL dataset objects.
diff --git a/frmts/vrt/vrtdataset.h b/frmts/vrt/vrtdataset.h
index 961bcc60d49f..1189667ff5a2 100644
--- a/frmts/vrt/vrtdataset.h
+++ b/frmts/vrt/vrtdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Virtual GDAL Datasets
  * Purpose:  Declaration of virtual gdal dataset classes.
diff --git a/frmts/vrt/vrtmultidim.cpp b/frmts/vrt/vrtmultidim.cpp
index 203420d97cdb..c9359939fa30 100644
--- a/frmts/vrt/vrtmultidim.cpp
+++ b/frmts/vrt/vrtmultidim.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     vrtmultidim.cpp
  * Purpose:  Implementation of VRTDriver
diff --git a/frmts/wms/gdalhttp.h b/frmts/wms/gdalhttp.h
index 254fcfcf75bc..9358d7157173 100644
--- a/frmts/wms/gdalhttp.h
+++ b/frmts/wms/gdalhttp.h
@@ -1,5 +1,4 @@
 /*****************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_arcgis_server.h b/frmts/wms/minidriver_arcgis_server.h
index e093e2fab59a..786b5276e3c6 100644
--- a/frmts/wms/minidriver_arcgis_server.h
+++ b/frmts/wms/minidriver_arcgis_server.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc GIS Server Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_iip.h b/frmts/wms/minidriver_iip.h
index a9af3a7fe710..49e982a56587 100644
--- a/frmts/wms/minidriver_iip.h
+++ b/frmts/wms/minidriver_iip.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Mini driver for Internet Imaging Protocol (IIP)
diff --git a/frmts/wms/minidriver_mrf.cpp b/frmts/wms/minidriver_mrf.cpp
index f66e4e4926ea..7eaa93126226 100644
--- a/frmts/wms/minidriver_mrf.cpp
+++ b/frmts/wms/minidriver_mrf.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Mini Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_tileservice.h b/frmts/wms/minidriver_tileservice.h
index 8cc95c98bdaa..dd8e84f6fdb7 100644
--- a/frmts/wms/minidriver_tileservice.h
+++ b/frmts/wms/minidriver_tileservice.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_tms.h b/frmts/wms/minidriver_tms.h
index ab3fd9c9e897..837347174b99 100644
--- a/frmts/wms/minidriver_tms.h
+++ b/frmts/wms/minidriver_tms.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_virtualearth.h b/frmts/wms/minidriver_virtualearth.h
index 03775de7ff66..7a5cbd07a1f0 100644
--- a/frmts/wms/minidriver_virtualearth.h
+++ b/frmts/wms/minidriver_virtualearth.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_wms.h b/frmts/wms/minidriver_wms.h
index 927c5748c8df..3ba3095a20f5 100644
--- a/frmts/wms/minidriver_wms.h
+++ b/frmts/wms/minidriver_wms.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/minidriver_worldwind.h b/frmts/wms/minidriver_worldwind.h
index 11643d082176..6f3a679f154f 100644
--- a/frmts/wms/minidriver_worldwind.h
+++ b/frmts/wms/minidriver_worldwind.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/wmsdriver.h b/frmts/wms/wmsdriver.h
index 71c7344a140d..c132a75574c9 100644
--- a/frmts/wms/wmsdriver.h
+++ b/frmts/wms/wmsdriver.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Implementation of Dataset and RasterBand classes for WMS
diff --git a/frmts/wms/wmsmetadataset.h b/frmts/wms/wmsmetadataset.h
index 1b5d55392316..a48eaf8aa96d 100644
--- a/frmts/wms/wmsmetadataset.h
+++ b/frmts/wms/wmsmetadataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WMS Client Driver
  * Purpose:  Declaration of GDALWMSMetaDataset class
diff --git a/frmts/zlib/adler32.c b/frmts/zlib/adler32.c
index 04b81d29bad1..d2f7961d2e0a 100644
--- a/frmts/zlib/adler32.c
+++ b/frmts/zlib/adler32.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #include "zutil.h"
 
diff --git a/frmts/zlib/compress.c b/frmts/zlib/compress.c
index f43bacf7ab97..2c00535aeb9b 100644
--- a/frmts/zlib/compress.c
+++ b/frmts/zlib/compress.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/frmts/zlib/contrib/infback9/minified_zutil.c b/frmts/zlib/contrib/infback9/minified_zutil.c
index 741981546924..7e23943ad69e 100644
--- a/frmts/zlib/contrib/infback9/minified_zutil.c
+++ b/frmts/zlib/contrib/infback9/minified_zutil.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #include "minified_zutil.h"
 
diff --git a/frmts/zlib/contrib/infback9/minified_zutil.h b/frmts/zlib/contrib/infback9/minified_zutil.h
index d52c0e1b9dc8..102320ba685e 100644
--- a/frmts/zlib/contrib/infback9/minified_zutil.h
+++ b/frmts/zlib/contrib/infback9/minified_zutil.h
@@ -8,7 +8,6 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
diff --git a/frmts/zlib/crc32.c b/frmts/zlib/crc32.c
index 6c38f5c04c6a..22a2d6ba555f 100644
--- a/frmts/zlib/crc32.c
+++ b/frmts/zlib/crc32.c
@@ -7,7 +7,6 @@
  * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
  */
 
-/* @(#) $Id$ */
 
 /*
   Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
diff --git a/frmts/zlib/deflate.c b/frmts/zlib/deflate.c
index 012ea8148e8d..9ef66fdf9da2 100644
--- a/frmts/zlib/deflate.c
+++ b/frmts/zlib/deflate.c
@@ -47,7 +47,6 @@
  *
  */
 
-/* @(#) $Id$ */
 
 #include "deflate.h"
 
diff --git a/frmts/zlib/deflate.h b/frmts/zlib/deflate.h
index 300c6ada62b8..15f44916fba2 100644
--- a/frmts/zlib/deflate.h
+++ b/frmts/zlib/deflate.h
@@ -8,7 +8,6 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id$ */
 
 #ifndef DEFLATE_H
 #define DEFLATE_H
diff --git a/frmts/zlib/trees.c b/frmts/zlib/trees.c
index 6a523ef34e3c..5eff15245b1e 100644
--- a/frmts/zlib/trees.c
+++ b/frmts/zlib/trees.c
@@ -30,7 +30,6 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id$ */
 
 /* #define GEN_TREES_H */
 
diff --git a/frmts/zlib/uncompr.c b/frmts/zlib/uncompr.c
index 5e256663b451..0ecbc28e5a18 100644
--- a/frmts/zlib/uncompr.c
+++ b/frmts/zlib/uncompr.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #define ZLIB_INTERNAL
 #include "zlib.h"
diff --git a/frmts/zlib/zconf.h b/frmts/zlib/zconf.h
index d53268ade1eb..5f01e163d85b 100644
--- a/frmts/zlib/zconf.h
+++ b/frmts/zlib/zconf.h
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/frmts/zlib/zutil.c b/frmts/zlib/zutil.c
index b1c5d2d3c6da..f417f41a47ab 100644
--- a/frmts/zlib/zutil.c
+++ b/frmts/zlib/zutil.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id$ */
 
 #include "zutil.h"
 #ifndef Z_SOLO
diff --git a/frmts/zlib/zutil.h b/frmts/zlib/zutil.h
index 48dd7febae65..24bf15b4fff6 100644
--- a/frmts/zlib/zutil.h
+++ b/frmts/zlib/zutil.h
@@ -8,7 +8,6 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id$ */
 
 #ifndef ZUTIL_H
 #define ZUTIL_H
diff --git a/gcore/Version.rc b/gcore/Version.rc
index 146d927a9d74..22d74dc386d7 100644
--- a/gcore/Version.rc
+++ b/gcore/Version.rc
@@ -1,98 +1,96 @@
-/******************************************************************************
- * $Id$
- *
- * Project:  GDAL Core
- * Purpose:  GDAL DLL registration information.
- * Author:   Martin Daly (Cadcorp)
- *
- * Copyright assignment provided by Martin Daly by email, "Be my guest.  Fame!
- * At last!  Best not let it go to my head, eh?"
- *
- ******************************************************************************
- * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
- ******************************************************************************
- * $Log$
- * Revision 1.6  2006/03/30 15:42:55  fwarmerdam
- * Added explicit not on right to use.
- *
- * Revision 1.5  2006/03/28 14:49:56  fwarmerdam
- * updated contact info
- *
- */
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include <windows.h>
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include <winver.h>
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef GDAL_COMPILATION
-#undef GDAL_COMPILATION
-#endif
-#include "gdal.h"
-
-#ifndef _MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION GDAL_VERSION_MAJOR,GDAL_VERSION_MINOR,GDAL_VERSION_REV,GDAL_VERSION_BUILD
- PRODUCTVERSION GDAL_VERSION_MAJOR,GDAL_VERSION_MINOR,GDAL_VERSION_REV,GDAL_VERSION_BUILD
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName", "OSGeo\0"
-            VALUE "FileDescription", "Geospatial Data Abstraction Library\0"
-            VALUE "FileVersion", GDAL_RELEASE_NAME "\0"
-            VALUE "InternalName", "GDAL\0"
-            VALUE "LegalCopyright", "See LICENSE.TXT"
-            VALUE "ProductName", "GDAL/OGR\0"
-            VALUE "ProductVersion", GDAL_RELEASE_NAME "\0"
-            VALUE "WebPage", "http://www.gdal.org/\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // Neutral resources
+/******************************************************************************
+ * Project:  GDAL Core
+ * Purpose:  GDAL DLL registration information.
+ * Author:   Martin Daly (Cadcorp)
+ *
+ * Copyright assignment provided by Martin Daly by email, "Be my guest.  Fame!
+ * At last!  Best not let it go to my head, eh?"
+ *
+ ******************************************************************************
+ * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ ******************************************************************************
+ * $Log$
+ * Revision 1.6  2006/03/30 15:42:55  fwarmerdam
+ * Added explicit not on right to use.
+ *
+ * Revision 1.5  2006/03/28 14:49:56  fwarmerdam
+ * updated contact info
+ *
+ */
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include <windows.h>
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include <winver.h>
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef GDAL_COMPILATION
+#undef GDAL_COMPILATION
+#endif
+#include "gdal.h"
+
+#ifndef _MAC
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION GDAL_VERSION_MAJOR,GDAL_VERSION_MINOR,GDAL_VERSION_REV,GDAL_VERSION_BUILD
+ PRODUCTVERSION GDAL_VERSION_MAJOR,GDAL_VERSION_MINOR,GDAL_VERSION_REV,GDAL_VERSION_BUILD
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "OSGeo\0"
+            VALUE "FileDescription", "Geospatial Data Abstraction Library\0"
+            VALUE "FileVersion", GDAL_RELEASE_NAME "\0"
+            VALUE "InternalName", "GDAL\0"
+            VALUE "LegalCopyright", "See LICENSE.TXT"
+            VALUE "ProductName", "GDAL/OGR\0"
+            VALUE "ProductVersion", GDAL_RELEASE_NAME "\0"
+            VALUE "WebPage", "http://www.gdal.org/\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // !_MAC
+
+#endif    // Neutral resources
diff --git a/gcore/gdal.h b/gcore/gdal.h
index 8638f8501b27..944ea2b3d1c3 100644
--- a/gcore/gdal.h
+++ b/gcore/gdal.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  GDAL Core C/Public declarations.
diff --git a/gcore/gdal_frmts.h b/gcore/gdal_frmts.h
index 36c373ac3668..610b12ddb07a 100644
--- a/gcore/gdal_frmts.h
+++ b/gcore/gdal_frmts.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Prototypes for all format specific driver initialization.
diff --git a/gcore/gdal_mdreader.h b/gcore/gdal_mdreader.h
index 1065d5969513..b2dc46b0f102 100644
--- a/gcore/gdal_mdreader.h
+++ b/gcore/gdal_mdreader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata (mainly the remote sensing imagery) from files of
diff --git a/gcore/gdal_pam.h b/gcore/gdal_pam.h
index 1bfaf2355919..781b6b602b3e 100644
--- a/gcore/gdal_pam.h
+++ b/gcore/gdal_pam.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Declaration for Peristable Auxiliary Metadata classes.
diff --git a/gcore/gdal_priv.h b/gcore/gdal_priv.h
index c615a3a90319..f5501e1a91d6 100644
--- a/gcore/gdal_priv.h
+++ b/gcore/gdal_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdal_priv.h
  * Project:  GDAL Core
diff --git a/gcore/gdal_priv_templates.hpp b/gcore/gdal_priv_templates.hpp
index cb1631485cf1..0be90ef475bc 100644
--- a/gcore/gdal_priv_templates.hpp
+++ b/gcore/gdal_priv_templates.hpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Inline C++ templates
diff --git a/gcore/gdal_proxy.h b/gcore/gdal_proxy.h
index 1fb5b5deae75..551bcacbd39b 100644
--- a/gcore/gdal_proxy.h
+++ b/gcore/gdal_proxy.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  GDAL Core C++/Private declarations
diff --git a/gcore/gdal_rat.h b/gcore/gdal_rat.h
index 9aae5163ecf4..adb89455ea9e 100644
--- a/gcore/gdal_rat.h
+++ b/gcore/gdal_rat.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  GDALRasterAttributeTable class declarations.
diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in
index 059d28cc4bcc..3173bb2a56b7 100644
--- a/gcore/gdal_version.h.in
+++ b/gcore/gdal_version.h.in
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* -------------------------------------------------------------------- */
 /*      GDAL Version Information.                                       */
diff --git a/gcore/gdalexif.h b/gcore/gdalexif.h
index 4ee676c77999..45177744df09 100644
--- a/gcore/gdalexif.h
+++ b/gcore/gdalexif.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JPEG JFIF Driver
  * Purpose:  Implement GDAL JPEG Support based on IJG libjpeg.
diff --git a/gcore/gdalgeorefpamdataset.h b/gcore/gdalgeorefpamdataset.h
index c25aa95b73dc..c1e1c0fecdac 100644
--- a/gcore/gdalgeorefpamdataset.h
+++ b/gcore/gdalgeorefpamdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  GDALPamDataset with internal storage for georeferencing, with
diff --git a/gcore/gdaljp2abstractdataset.h b/gcore/gdaljp2abstractdataset.h
index c59d2089fef0..66e2ff5c05ac 100644
--- a/gcore/gdaljp2abstractdataset.h
+++ b/gcore/gdaljp2abstractdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  GDALGeorefPamDataset with helper to read georeferencing and other
diff --git a/gcore/gdaljp2metadata.h b/gcore/gdaljp2metadata.h
index 26c287f5d466..75be35d52dfe 100644
--- a/gcore/gdaljp2metadata.h
+++ b/gcore/gdaljp2metadata.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  JP2 Box Reader (and GMLJP2 Interpreter)
diff --git a/gcore/gdaljp2metadatagenerator.h b/gcore/gdaljp2metadatagenerator.h
index dfb6368f1206..096f843ae3f6 100644
--- a/gcore/gdaljp2metadatagenerator.h
+++ b/gcore/gdaljp2metadatagenerator.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  GDALJP2Metadata: metadata generator
diff --git a/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp
index ad0365692780..b26384a35b91 100644
--- a/gcore/gdalmultidim.cpp
+++ b/gcore/gdalmultidim.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdalmultidim.cpp
  * Project:  GDAL Core
diff --git a/gcore/gdalmultidim_gridded.cpp b/gcore/gdalmultidim_gridded.cpp
index dfd6d2d9d27a..63ceeffc47d7 100644
--- a/gcore/gdalmultidim_gridded.cpp
+++ b/gcore/gdalmultidim_gridded.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdalmultidim_gridded.cpp
  * Project:  GDAL Core
diff --git a/gcore/gdalsse_priv.h b/gcore/gdalsse_priv.h
index ade33367ee55..c6e23c0f0665 100644
--- a/gcore/gdalsse_priv.h
+++ b/gcore/gdalsse_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  SSE2 helper
diff --git a/gcore/mdreader/reader_alos.h b/gcore/mdreader/reader_alos.h
index c6d968a51fd3..bd56da07a676 100644
--- a/gcore/mdreader/reader_alos.h
+++ b/gcore/mdreader/reader_alos.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from Alos imagery.
diff --git a/gcore/mdreader/reader_digital_globe.h b/gcore/mdreader/reader_digital_globe.h
index ab31320ffcbd..43f42d1652fb 100644
--- a/gcore/mdreader/reader_digital_globe.h
+++ b/gcore/mdreader/reader_digital_globe.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from DigitalGlobe imagery.
diff --git a/gcore/mdreader/reader_eros.h b/gcore/mdreader/reader_eros.h
index 19a05f35bbbf..6ad970ff678a 100644
--- a/gcore/mdreader/reader_eros.h
+++ b/gcore/mdreader/reader_eros.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from EROS imagery.
diff --git a/gcore/mdreader/reader_geo_eye.h b/gcore/mdreader/reader_geo_eye.h
index 81d204f6fbd9..bdd38daf8236 100644
--- a/gcore/mdreader/reader_geo_eye.h
+++ b/gcore/mdreader/reader_geo_eye.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from GeoEye imagery.
diff --git a/gcore/mdreader/reader_kompsat.h b/gcore/mdreader/reader_kompsat.h
index f83529d1a223..e660c7fc9aff 100644
--- a/gcore/mdreader/reader_kompsat.h
+++ b/gcore/mdreader/reader_kompsat.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from Kompsat imagery.
diff --git a/gcore/mdreader/reader_landsat.h b/gcore/mdreader/reader_landsat.h
index 7b35a01b2e3a..d63c9e9e857f 100644
--- a/gcore/mdreader/reader_landsat.h
+++ b/gcore/mdreader/reader_landsat.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from Landsat imagery.
diff --git a/gcore/mdreader/reader_orb_view.h b/gcore/mdreader/reader_orb_view.h
index e0471b01ec3c..61b8741e7bba 100644
--- a/gcore/mdreader/reader_orb_view.h
+++ b/gcore/mdreader/reader_orb_view.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from OrbView imagery.
diff --git a/gcore/mdreader/reader_pleiades.h b/gcore/mdreader/reader_pleiades.h
index 52f764e3247f..4a99854bf062 100644
--- a/gcore/mdreader/reader_pleiades.h
+++ b/gcore/mdreader/reader_pleiades.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from Pleiades imagery.
diff --git a/gcore/mdreader/reader_rapid_eye.h b/gcore/mdreader/reader_rapid_eye.h
index ae87b9d2ecae..7baa5403450b 100644
--- a/gcore/mdreader/reader_rapid_eye.h
+++ b/gcore/mdreader/reader_rapid_eye.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from RapidEye imagery.
diff --git a/gcore/mdreader/reader_rdk1.h b/gcore/mdreader/reader_rdk1.h
index 6786b3c4b027..7782419041ea 100644
--- a/gcore/mdreader/reader_rdk1.h
+++ b/gcore/mdreader/reader_rdk1.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from Resurs-DK1 imagery.
diff --git a/gcore/mdreader/reader_spot.h b/gcore/mdreader/reader_spot.h
index 7858b1a3724d..069ffbf29a02 100644
--- a/gcore/mdreader/reader_spot.h
+++ b/gcore/mdreader/reader_spot.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Read metadata from Spot imagery.
diff --git a/gcore/rawdataset.h b/gcore/rawdataset.h
index 5b5bfe84fe59..77e92c646ff3 100644
--- a/gcore/rawdataset.h
+++ b/gcore/rawdataset.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Raw Translator
  * Purpose:  Implementation of RawDataset class.  Intended to be subclassed
diff --git a/gnm/gnm.h b/gnm/gnm.h
index b7761533d688..b64d711a2afe 100644
--- a/gnm/gnm.h
+++ b/gnm/gnm.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  GNM general public declarations.
diff --git a/gnm/gnm_api.h b/gnm/gnm_api.h
index 07644cd68bd6..ef6955cc1603 100644
--- a/gnm/gnm_api.h
+++ b/gnm/gnm_api.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  GNM C API.
diff --git a/gnm/gnm_frmts/db/gnmdb.h b/gnm/gnm_frmts/db/gnmdb.h
index c148c16516ac..4d819e512b17 100644
--- a/gnm/gnm_frmts/db/gnmdb.h
+++ b/gnm/gnm_frmts/db/gnmdb.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  GNM db based generic driver.
diff --git a/gnm/gnm_frmts/file/gnmfile.h b/gnm/gnm_frmts/file/gnmfile.h
index 6e9b7d551168..6c0417a56fea 100644
--- a/gnm/gnm_frmts/file/gnmfile.h
+++ b/gnm/gnm_frmts/file/gnmfile.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  GNM file based generic driver.
diff --git a/gnm/gnm_frmts/gnm_frmts.h b/gnm/gnm_frmts/gnm_frmts.h
index a6954b147998..d9ebfba51483 100644
--- a/gnm/gnm_frmts/gnm_frmts.h
+++ b/gnm/gnm_frmts/gnm_frmts.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  Classes related to format registration, and file opening.
diff --git a/gnm/gnm_priv.h b/gnm/gnm_priv.h
index 4b8c0028fc15..11ed281cd3e1 100644
--- a/gnm/gnm_priv.h
+++ b/gnm/gnm_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  GNM private and internal declarations.
diff --git a/gnm/gnmgraph.h b/gnm/gnmgraph.h
index 3d0f0b627791..fb2670e52e2a 100644
--- a/gnm/gnmgraph.h
+++ b/gnm/gnmgraph.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL/OGR Geography Network support (Geographic Network Model)
  * Purpose:  GNM graph implementation.
diff --git a/mkgdaldist.sh b/mkgdaldist.sh
index 47dd867f6e99..a47aaeab4c26 100755
--- a/mkgdaldist.sh
+++ b/mkgdaldist.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 # mkgdaldist.sh - prepares GDAL source distribution package
 
 set -eu
diff --git a/ogr/generate_encoding_table.c b/ogr/generate_encoding_table.c
index 4817ace3cc7e..2cb509237490 100644
--- a/ogr/generate_encoding_table.c
+++ b/ogr/generate_encoding_table.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OGR
  * Purpose:  Generate a mapping table from a 1-byte encoding to unicode,
diff --git a/ogr/ogr_api.h b/ogr/ogr_api.h
index d17fd9028d35..d384d9e91734 100644
--- a/ogr/ogr_api.h
+++ b/ogr/ogr_api.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  C API for OGR Geometry, Feature, Layers, DataSource and drivers.
diff --git a/ogr/ogr_core.h b/ogr/ogr_core.h
index 6fe905d750f3..f6596abeba79 100644
--- a/ogr/ogr_core.h
+++ b/ogr/ogr_core.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Define some core portability services for cross-platform OGR code.
diff --git a/ogr/ogr_expat.h b/ogr/ogr_expat.h
index fa6c672181be..eac6b2f075a5 100644
--- a/ogr/ogr_expat.h
+++ b/ogr/ogr_expat.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OGR
  * Purpose:  Convenience function for parsing with Expat library
diff --git a/ogr/ogr_feature.h b/ogr/ogr_feature.h
index d710dfd54a93..626ab0acb088 100644
--- a/ogr/ogr_feature.h
+++ b/ogr/ogr_feature.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Class for representing a whole feature, and layer schemas.
diff --git a/ogr/ogr_featurestyle.h b/ogr/ogr_featurestyle.h
index ba21b6043dbe..83ad1ed601cb 100644
--- a/ogr/ogr_featurestyle.h
+++ b/ogr/ogr_featurestyle.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Define of Feature Representation
diff --git a/ogr/ogr_geo_utils.h b/ogr/ogr_geo_utils.h
index 4efc3ab6e15b..c654c2f992e1 100644
--- a/ogr/ogr_geo_utils.h
+++ b/ogr/ogr_geo_utils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  X-Plane aeronautical data reader
  * Purpose:  Definition of geo-computation functions
diff --git a/ogr/ogr_geocoding.h b/ogr/ogr_geocoding.h
index 9f29e63370d8..4d9401819914 100644
--- a/ogr/ogr_geocoding.h
+++ b/ogr/ogr_geocoding.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Client of geocoding service.
diff --git a/ogr/ogr_geometry.h b/ogr/ogr_geometry.h
index 2e07be78d05e..bbd6b1df137f 100644
--- a/ogr/ogr_geometry.h
+++ b/ogr/ogr_geometry.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Classes for manipulating simple features that is not specific
diff --git a/ogr/ogr_geos.h b/ogr/ogr_geos.h
index 091c1bfbf54b..fcdab4e19820 100644
--- a/ogr/ogr_geos.h
+++ b/ogr/ogr_geos.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Definitions related to support for use of GEOS in OGR.
diff --git a/ogr/ogr_libs.h b/ogr/ogr_libs.h
index c3424c3eb020..ce29d3c566cf 100644
--- a/ogr/ogr_libs.h
+++ b/ogr/ogr_libs.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Definitions related to support for use of SFCGAL and GEOS in OGR.
diff --git a/ogr/ogr_p.h b/ogr/ogr_p.h
index 14b3002e9fe0..7c1ae6bb6343 100644
--- a/ogr/ogr_p.h
+++ b/ogr/ogr_p.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Some private helper functions and stuff for OGR implementation.
diff --git a/ogr/ogr_sfcgal.h b/ogr/ogr_sfcgal.h
index 47cee24155f1..f17ed9421def 100644
--- a/ogr/ogr_sfcgal.h
+++ b/ogr/ogr_sfcgal.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Definitions related to support for use of SFCGAL in OGR.
diff --git a/ogr/ogr_spatialref.h b/ogr/ogr_spatialref.h
index 87e82572df68..23b236006fe2 100644
--- a/ogr/ogr_spatialref.h
+++ b/ogr/ogr_spatialref.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Classes for manipulating spatial reference systems in a
diff --git a/ogr/ogr_srs_api.h b/ogr/ogr_srs_api.h
index e9eb02ea90ca..a59e7bbc37e1 100644
--- a/ogr/ogr_srs_api.h
+++ b/ogr/ogr_srs_api.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  C API and constant declarations for OGR Spatial References.
diff --git a/ogr/ogr_srs_cf1.h b/ogr/ogr_srs_cf1.h
index bcbfcb372fe0..127d9820ee74 100644
--- a/ogr/ogr_srs_cf1.h
+++ b/ogr/ogr_srs_cf1.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  netCDF read/write Driver
  * Purpose:  GDAL bindings over netCDF library.
diff --git a/ogr/ograpispy.h b/ogr/ograpispy.h
index 70d98b5ea16f..4d03d8ad9452 100644
--- a/ogr/ograpispy.h
+++ b/ogr/ograpispy.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  OGR C API "Spy"
diff --git a/ogr/ogrgeojsonwriter.h b/ogr/ogrgeojsonwriter.h
index 7ac1adee803a..13b373bb7f96 100644
--- a/ogr/ogrgeojsonwriter.h
+++ b/ogr/ogrgeojsonwriter.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines GeoJSON reader within OGR OGRGeoJSON Driver.
diff --git a/ogr/ogrpgeogeometry.h b/ogr/ogrpgeogeometry.h
index 8bd64de8f661..19c9c1086068 100644
--- a/ogr/ogrpgeogeometry.h
+++ b/ogr/ogrpgeogeometry.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements decoder of shapebin geometry for PGeo
diff --git a/ogr/ogrpolyhedralsurface.cpp b/ogr/ogrpolyhedralsurface.cpp
index 23db6e1718ab..61b0ee268a3b 100644
--- a/ogr/ogrpolyhedralsurface.cpp
+++ b/ogr/ogrpolyhedralsurface.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  The OGRPolyhedralSurface geometry class.
diff --git a/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h b/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
index 47ce175a88c8..6a00adbe37d5 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
+++ b/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  AMIGOCLOUD Translator
  * Purpose:  Definition of classes for OGR AmigoCloud driver.
diff --git a/ogr/ogrsf_frmts/amigocloud/pkg/configure.in b/ogr/ogrsf_frmts/amigocloud/pkg/configure.in
index 7afe6f43cfab..dfa36a7fac48 100644
--- a/ogr/ogrsf_frmts/amigocloud/pkg/configure.in
+++ b/ogr/ogrsf_frmts/amigocloud/pkg/configure.in
@@ -1,6 +1,4 @@
 dnl ***************************************************************************
-dnl $Id$
-dnl
 dnl Project:  GDAL AmigoCloud Plugin
 dnl Purpose:  Configure source file.
 dnl Author:   Victor Chernetsky victor@amigocloud.com
diff --git a/ogr/ogrsf_frmts/avc/avc.h b/ogr/ogrsf_frmts/avc/avc.h
index 44e1808ca388..7a165d0f9f8d 100644
--- a/ogr/ogrsf_frmts/avc/avc.h
+++ b/ogr/ogrsf_frmts/avc/avc.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc.h
  * Project:  Arc/Info Vector coverage (AVC) BIN<->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_bin.cpp b/ogr/ogrsf_frmts/avc/avc_bin.cpp
index 519aa3df4c49..bdfd95910677 100644
--- a/ogr/ogrsf_frmts/avc/avc_bin.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_bin.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_bin.c
  * Project:  Arc/Info vector coverage (AVC)  BIN->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_binwr.cpp b/ogr/ogrsf_frmts/avc/avc_binwr.cpp
index b58c45e3947c..8eb51593e40a 100644
--- a/ogr/ogrsf_frmts/avc/avc_binwr.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_binwr.cpp
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Name:     avc_binwr.c
  * Project:  Arc/Info vector coverage (AVC)  E00->BIN conversion library
  * Language: ANSI C
@@ -891,7 +890,6 @@ int AVCBinWriteCnt(AVCBinFile *psFile, AVCCnt *psCnt)
  **********************************************************************/
 static int _AVCBinWriteLab(AVCRawBinFile *psFile, AVCLab *psLab, int nPrecision)
 {
-
     AVCRawBinWriteInt32(psFile, psLab->nValue);
     if (CPLGetLastErrorNo() != 0)
         return -1;
@@ -965,7 +963,6 @@ int AVCBinWriteLab(AVCBinFile *psFile, AVCLab *psLab)
  **********************************************************************/
 static int _AVCBinWriteTol(AVCRawBinFile *psFile, AVCTol *psTol, int nPrecision)
 {
-
     AVCRawBinWriteInt32(psFile, psTol->nIndex);
     if (CPLGetLastErrorNo() != 0)
         return -1;
@@ -1306,7 +1303,6 @@ int AVCBinWriteTxt(AVCBinFile *psFile, AVCTxt *psTxt)
 static int _AVCBinWriteRxp(AVCRawBinFile *psFile, AVCRxp *psRxp,
                            CPL_UNUSED int nPrecision)
 {
-
     AVCRawBinWriteInt32(psFile, psRxp->n1);
     if (CPLGetLastErrorNo() != 0)
         return -1;
diff --git a/ogr/ogrsf_frmts/avc/avc_e00gen.cpp b/ogr/ogrsf_frmts/avc/avc_e00gen.cpp
index 9edd4f120cc7..09b8ad001df9 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00gen.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00gen.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_e00gen.c
  * Project:  Arc/Info vector coverage (AVC)  BIN->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_e00parse.cpp b/ogr/ogrsf_frmts/avc/avc_e00parse.cpp
index bf3a049c30c9..ac65ca9254f0 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00parse.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00parse.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_e00parse.c
  * Project:  Arc/Info vector coverage (AVC)  E00->BIN conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_e00read.cpp b/ogr/ogrsf_frmts/avc/avc_e00read.cpp
index 747ccbaeb157..89e37549f0b4 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00read.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00read.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_e00read.c
  * Project:  Arc/Info vector coverage (AVC)  BIN->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_e00write.cpp b/ogr/ogrsf_frmts/avc/avc_e00write.cpp
index fa876c51dc6a..081d13c755ed 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00write.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00write.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_e00write.c
  * Project:  Arc/Info vector coverage (AVC)  E00->BIN conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_mbyte.cpp b/ogr/ogrsf_frmts/avc/avc_mbyte.cpp
index dc101c885a1a..8d376b53ccd9 100644
--- a/ogr/ogrsf_frmts/avc/avc_mbyte.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_mbyte.cpp
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Name:     avc_mbyte.c
  * Project:  Arc/Info vector coverage (AVC)  E00->BIN conversion library
  * Language: ANSI C
diff --git a/ogr/ogrsf_frmts/avc/avc_mbyte.h b/ogr/ogrsf_frmts/avc/avc_mbyte.h
index 97343e1a2c16..ced7d2a28a08 100644
--- a/ogr/ogrsf_frmts/avc/avc_mbyte.h
+++ b/ogr/ogrsf_frmts/avc/avc_mbyte.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc.h
  * Project:  Arc/Info Vector coverage (AVC) BIN<->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_misc.cpp b/ogr/ogrsf_frmts/avc/avc_misc.cpp
index 6248250c65d9..88dc8f7f5141 100644
--- a/ogr/ogrsf_frmts/avc/avc_misc.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_misc.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_misc.c
  * Project:  Arc/Info vector coverage (AVC)  BIN<->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/avc_rawbin.cpp b/ogr/ogrsf_frmts/avc/avc_rawbin.cpp
index 5e42b9afd841..8f6bc7e00dc5 100644
--- a/ogr/ogrsf_frmts/avc/avc_rawbin.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_rawbin.cpp
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     avc_rawbin.c
  * Project:  Arc/Info vector coverage (AVC)  BIN->E00 conversion library
diff --git a/ogr/ogrsf_frmts/avc/ogr_avc.h b/ogr/ogrsf_frmts/avc/ogr_avc.h
index ad19dac67354..e869ba6db9df 100644
--- a/ogr/ogrsf_frmts/avc/ogr_avc.h
+++ b/ogr/ogrsf_frmts/avc/ogr_avc.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Arc/Info Coverage (E00 & Binary) Reader
  * Purpose:  Declarations for OGR wrapper classes for coverage access.
diff --git a/ogr/ogrsf_frmts/carto/ogr_carto.h b/ogr/ogrsf_frmts/carto/ogr_carto.h
index a5f00866a194..35b3fe0caa8a 100644
--- a/ogr/ogrsf_frmts/carto/ogr_carto.h
+++ b/ogr/ogrsf_frmts/carto/ogr_carto.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CARTO Translator
  * Purpose:  Definition of classes for OGR Carto driver.
diff --git a/ogr/ogrsf_frmts/csv/ogr_csv.h b/ogr/ogrsf_frmts/csv/ogr_csv.h
index a5054e92d9b6..8e3c30e1f0cd 100644
--- a/ogr/ogrsf_frmts/csv/ogr_csv.h
+++ b/ogr/ogrsf_frmts/csv/ogr_csv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CSV Translator
  * Purpose:  Definition of classes for OGR .csv driver.
diff --git a/ogr/ogrsf_frmts/dgn/dgndump.cpp b/ogr/ogrsf_frmts/dgn/dgndump.cpp
index acca7d954124..14fd80565cb7 100644
--- a/ogr/ogrsf_frmts/dgn/dgndump.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgndump.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Microstation DGN Access Library
  * Purpose:  Temporary low level DGN dumper application.
diff --git a/ogr/ogrsf_frmts/dgn/dgnlib.h b/ogr/ogrsf_frmts/dgn/dgnlib.h
index ede8c12b881c..418426ca824a 100644
--- a/ogr/ogrsf_frmts/dgn/dgnlib.h
+++ b/ogr/ogrsf_frmts/dgn/dgnlib.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Microstation DGN Access Library
  * Purpose:  Definitions of public structures and API of DGN Library.
diff --git a/ogr/ogrsf_frmts/dgn/dgnlibp.h b/ogr/ogrsf_frmts/dgn/dgnlibp.h
index b14a2c8877ea..e89ce7d10996 100644
--- a/ogr/ogrsf_frmts/dgn/dgnlibp.h
+++ b/ogr/ogrsf_frmts/dgn/dgnlibp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Microstation DGN Access Library
  * Purpose:  Internal (privatE) datastructures, and prototypes for DGN Access
diff --git a/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp b/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp
index 4e1820953175..238e4b5c1c68 100644
--- a/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Microstation DGN Access Library
  * Purpose:  Test program for use of write api.
diff --git a/ogr/ogrsf_frmts/dgn/ogr_dgn.h b/ogr/ogrsf_frmts/dgn/ogr_dgn.h
index d16b8f9e8c9d..0debc2ad45a6 100644
--- a/ogr/ogrsf_frmts/dgn/ogr_dgn.h
+++ b/ogr/ogrsf_frmts/dgn/ogr_dgn.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  OGR Driver for DGN Reader.
diff --git a/ogr/ogrsf_frmts/dwg/ogr_dwg.h b/ogr/ogrsf_frmts/dwg/ogr_dwg.h
index 4a9b00c97ca0..5632ec76d9d7 100644
--- a/ogr/ogrsf_frmts/dwg/ogr_dwg.h
+++ b/ogr/ogrsf_frmts/dwg/ogr_dwg.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DWG Translator
  * Purpose:  Definition of classes for OGR .dwg driver.
diff --git a/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h
index 43b56a58d5cb..354ff8a0af33 100644
--- a/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h
+++ b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DXF and DWG Translators
  * Purpose:  Declarations for shared AutoCAD format services.
diff --git a/ogr/ogrsf_frmts/dxf/ogr_dxf.h b/ogr/ogrsf_frmts/dxf/ogr_dxf.h
index 4ff68b8ac1da..7b84a419c8a0 100644
--- a/ogr/ogrsf_frmts/dxf/ogr_dxf.h
+++ b/ogr/ogrsf_frmts/dxf/ogr_dxf.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  DXF Translator
  * Purpose:  Definition of classes for OGR .dxf driver.
diff --git a/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h b/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h
index a1b67ff23609..91c45952b11d 100644
--- a/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h
+++ b/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  EDIGEO Translator
  * Purpose:  Definition of classes for OGR .edigeo driver.
diff --git a/ogr/ogrsf_frmts/elastic/ogr_elastic.h b/ogr/ogrsf_frmts/elastic/ogr_elastic.h
index a2e5f7cb5035..b9c662aeee07 100644
--- a/ogr/ogrsf_frmts/elastic/ogr_elastic.h
+++ b/ogr/ogrsf_frmts/elastic/ogr_elastic.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Elasticsearch Translator
  * Purpose:
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbUtils.h b/ogr/ogrsf_frmts/filegdb/FGdbUtils.h
index 640a9aa26d08..36013ca0d260 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbUtils.h
+++ b/ogr/ogrsf_frmts/filegdb/FGdbUtils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Various FileGDB OGR Datasource utility functions
diff --git a/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
index 021268fa9785..6bf120017708 100644
--- a/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
+++ b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Standard includes and class definitions ArcObjects OGR driver.
diff --git a/ogr/ogrsf_frmts/generic/ogr_gensql.h b/ogr/ogrsf_frmts/generic/ogr_gensql.h
index ae8bed191e66..b8b1aabe3824 100644
--- a/ogr/ogrsf_frmts/generic/ogr_gensql.h
+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Classes related to generic implementation of ExecuteSQL().
diff --git a/ogr/ogrsf_frmts/generic/ogreditablelayer.h b/ogr/ogrsf_frmts/generic/ogreditablelayer.h
index 4e517c4728f0..1b60032a832d 100644
--- a/ogr/ogrsf_frmts/generic/ogreditablelayer.h
+++ b/ogr/ogrsf_frmts/generic/ogreditablelayer.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGREditableLayer class
diff --git a/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h
index 5a3c49c3f311..0e1395504b73 100644
--- a/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h
+++ b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRDataSourceWithTransaction class
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h
index 535f171fe274..9b5aef4c815c 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRLayerDecorator class
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerpool.h b/ogr/ogrsf_frmts/generic/ogrlayerpool.h
index 4343b98746e6..e37ce8ca1112 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerpool.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayerpool.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRLayerPool and OGRProxiedLayer class
diff --git a/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h
index 452af8a38d21..fe04270934e9 100644
--- a/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h
+++ b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRLMutexedDataSource class
diff --git a/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h
index 84d692ba3128..4ad7501898d5 100644
--- a/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRLMutexedLayer class
diff --git a/ogr/ogrsf_frmts/generic/ogrunionlayer.h b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
index dc5e0244bd71..9f9725fdced4 100644
--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRUnionLayer class
diff --git a/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h
index 4bf8deb87608..1b75e3b8dda6 100644
--- a/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines OGRWarpedLayer class
diff --git a/ogr/ogrsf_frmts/geoconcept/geoconcept.c b/ogr/ogrsf_frmts/geoconcept/geoconcept.c
index b68d265d4908..39e9c3e46256 100644
--- a/ogr/ogrsf_frmts/geoconcept/geoconcept.c
+++ b/ogr/ogrsf_frmts/geoconcept/geoconcept.c
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     geoconcept.c
  * Project:  OpenGIS Simple Features Reference Implementation
diff --git a/ogr/ogrsf_frmts/geojson/ogr_geojson.h b/ogr/ogrsf_frmts/geojson/ogr_geojson.h
index e308ff6ae89c..6a18a332d944 100644
--- a/ogr/ogrsf_frmts/geojson/ogr_geojson.h
+++ b/ogr/ogrsf_frmts/geojson/ogr_geojson.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Definitions of OGR OGRGeoJSON driver types.
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
index e3f666e66eb5..17d52af17d1a 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Defines GeoJSON reader within OGR OGRGeoJSON Driver.
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h
index bbf3bfb82d92..ff1cce341f64 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private utilities within OGR OGRGeoJSON Driver.
diff --git a/ogr/ogrsf_frmts/gml/gmlreader.h b/ogr/ogrsf_frmts/gml/gmlreader.h
index eb82ca3790ac..13a49f1647ca 100644
--- a/ogr/ogrsf_frmts/gml/gmlreader.h
+++ b/ogr/ogrsf_frmts/gml/gmlreader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML Reader
  * Purpose:  Public Declarations for OGR free GML Reader code.
diff --git a/ogr/ogrsf_frmts/gml/gmlreaderp.h b/ogr/ogrsf_frmts/gml/gmlreaderp.h
index 2a59e08538e5..3eaeb4a82415 100644
--- a/ogr/ogrsf_frmts/gml/gmlreaderp.h
+++ b/ogr/ogrsf_frmts/gml/gmlreaderp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML Reader
  * Purpose:  Private Declarations for OGR free GML Reader code.
diff --git a/ogr/ogrsf_frmts/gml/gmlregistry.h b/ogr/ogrsf_frmts/gml/gmlregistry.h
index 608077e20cff..25aee724f2b3 100644
--- a/ogr/ogrsf_frmts/gml/gmlregistry.h
+++ b/ogr/ogrsf_frmts/gml/gmlregistry.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML registry
  * Purpose:  GML reader
diff --git a/ogr/ogrsf_frmts/gml/ogr_gml.h b/ogr/ogrsf_frmts/gml/ogr_gml.h
index f3cd7013e2d8..b6e2ae78054c 100644
--- a/ogr/ogrsf_frmts/gml/ogr_gml.h
+++ b/ogr/ogrsf_frmts/gml/ogr_gml.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML Reader
  * Purpose:  Declarations for OGR wrapper classes for GML, and GML<->OGR
diff --git a/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd b/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd
index a1a0ea54b41b..7d931ac619ec 100644
--- a/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd
+++ b/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL/OGR
  * Purpose:  XML Schema for gmlasconf.xml
  * Author:   Even Rouault, <even dot rouault at spatialys dot com>
diff --git a/ogr/ogrsf_frmts/gmlutils/gmlfeature.h b/ogr/ogrsf_frmts/gmlutils/gmlfeature.h
index ffa990be5576..62dc8d205d3d 100644
--- a/ogr/ogrsf_frmts/gmlutils/gmlfeature.h
+++ b/ogr/ogrsf_frmts/gmlutils/gmlfeature.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML Reader
  * Purpose:  Public Declarations for OGR free GML Reader code.
diff --git a/ogr/ogrsf_frmts/gmlutils/gmlutils.h b/ogr/ogrsf_frmts/gmlutils/gmlutils.h
index 0ef789a7b7d0..1387a843b738 100644
--- a/ogr/ogrsf_frmts/gmlutils/gmlutils.h
+++ b/ogr/ogrsf_frmts/gmlutils/gmlutils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML Utils
  * Purpose:  GML reader
diff --git a/ogr/ogrsf_frmts/gmlutils/parsexsd.h b/ogr/ogrsf_frmts/gmlutils/parsexsd.h
index 669c94a066aa..ea9f902ecc3d 100644
--- a/ogr/ogrsf_frmts/gmlutils/parsexsd.h
+++ b/ogr/ogrsf_frmts/gmlutils/parsexsd.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GML Reader
  * Purpose:  Implementation of GMLParseXSD()
diff --git a/ogr/ogrsf_frmts/gmt/ogr_gmt.h b/ogr/ogrsf_frmts/gmt/ogr_gmt.h
index a85afdc5282a..85b16fb0d006 100644
--- a/ogr/ogrsf_frmts/gmt/ogr_gmt.h
+++ b/ogr/ogrsf_frmts/gmt/ogr_gmt.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions within the OGR GMT driver.
diff --git a/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
index 2420c38e168d..a25d48102196 100644
--- a/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
+++ b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoPackage/MBTiles Translator
  * Purpose:  Definition of common classes for GeoPackage and MBTiles drivers.
diff --git a/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h b/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
index ec7432de933c..7d98eb3cb1b1 100644
--- a/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
+++ b/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoPackage Translator
  * Purpose:  Definition of classes for OGR GeoPackage driver.
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h
index 702a3f88cf59..3482f40b98ef 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoPackage Translator
  * Purpose:  Utility header for OGR GeoPackage driver.
diff --git a/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h b/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h
index 6ea34b8700d8..9599bc7db954 100644
--- a/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h
+++ b/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/GPSBabel driver.
diff --git a/ogr/ogrsf_frmts/gpx/ogr_gpx.h b/ogr/ogrsf_frmts/gpx/ogr_gpx.h
index e08153818857..fcd2a5453558 100644
--- a/ogr/ogrsf_frmts/gpx/ogr_gpx.h
+++ b/ogr/ogrsf_frmts/gpx/ogr_gpx.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GPX Translator
  * Purpose:  Definition of classes for OGR .gpx driver.
diff --git a/ogr/ogrsf_frmts/idb/ogr_idb.h b/ogr/ogrsf_frmts/idb/ogr_idb.h
index db462cfbcbfd..b7501736e79b 100644
--- a/ogr/ogrsf_frmts/idb/ogr_idb.h
+++ b/ogr/ogrsf_frmts/idb/ogr_idb.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements OGRIDBTableLayer class, access to an existing table
diff --git a/ogr/ogrsf_frmts/idrisi/generate_test_files.c b/ogr/ogrsf_frmts/idrisi/generate_test_files.c
index 75aa7b48dfbe..882b486a8027 100644
--- a/ogr/ogrsf_frmts/idrisi/generate_test_files.c
+++ b/ogr/ogrsf_frmts/idrisi/generate_test_files.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:
  * Purpose:  Generate sample .VCT files
diff --git a/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h b/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h
index 3ecceba11628..95440fe01f2c 100644
--- a/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h
+++ b/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Idrisi Translator
  * Purpose:  Definition of classes for OGR Idrisi driver.
diff --git a/ogr/ogrsf_frmts/ili/ili1reader.h b/ogr/ogrsf_frmts/ili/ili1reader.h
index 46157ad7f5cd..487fd186d6c1 100644
--- a/ogr/ogrsf_frmts/ili/ili1reader.h
+++ b/ogr/ogrsf_frmts/ili/ili1reader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 1 Reader
  * Purpose:  Private Declarations for Reader code.
diff --git a/ogr/ogrsf_frmts/ili/ili1readerp.h b/ogr/ogrsf_frmts/ili/ili1readerp.h
index 491c6b85ac2b..89464a8e1986 100644
--- a/ogr/ogrsf_frmts/ili/ili1readerp.h
+++ b/ogr/ogrsf_frmts/ili/ili1readerp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 1 Reader
  * Purpose:  Private Declarations for Reader code.
diff --git a/ogr/ogrsf_frmts/ili/ili2reader.h b/ogr/ogrsf_frmts/ili/ili2reader.h
index 8e0027cb584d..0fddb2d5ed59 100644
--- a/ogr/ogrsf_frmts/ili/ili2reader.h
+++ b/ogr/ogrsf_frmts/ili/ili2reader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 2 Reader
  * Purpose:  Public Declarations for Reader code.
diff --git a/ogr/ogrsf_frmts/ili/ili2readerp.h b/ogr/ogrsf_frmts/ili/ili2readerp.h
index bd8c5fd81815..810c06059b77 100644
--- a/ogr/ogrsf_frmts/ili/ili2readerp.h
+++ b/ogr/ogrsf_frmts/ili/ili2readerp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 2 Reader
  * Purpose:  Private Declarations for Reader code.
diff --git a/ogr/ogrsf_frmts/ili/imdreader.h b/ogr/ogrsf_frmts/ili/imdreader.h
index 49f5dc44e62f..7b65cedf71fd 100644
--- a/ogr/ogrsf_frmts/ili/imdreader.h
+++ b/ogr/ogrsf_frmts/ili/imdreader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 1/2 Translator
  * Purpose:  IlisMeta model reader.
diff --git a/ogr/ogrsf_frmts/ili/ogr_ili1.h b/ogr/ogrsf_frmts/ili/ogr_ili1.h
index 404dc354c0c7..0164f7d11349 100644
--- a/ogr/ogrsf_frmts/ili/ogr_ili1.h
+++ b/ogr/ogrsf_frmts/ili/ogr_ili1.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 1 Translator
  * Purpose:   Definition of classes for OGR Interlis 1 driver.
diff --git a/ogr/ogrsf_frmts/ili/ogr_ili2.h b/ogr/ogrsf_frmts/ili/ogr_ili2.h
index 52a2bff039b4..a47e6f54925c 100644
--- a/ogr/ogrsf_frmts/ili/ogr_ili2.h
+++ b/ogr/ogrsf_frmts/ili/ogr_ili2.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Interlis 2 Translator
  * Purpose:   Definition of classes for OGR Interlis 2 driver.
diff --git a/ogr/ogrsf_frmts/jml/ogr_jml.h b/ogr/ogrsf_frmts/jml/ogr_jml.h
index 77abdb7ab354..bf8dfac6dbca 100644
--- a/ogr/ogrsf_frmts/jml/ogr_jml.h
+++ b/ogr/ogrsf_frmts/jml/ogr_jml.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  JML .jml Translator
  * Purpose:  Definition of classes for OGR JML driver.
diff --git a/ogr/ogrsf_frmts/kml/kml.h b/ogr/ogrsf_frmts/kml/kml.h
index e82793425e42..c309ef0eefef 100644
--- a/ogr/ogrsf_frmts/kml/kml.h
+++ b/ogr/ogrsf_frmts/kml/kml.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KML Driver
  * Purpose:  Class for reading, parsing and handling a kmlfile.
diff --git a/ogr/ogrsf_frmts/kml/kmlnode.h b/ogr/ogrsf_frmts/kml/kmlnode.h
index 5b702d0b527a..0623f7b19d81 100644
--- a/ogr/ogrsf_frmts/kml/kmlnode.h
+++ b/ogr/ogrsf_frmts/kml/kmlnode.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KML Driver
  * Purpose:  Class for building up the node structure of the kml file.
diff --git a/ogr/ogrsf_frmts/kml/kmlutility.h b/ogr/ogrsf_frmts/kml/kmlutility.h
index fb96b93f795a..65737cb41e8d 100644
--- a/ogr/ogrsf_frmts/kml/kmlutility.h
+++ b/ogr/ogrsf_frmts/kml/kmlutility.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KML Driver
  * Purpose:  KML driver utilities
diff --git a/ogr/ogrsf_frmts/kml/kmlvector.h b/ogr/ogrsf_frmts/kml/kmlvector.h
index e3b7af78eac4..93bf83677669 100644
--- a/ogr/ogrsf_frmts/kml/kmlvector.h
+++ b/ogr/ogrsf_frmts/kml/kmlvector.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KML Driver
  * Purpose:  Specialization of the kml class, only for vectors in kml files.
diff --git a/ogr/ogrsf_frmts/kml/ogr_kml.h b/ogr/ogrsf_frmts/kml/ogr_kml.h
index 6eb8cbff061f..90a4d80a03f2 100644
--- a/ogr/ogrsf_frmts/kml/ogr_kml.h
+++ b/ogr/ogrsf_frmts/kml/ogr_kml.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KML Driver
  * Purpose:  Declarations for OGR wrapper classes for KML, and OGR->KML
diff --git a/ogr/ogrsf_frmts/mem/ogr_mem.h b/ogr/ogrsf_frmts/mem/ogr_mem.h
index 52ad1e156101..432601fb43f3 100644
--- a/ogr/ogrsf_frmts/mem/ogr_mem.h
+++ b/ogr/ogrsf_frmts/mem/ogr_mem.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions within the OGR Memory driver.
diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramon.h b/ogr/ogrsf_frmts/miramon/ogrmiramon.h
index bd38f675f455..4ee498506784 100644
--- a/ogr/ogrsf_frmts/miramon/ogrmiramon.h
+++ b/ogr/ogrsf_frmts/miramon/ogrmiramon.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  C++ classes for the MiraMon driver
diff --git a/ogr/ogrsf_frmts/mitab/TODO.TXT b/ogr/ogrsf_frmts/mitab/TODO.TXT
index 12db022d097c..bfb843f1cf88 100644
--- a/ogr/ogrsf_frmts/mitab/TODO.TXT
+++ b/ogr/ogrsf_frmts/mitab/TODO.TXT
@@ -33,7 +33,3 @@ MITAB Library - ToDo, Open Questions:
    MapInfo Versions 5.0 and up when the inside/outside ring relationship
    is not properly written.
 
-
-------------
-$Id$
-------------
diff --git a/ogr/ogrsf_frmts/mitab/mitab.h b/ogr/ogrsf_frmts/mitab/mitab.h
index c7790c056efd..2a6806b855d9 100644
--- a/ogr/ogrsf_frmts/mitab/mitab.h
+++ b/ogr/ogrsf_frmts/mitab/mitab.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     mitab.h
  * Project:  MapInfo TAB Read/Write library
diff --git a/ogr/ogrsf_frmts/mitab/mitab_geometry.h b/ogr/ogrsf_frmts/mitab/mitab_geometry.h
index 3e1dec66d0e7..3b127c05f255 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_geometry.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_geometry.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     mitab_geometry.cpp
  * Project:  MapInfo TAB Read/Write library
diff --git a/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
index a1b26afa29fd..5a3b75c82a58 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     mitab_ogr_drive.h
  * Project:  Mid/mif tab ogr support
diff --git a/ogr/ogrsf_frmts/mitab/mitab_priv.h b/ogr/ogrsf_frmts/mitab/mitab_priv.h
index 0fcca25040a5..986dc9436c7c 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_priv.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_priv.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     mitab_priv.h
  * Project:  MapInfo TAB Read/Write library
diff --git a/ogr/ogrsf_frmts/mitab/mitab_utils.h b/ogr/ogrsf_frmts/mitab/mitab_utils.h
index 88b9ab9f787a..7494af05f944 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_utils.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_utils.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     mitab_utils.h
  * Project:  MapInfo TAB Read/Write library
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h b/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
index dc96317c8308..bf1a4adc2a6a 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  MSSQL Spatial driver
  * Purpose:  Definition of classes for OGR MSSQL Spatial driver.
diff --git a/ogr/ogrsf_frmts/mysql/ogr_mysql.h b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
index 85dc86b777be..a9d8c75b0aee 100644
--- a/ogr/ogrsf_frmts/mysql/ogr_mysql.h
+++ b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Declarations for MySQL OGR Driver Classes.
diff --git a/ogr/ogrsf_frmts/nas/nasreaderp.h b/ogr/ogrsf_frmts/nas/nasreaderp.h
index 82b68bf47b5e..89d236f1f76d 100644
--- a/ogr/ogrsf_frmts/nas/nasreaderp.h
+++ b/ogr/ogrsf_frmts/nas/nasreaderp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NAS Reader
  * Purpose:  Private Declarations for OGR NAS Reader code.
diff --git a/ogr/ogrsf_frmts/nas/ogr_nas.h b/ogr/ogrsf_frmts/nas/ogr_nas.h
index f2e5ba12e469..6943c882e271 100644
--- a/ogr/ogrsf_frmts/nas/ogr_nas.h
+++ b/ogr/ogrsf_frmts/nas/ogr_nas.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NAS Reader
  * Purpose:  Declarations for OGR wrapper classes for NAS, and NAS<->OGR
diff --git a/ogr/ogrsf_frmts/ntf/ntf.h b/ogr/ogrsf_frmts/ntf/ntf.h
index b5e836deeda0..2251a50ff25c 100644
--- a/ogr/ogrsf_frmts/ntf/ntf.h
+++ b/ogr/ogrsf_frmts/ntf/ntf.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NTF Translator
  * Purpose:  Main declarations for NTF translator.
diff --git a/ogr/ogrsf_frmts/oci/ogr_oci.h b/ogr/ogrsf_frmts/oci/ogr_oci.h
index 616822136fd7..8f443713b8af 100644
--- a/ogr/ogrsf_frmts/oci/ogr_oci.h
+++ b/ogr/ogrsf_frmts/oci/ogr_oci.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Oracle Spatial Driver
  * Purpose:  Oracle Spatial OGR Driver Declarations.
diff --git a/ogr/ogrsf_frmts/odbc/ogr_odbc.h b/ogr/ogrsf_frmts/odbc/ogr_odbc.h
index a2461ae55de2..e4bb01c7335e 100644
--- a/ogr/ogrsf_frmts/odbc/ogr_odbc.h
+++ b/ogr/ogrsf_frmts/odbc/ogr_odbc.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/ODBC driver.
diff --git a/ogr/ogrsf_frmts/ods/ods_formula.h b/ogr/ogrsf_frmts/ods/ods_formula.h
index 496fc28bd1b3..231d396112e7 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula.h
+++ b/ogr/ogrsf_frmts/ods/ods_formula.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Component: ODS formula Engine
  * Purpose: Implementation of the ods_formula_node class used to represent a
diff --git a/ogr/ogrsf_frmts/ods/ogr_ods.h b/ogr/ogrsf_frmts/ods/ogr_ods.h
index 77beedc8d841..29ed09827f0a 100644
--- a/ogr/ogrsf_frmts/ods/ogr_ods.h
+++ b/ogr/ogrsf_frmts/ods/ogr_ods.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ODS Translator
  * Purpose:  Definition of classes for OGR OpenOfficeSpreadsheet .ods driver.
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdi.h b/ogr/ogrsf_frmts/ogdi/ogrogdi.h
index e0c3133bf469..cee6b3ccbdf1 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdi.h
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdi.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OGDI Bridge
  * Purpose:  Private definitions within the OGDI driver to implement
diff --git a/ogr/ogrsf_frmts/ogr_attrind.h b/ogr/ogrsf_frmts/ogr_attrind.h
index ed9397821a5f..a569ab466b04 100644
--- a/ogr/ogrsf_frmts/ogr_attrind.h
+++ b/ogr/ogrsf_frmts/ogr_attrind.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Classes related to generic implementation of attribute indexing.
diff --git a/ogr/ogrsf_frmts/ogrsf_frmts.dox b/ogr/ogrsf_frmts/ogrsf_frmts.dox
index dcbeee61150b..0b25e2888b02 100644
--- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
+++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id$
- *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Documentation for ogrsf_frmts.h classes.
  * Author:   Frank Warmerdam, warmerda@home.com
diff --git a/ogr/ogrsf_frmts/ogrsf_frmts.h b/ogr/ogrsf_frmts/ogrsf_frmts.h
index e7f28b1fb155..ea78856d03be 100644
--- a/ogr/ogrsf_frmts/ogrsf_frmts.h
+++ b/ogr/ogrsf_frmts/ogrsf_frmts.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Classes related to format registration, and file opening.
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
index f24f4982abb3..f5f3a2504a2a 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements reading of FileGDB tables
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h
index e7ff83217720..e8ad00c60d25 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements reading of FileGDB tables
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h b/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h
index 36c29b23f3a9..90c17878d2fd 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h
+++ b/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements Open FileGDB OGR driver.
diff --git a/ogr/ogrsf_frmts/osm/gpb.h b/ogr/ogrsf_frmts/osm/gpb.h
index 375b3845b930..28ff63eb2f0e 100644
--- a/ogr/ogrsf_frmts/osm/gpb.h
+++ b/ogr/ogrsf_frmts/osm/gpb.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/ogr/ogrsf_frmts/osm/ogr_osm.h b/ogr/ogrsf_frmts/osm/ogr_osm.h
index 247b604c2c1a..b5084ad14435 100644
--- a/ogr/ogrsf_frmts/osm/ogr_osm.h
+++ b/ogr/ogrsf_frmts/osm/ogr_osm.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/OpenStreeMap driver.
diff --git a/ogr/ogrsf_frmts/osm/osm2osm.cpp b/ogr/ogrsf_frmts/osm/osm2osm.cpp
index 1a28d0522efe..72368ee8774d 100644
--- a/ogr/ogrsf_frmts/osm/osm2osm.cpp
+++ b/ogr/ogrsf_frmts/osm/osm2osm.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/ogr/ogrsf_frmts/osm/osm_parser.h b/ogr/ogrsf_frmts/osm/osm_parser.h
index 50aa07271026..5c2c6ce6544a 100644
--- a/ogr/ogrsf_frmts/osm/osm_parser.h
+++ b/ogr/ogrsf_frmts/osm/osm_parser.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/ogr/ogrsf_frmts/pds/ogr_pds.h b/ogr/ogrsf_frmts/pds/ogr_pds.h
index 1b1366b73ee0..56658b4fe692 100644
--- a/ogr/ogrsf_frmts/pds/ogr_pds.h
+++ b/ogr/ogrsf_frmts/pds/ogr_pds.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PDS Translator
  * Purpose:  Definition of classes for OGR .pdstable driver.
diff --git a/ogr/ogrsf_frmts/pg/ogr_pg.h b/ogr/ogrsf_frmts/pg/ogr_pg.h
index 9981131a086c..190cf2c27d08 100644
--- a/ogr/ogrsf_frmts/pg/ogr_pg.h
+++ b/ogr/ogrsf_frmts/pg/ogr_pg.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/PostgreSQL driver.
diff --git a/ogr/ogrsf_frmts/pg/ogrpgutility.h b/ogr/ogrsf_frmts/pg/ogrpgutility.h
index 9337720801b3..41936cb24ca6 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgutility.h
+++ b/ogr/ogrsf_frmts/pg/ogrpgutility.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private utilities for OGR/PostgreSQL driver.
diff --git a/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
index d03a4e3e4d71..c0313c84b408 100644
--- a/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
+++ b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/PostgreSQL dump driver.
diff --git a/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h b/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h
index fe4f0827a6ae..451fa8d68083 100644
--- a/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h
+++ b/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for Personal Geodatabase driver.
diff --git a/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h b/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h
index 17921fee84e8..837dfd4063b5 100644
--- a/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h
+++ b/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PlanetLabs scene driver
  * Purpose:  PLScenes driver interface
diff --git a/ogr/ogrsf_frmts/s57/ogr_s57.h b/ogr/ogrsf_frmts/s57/ogr_s57.h
index f0a43bae0fe1..8787546c0289 100644
--- a/ogr/ogrsf_frmts/s57/ogr_s57.h
+++ b/ogr/ogrsf_frmts/s57/ogr_s57.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  S-57 Translator
  * Purpose:  Declarations for classes binding S57 support onto OGRLayer,
diff --git a/ogr/ogrsf_frmts/s57/s57.h b/ogr/ogrsf_frmts/s57/s57.h
index 853b8cf4b114..8874560f8fc5 100644
--- a/ogr/ogrsf_frmts/s57/s57.h
+++ b/ogr/ogrsf_frmts/s57/s57.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  S-57 Translator
  * Purpose:  Declarations for S-57 translator not including the
diff --git a/ogr/ogrsf_frmts/sdts/ogr_sdts.h b/ogr/ogrsf_frmts/sdts/ogr_sdts.h
index 78b01779f91e..fcd993c12493 100644
--- a/ogr/ogrsf_frmts/sdts/ogr_sdts.h
+++ b/ogr/ogrsf_frmts/sdts/ogr_sdts.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  STS Translator
  * Purpose:  Definition of classes finding SDTS support into OGRDriver
diff --git a/ogr/ogrsf_frmts/shape/ogrshape.h b/ogr/ogrsf_frmts/shape/ogrshape.h
index 2fd2af48b0b9..a929e7514d70 100644
--- a/ogr/ogrsf_frmts/shape/ogrshape.h
+++ b/ogr/ogrsf_frmts/shape/ogrshape.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions within the Shapefile driver to implement
diff --git a/ogr/ogrsf_frmts/shape/shp_vsi.c b/ogr/ogrsf_frmts/shape/shp_vsi.c
index d36254d5ee3d..1ec686c948e4 100644
--- a/ogr/ogrsf_frmts/shape/shp_vsi.c
+++ b/ogr/ogrsf_frmts/shape/shp_vsi.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  IO Redirection via VSI services for shp/dbf io.
diff --git a/ogr/ogrsf_frmts/shape/shp_vsi.h b/ogr/ogrsf_frmts/shape/shp_vsi.h
index 9758cf88d4d5..bdfb86e688c3 100644
--- a/ogr/ogrsf_frmts/shape/shp_vsi.h
+++ b/ogr/ogrsf_frmts/shape/shp_vsi.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  IO Redirection via VSI services for shp/dbf io.
diff --git a/ogr/ogrsf_frmts/sosi/ogr_sosi.h b/ogr/ogrsf_frmts/sosi/ogr_sosi.h
index dac91a77bc5a..4dfc278a5dbf 100644
--- a/ogr/ogrsf_frmts/sosi/ogr_sosi.h
+++ b/ogr/ogrsf_frmts/sosi/ogr_sosi.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  SOSI Translator
  * Purpose:  Implements OGRSOSIDriver.
diff --git a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
index a13bfd39aee3..d4621fbe7994 100644
--- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/SQLite driver.
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c b/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c
index 92a047750c1c..81b95a90d629 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Static registration of sqlite3 entry points
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h
index 0f2defef6295..8c070416db32 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Definition of classes and functions used by SQLite and GPKG drivers
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h
index 19b3a4e12a35..4477e99dfe77 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Run SQL requests with SQLite SQL engine
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h
index e1339ff15a43..618d549659c5 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  SQLite REGEXP function
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h
index 3bc88030e76d..4ce73645e61b 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Extension SQL functions
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
index 2e32f947a05f..ff78640f45ee 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GeoPackage Translator
  * Purpose:  Utility header for OGR GeoPackage driver.
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h
index c5d6fac650a0..4ba03f6ae1bf 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Creation of a SQLite3 VFS
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h
index 67da33b285c5..cffcae235a3b 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  SQLite Virtual Table module using OGR layers
diff --git a/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c b/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c
index 6060444da15a..abd35a1e96a1 100644
--- a/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c
+++ b/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Test dynamic loading of SQLite Virtual Table module using OGR
diff --git a/ogr/ogrsf_frmts/svg/ogr_svg.h b/ogr/ogrsf_frmts/svg/ogr_svg.h
index 2fa3712cab9d..5c679c4f68bb 100644
--- a/ogr/ogrsf_frmts/svg/ogr_svg.h
+++ b/ogr/ogrsf_frmts/svg/ogr_svg.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  SVG Translator
  * Purpose:  Definition of classes for OGR .svg driver.
diff --git a/ogr/ogrsf_frmts/sxf/ogr_sxf.h b/ogr/ogrsf_frmts/sxf/ogr_sxf.h
index 6dc2946ee8f8..1edfa834a3ea 100644
--- a/ogr/ogrsf_frmts/sxf/ogr_sxf.h
+++ b/ogr/ogrsf_frmts/sxf/ogr_sxf.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  SXF Translator
  * Purpose:  Include file defining classes for OGR SXF driver, datasource and
diff --git a/ogr/ogrsf_frmts/sxf/org_sxf_defs.h b/ogr/ogrsf_frmts/sxf/org_sxf_defs.h
index a75f63c0b910..fae5578fb46f 100644
--- a/ogr/ogrsf_frmts/sxf/org_sxf_defs.h
+++ b/ogr/ogrsf_frmts/sxf/org_sxf_defs.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  SXF Translator
  * Purpose:  Include file defining Records Structures for file reading and
diff --git a/ogr/ogrsf_frmts/tiger/ogr_tiger.h b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
index 8e6f2a139698..26ba20043daa 100644
--- a/ogr/ogrsf_frmts/tiger/ogr_tiger.h
+++ b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
@@ -1,6 +1,5 @@
 /*-*-C++-*-*/
 /******************************************************************************
- * $Id$
  *
  * Project:  TIGER/Line Translator
  * Purpose:  Main declarations for Tiger translator.
diff --git a/ogr/ogrsf_frmts/vdv/data/vdv452.xml b/ogr/ogrsf_frmts/vdv/data/vdv452.xml
index bc505d03b240..04651918b8a1 100644
--- a/ogr/ogrsf_frmts/vdv/data/vdv452.xml
+++ b/ogr/ogrsf_frmts/vdv/data/vdv452.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL
  * Purpose:  Description of VDV-452 layers and fields
  * Author:   Even Rouault, <even.rouault at spatialys.com>
diff --git a/ogr/ogrsf_frmts/vdv/data/vdv452.xsd b/ogr/ogrsf_frmts/vdv/data/vdv452.xsd
index 5b6d4bd51212..399e035e0c38 100644
--- a/ogr/ogrsf_frmts/vdv/data/vdv452.xsd
+++ b/ogr/ogrsf_frmts/vdv/data/vdv452.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL
  * Purpose:  Schema of vdv-452.xml
  * Author:   Even Rouault, <even.rouault at spatialys.com>
diff --git a/ogr/ogrsf_frmts/vdv/ogr_vdv.h b/ogr/ogrsf_frmts/vdv/ogr_vdv.h
index 17932f5dafcb..19b709e5a7fd 100644
--- a/ogr/ogrsf_frmts/vdv/ogr_vdv.h
+++ b/ogr/ogrsf_frmts/vdv/ogr_vdv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  VDV Translator
  * Purpose:  Implements OGRVDVDriver.
diff --git a/ogr/ogrsf_frmts/vfk/ogr_vfk.h b/ogr/ogrsf_frmts/vfk/ogr_vfk.h
index cf010e237322..e39cc4ed7071 100644
--- a/ogr/ogrsf_frmts/vfk/ogr_vfk.h
+++ b/ogr/ogrsf_frmts/vfk/ogr_vfk.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/VFK driver.
diff --git a/ogr/ogrsf_frmts/vfk/vfkreader.h b/ogr/ogrsf_frmts/vfk/vfkreader.h
index 928783127f1a..84e5b1c2bf17 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreader.h
+++ b/ogr/ogrsf_frmts/vfk/vfkreader.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  VFK Reader
  * Purpose:  Public Declarations for OGR free VFK Reader code.
diff --git a/ogr/ogrsf_frmts/vfk/vfkreaderp.h b/ogr/ogrsf_frmts/vfk/vfkreaderp.h
index ab8f04dc54d7..c9a573772479 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreaderp.h
+++ b/ogr/ogrsf_frmts/vfk/vfkreaderp.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  VFK Reader
  * Purpose:  Private Declarations for OGR free VFK Reader code.
diff --git a/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd b/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd
index 74dc747db2f9..48967299d877 100644
--- a/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd
+++ b/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /******************************************************************************
- * $Id$
- *
  * Project:  GDAL/OGR
  * Purpose:  XML Schema for OGR VRT files.
  * Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/ogr/ogrsf_frmts/vrt/ogr_vrt.h b/ogr/ogrsf_frmts/vrt/ogr_vrt.h
index 3cafee6afe22..84fc27dca65f 100644
--- a/ogr/ogrsf_frmts/vrt/ogr_vrt.h
+++ b/ogr/ogrsf_frmts/vrt/ogr_vrt.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/VRT driver.
diff --git a/ogr/ogrsf_frmts/wfs/ogr_wfs.h b/ogr/ogrsf_frmts/wfs/ogr_wfs.h
index a84c57e0b0da..de9c4060d491 100644
--- a/ogr/ogrsf_frmts/wfs/ogr_wfs.h
+++ b/ogr/ogrsf_frmts/wfs/ogr_wfs.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  WFS Translator
  * Purpose:  Definition of classes for OGR WFS driver.
diff --git a/ogr/ogrsf_frmts/xls/include_freexl.h b/ogr/ogrsf_frmts/xls/include_freexl.h
index 6150d357f3c7..e40ad64a65c1 100644
--- a/ogr/ogrsf_frmts/xls/include_freexl.h
+++ b/ogr/ogrsf_frmts/xls/include_freexl.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  XLS Translator
  * Purpose:  Include freexl.h
diff --git a/ogr/ogrsf_frmts/xls/ogr_xls.h b/ogr/ogrsf_frmts/xls/ogr_xls.h
index 48103a2f1df7..1209b8b54b77 100644
--- a/ogr/ogrsf_frmts/xls/ogr_xls.h
+++ b/ogr/ogrsf_frmts/xls/ogr_xls.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  XLS Translator
  * Purpose:  Definition of classes for OGR .xls driver.
diff --git a/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h b/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
index c0192db27e97..ac821bf8f5bb 100644
--- a/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
+++ b/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  XLSX Translator
  * Purpose:  Definition of classes for OGR OpenOfficeSpreadsheet .xlsx driver.
diff --git a/ogr/ogrtriangle.cpp b/ogr/ogrtriangle.cpp
index 4e54600d99e5..4ecfeeefc84d 100644
--- a/ogr/ogrtriangle.cpp
+++ b/ogr/ogrtriangle.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  The OGRTriangle geometry class.
diff --git a/ogr/ogrtriangulatedsurface.cpp b/ogr/ogrtriangulatedsurface.cpp
index 9470370e628e..18ffcea447bf 100644
--- a/ogr/ogrtriangulatedsurface.cpp
+++ b/ogr/ogrtriangulatedsurface.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  The OGRTriangulatedSurface geometry class.
diff --git a/port/cpl_alibaba_oss.h b/port/cpl_alibaba_oss.h
index 890e0b54536b..f8d773e8def2 100644
--- a/port/cpl_alibaba_oss.h
+++ b/port/cpl_alibaba_oss.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_alibaba_oss.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_atomic_ops.h b/port/cpl_atomic_ops.h
index 613384cb55d9..0b92cadc5db8 100644
--- a/port/cpl_atomic_ops.h
+++ b/port/cpl_atomic_ops.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_atomic_ops.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_auto_close.h b/port/cpl_auto_close.h
index 5678893da9ac..e013d3a4494d 100644
--- a/port/cpl_auto_close.h
+++ b/port/cpl_auto_close.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_auto_close.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_aws.h b/port/cpl_aws.h
index 48b6f60c1779..140e12158a8c 100644
--- a/port/cpl_aws.h
+++ b/port/cpl_aws.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_aws.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_config_extras.h b/port/cpl_config_extras.h
index df125200e146..ae928001e864 100644
--- a/port/cpl_config_extras.h
+++ b/port/cpl_config_extras.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #ifndef INCLUDED_CPL_CONFIG_EXTRAS
 #define INCLUDED_CPL_CONFIG_EXTRAS
diff --git a/port/cpl_conv.h b/port/cpl_conv.h
index f1d11eb06300..5f3f655e0df3 100644
--- a/port/cpl_conv.h
+++ b/port/cpl_conv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  Convenience functions declarations.
diff --git a/port/cpl_csv.h b/port/cpl_csv.h
index 36b0346f6497..d3d27d98ef37 100644
--- a/port/cpl_csv.h
+++ b/port/cpl_csv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Common Portability Library
  * Purpose:  Functions for reading and scanning CSV (comma separated,
diff --git a/port/cpl_curl_priv.h b/port/cpl_curl_priv.h
index 73ff354f8742..6321b8b3bb76 100644
--- a/port/cpl_curl_priv.h
+++ b/port/cpl_curl_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Author:   Andrew Sudorgin (drons [a] list dot ru)
diff --git a/port/cpl_error.h b/port/cpl_error.h
index d15d875e619c..7eeae83da8c2 100644
--- a/port/cpl_error.h
+++ b/port/cpl_error.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_error.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_error_internal.h b/port/cpl_error_internal.h
index dc1ffa8312ba..2b8f27913dfa 100644
--- a/port/cpl_error_internal.h
+++ b/port/cpl_error_internal.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_error_internal.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_float.cpp b/port/cpl_float.cpp
index 9c8bb6edffe2..d92dde8eb0bb 100644
--- a/port/cpl_float.cpp
+++ b/port/cpl_float.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL
  * Purpose:  Floating point conversion functions. Convert 16- and 24-bit
diff --git a/port/cpl_float.h b/port/cpl_float.h
index da20d4bf48f2..a1277a7c06c7 100644
--- a/port/cpl_float.h
+++ b/port/cpl_float.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL
  * Purpose:  Floating point conversion functions. Convert 16- and 24-bit
diff --git a/port/cpl_hash_set.h b/port/cpl_hash_set.h
index d5bcd16bb164..38409c9b8abe 100644
--- a/port/cpl_hash_set.h
+++ b/port/cpl_hash_set.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_hash_set.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_http.h b/port/cpl_http.h
index 0bc11b146a76..e80878091f32 100644
--- a/port/cpl_http.h
+++ b/port/cpl_http.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Common Portability Library
  * Purpose:  Function wrapper for libcurl HTTP access.
diff --git a/port/cpl_list.h b/port/cpl_list.h
index f8a2273b7856..d52cb8395834 100644
--- a/port/cpl_list.h
+++ b/port/cpl_list.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_list.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_mask.h b/port/cpl_mask.h
index 2858f8ea0202..14b3e56a0f56 100644
--- a/port/cpl_mask.h
+++ b/port/cpl_mask.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_mask.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_minixml.h b/port/cpl_minixml.h
index 9c93655aceba..7b818f7a5c06 100644
--- a/port/cpl_minixml.h
+++ b/port/cpl_minixml.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  Declarations for MiniXML Handler.
diff --git a/port/cpl_minizip_ioapi.h b/port/cpl_minizip_ioapi.h
index 10b62701fed4..e43e9e9c067b 100644
--- a/port/cpl_minizip_ioapi.h
+++ b/port/cpl_minizip_ioapi.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* Modified version by Even Rouault. :
       - change fill_fopen_filefunc to cpl_fill_fopen_filefunc
diff --git a/port/cpl_minizip_unzip.h b/port/cpl_minizip_unzip.h
index f4eafe8aafd5..789d931c16b6 100644
--- a/port/cpl_minizip_unzip.h
+++ b/port/cpl_minizip_unzip.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Modified version by Even Rouault. :
      - Addition of cpl_unzGetCurrentFileZStreamPos
      - Decoration of symbol names unz* -> cpl_unz*
diff --git a/port/cpl_minizip_zip.h b/port/cpl_minizip_zip.h
index 5f2854b360a2..af97dda0a432 100644
--- a/port/cpl_minizip_zip.h
+++ b/port/cpl_minizip_zip.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Author:   Frank Warmerdam, warmerdam@pobox.com
diff --git a/port/cpl_multiproc.h b/port/cpl_multiproc.h
index 323284271a05..fda66ef29ca0 100644
--- a/port/cpl_multiproc.h
+++ b/port/cpl_multiproc.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  CPL Multi-Threading, and process handling portability functions.
diff --git a/port/cpl_odbc.h b/port/cpl_odbc.h
index 66b22e1f8070..a7e0078a1e08 100644
--- a/port/cpl_odbc.h
+++ b/port/cpl_odbc.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OGR ODBC Driver
  * Purpose:  Declarations for ODBC Access Cover API.
diff --git a/port/cpl_port.h b/port/cpl_port.h
index b00476e9d7b6..960d40befec8 100644
--- a/port/cpl_port.h
+++ b/port/cpl_port.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Author:   Frank Warmerdam, warmerdam@pobox.com
diff --git a/port/cpl_progress.h b/port/cpl_progress.h
index e9f691898f25..8c71c79dea48 100644
--- a/port/cpl_progress.h
+++ b/port/cpl_progress.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Author:   Frank Warmerdam, warmerdam@pobox.com
diff --git a/port/cpl_quad_tree.h b/port/cpl_quad_tree.h
index 3976937e7043..3cff52db4378 100644
--- a/port/cpl_quad_tree.h
+++ b/port/cpl_quad_tree.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  Implementation of quadtree building and searching functions.
diff --git a/port/cpl_sha256.h b/port/cpl_sha256.h
index c489c525023b..7ddef17a956f 100644
--- a/port/cpl_sha256.h
+++ b/port/cpl_sha256.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* The MIT License
 
diff --git a/port/cpl_spawn.h b/port/cpl_spawn.h
index e637234f1842..c5d59cfc9a7b 100644
--- a/port/cpl_spawn.h
+++ b/port/cpl_spawn.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  Implement CPLSystem().
diff --git a/port/cpl_string.h b/port/cpl_string.h
index 095fcf821ef3..728329f0467a 100644
--- a/port/cpl_string.h
+++ b/port/cpl_string.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_string.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_time.h b/port/cpl_time.h
index b39a883f5478..d341139dc9c1 100644
--- a/port/cpl_time.h
+++ b/port/cpl_time.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_time.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_virtualmem.h b/port/cpl_virtualmem.h
index 6ba8c5d81f02..695fa3871b78 100644
--- a/port/cpl_virtualmem.h
+++ b/port/cpl_virtualmem.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Name:     cpl_virtualmem.h
  * Project:  CPL - Common Portability Library
diff --git a/port/cpl_vsi.h b/port/cpl_vsi.h
index 432e92018e17..c9f5d801f1e9 100644
--- a/port/cpl_vsi.h
+++ b/port/cpl_vsi.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Author:   Frank Warmerdam, warmerdam@pobox.com
diff --git a/port/cpl_vsi_error.h b/port/cpl_vsi_error.h
index c00d4510047e..0097f0f31329 100644
--- a/port/cpl_vsi_error.h
+++ b/port/cpl_vsi_error.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  VSI Virtual File System
  * Purpose:  Implement an error system for reporting file system errors.
diff --git a/port/cpl_vsi_virtual.h b/port/cpl_vsi_virtual.h
index ec8cf2d60554..ce3c3a2245d2 100644
--- a/port/cpl_vsi_virtual.h
+++ b/port/cpl_vsi_virtual.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  VSI Virtual File System
  * Purpose:  Declarations for classes related to the virtual filesystem.
diff --git a/port/cpl_vsil_curl_priv.h b/port/cpl_vsil_curl_priv.h
index 2c52b4c8b048..68018b903ec6 100644
--- a/port/cpl_vsil_curl_priv.h
+++ b/port/cpl_vsil_curl_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  Private API for VSICurl
diff --git a/port/cpl_worker_thread_pool.h b/port/cpl_worker_thread_pool.h
index 3f0be7acf742..fe446c11a8e2 100644
--- a/port/cpl_worker_thread_pool.h
+++ b/port/cpl_worker_thread_pool.h
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * Project:  CPL - Common Portability Library
  * Purpose:  CPL worker thread pool
diff --git a/port/cplkeywordparser.h b/port/cplkeywordparser.h
index 82ee553c6a37..66b213ad3ed8 100644
--- a/port/cplkeywordparser.h
+++ b/port/cplkeywordparser.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Common Portability Library
  * Purpose:  Implementation of CPLKeywordParser - a class for parsing
diff --git a/port/gdal_csv.h b/port/gdal_csv.h
index 32f302e38d59..391b5a284091 100644
--- a/port/gdal_csv.h
+++ b/port/gdal_csv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Common Portability Library
  * Purpose:  Functions for reading and scanning CSV (comma separated,
diff --git a/scripts/check_broken_links.py b/scripts/check_broken_links.py
index a658f6829520..d6c1cd3d81e3 100755
--- a/scripts/check_broken_links.py
+++ b/scripts/check_broken_links.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
-#
 #  Project:  GDAL
 #  Purpose:  Check validity of <a href="XXXX"> links
 #  Author:   Even Rouault <even.rouault at spatialys.com>
diff --git a/scripts/completionFinder.py b/scripts/completionFinder.py
index 825d1bce1a4a..cecf0f04f32e 100644
--- a/scripts/completionFinder.py
+++ b/scripts/completionFinder.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
-#
 # Project:  GDAL/OGR Utilities
 # Purpose:  Bash completion script generation
 # Author:   Guillaume Pasero <guillaume dot pasero at c dash s dot fr>
diff --git a/scripts/fix_container_dot_size_zero.py b/scripts/fix_container_dot_size_zero.py
index 3f1383e0f9bb..534751ea6223 100755
--- a/scripts/fix_container_dot_size_zero.py
+++ b/scripts/fix_container_dot_size_zero.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 ###############################################################################
-# $Id$
-#
 #  Project:  GDAL samples
 #  Purpose:  Replace container.size() by !container.empty(), and reverse
 #  Author:   Even Rouault <even.rouault at spatialys.com>
diff --git a/scripts/fix_typos.sh b/scripts/fix_typos.sh
index fae5cd99a1cb..81b9af4de384 100755
--- a/scripts/fix_typos.sh
+++ b/scripts/fix_typos.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
-#
 #  Project:  GDAL
 #  Purpose:  (Interactive) script to identify and fix typos
 #  Author:   Even Rouault <even.rouault at spatialys.com>
diff --git a/scripts/update_copyright.py b/scripts/update_copyright.py
index 63fda6bab7a7..daf4dfbe55a9 100644
--- a/scripts/update_copyright.py
+++ b/scripts/update_copyright.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
-#
 # Project:  GDAL/OGR
 # Purpose:  Update copyright info in headers
 # Author:   Even Rouault <even dot rouault at spatialys.com>
diff --git a/swig/csharp/apps/GDALAdjustContrast.cs b/swig/csharp/apps/GDALAdjustContrast.cs
index 29f6d59fb844..afd717461623 100644
--- a/swig/csharp/apps/GDALAdjustContrast.cs
+++ b/swig/csharp/apps/GDALAdjustContrast.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALAdjustContrast.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALColorTable.cs b/swig/csharp/apps/GDALColorTable.cs
index 6cc4adbca454..f50879a7f043 100644
--- a/swig/csharp/apps/GDALColorTable.cs
+++ b/swig/csharp/apps/GDALColorTable.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALColorTable.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALCreateCopy.cs b/swig/csharp/apps/GDALCreateCopy.cs
index da459286f942..c55ebca240e7 100644
--- a/swig/csharp/apps/GDALCreateCopy.cs
+++ b/swig/csharp/apps/GDALCreateCopy.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALWrite.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALInfo.cs b/swig/csharp/apps/GDALInfo.cs
index 1c91def78cc7..977455af4c0f 100644
--- a/swig/csharp/apps/GDALInfo.cs
+++ b/swig/csharp/apps/GDALInfo.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALInfo.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALMemDataset.cs b/swig/csharp/apps/GDALMemDataset.cs
index d27513e08f3e..20a56c418748 100644
--- a/swig/csharp/apps/GDALMemDataset.cs
+++ b/swig/csharp/apps/GDALMemDataset.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     VSIMem.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALOverviews.cs b/swig/csharp/apps/GDALOverviews.cs
index 7b358c030a10..976f31c0f5d2 100644
--- a/swig/csharp/apps/GDALOverviews.cs
+++ b/swig/csharp/apps/GDALOverviews.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALOverviews.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALRead.cs b/swig/csharp/apps/GDALRead.cs
index 1345726b47b2..9bfff59201aa 100644
--- a/swig/csharp/apps/GDALRead.cs
+++ b/swig/csharp/apps/GDALRead.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALRead.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALReadDirect.cs b/swig/csharp/apps/GDALReadDirect.cs
index 726a4fce729d..07a3851655c3 100644
--- a/swig/csharp/apps/GDALReadDirect.cs
+++ b/swig/csharp/apps/GDALReadDirect.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALReadDirect.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALWarp.cs b/swig/csharp/apps/GDALWarp.cs
index 9a5b47d24443..5335553fdcd4 100644
--- a/swig/csharp/apps/GDALWarp.cs
+++ b/swig/csharp/apps/GDALWarp.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALWarp.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GDALWrite.cs b/swig/csharp/apps/GDALWrite.cs
index c5f1a7a97cf9..a9dd43e908a3 100644
--- a/swig/csharp/apps/GDALWrite.cs
+++ b/swig/csharp/apps/GDALWrite.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALWrite.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/GetCRSInfo.cs b/swig/csharp/apps/GetCRSInfo.cs
index 1a66d0f39553..10f030d93d05 100644
--- a/swig/csharp/apps/GetCRSInfo.cs
+++ b/swig/csharp/apps/GetCRSInfo.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GetCRSInfo.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/OGRFeatureEdit.cs b/swig/csharp/apps/OGRFeatureEdit.cs
index 765dc0c6587d..33fd93301958 100644
--- a/swig/csharp/apps/OGRFeatureEdit.cs
+++ b/swig/csharp/apps/OGRFeatureEdit.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OGRFeatureEdit.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/OGRGEOS.cs b/swig/csharp/apps/OGRGEOS.cs
index 63107694c938..d6476d5f746e 100644
--- a/swig/csharp/apps/OGRGEOS.cs
+++ b/swig/csharp/apps/OGRGEOS.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OGRGEOS.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/OGRLayerAlg.cs b/swig/csharp/apps/OGRLayerAlg.cs
index 34c2c6036e8e..5a86ea46dcdb 100644
--- a/swig/csharp/apps/OGRLayerAlg.cs
+++ b/swig/csharp/apps/OGRLayerAlg.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OGRLayerAlg.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/OSRTransform.cs b/swig/csharp/apps/OSRTransform.cs
index 29a06225417b..ad45058f5526 100644
--- a/swig/csharp/apps/OSRTransform.cs
+++ b/swig/csharp/apps/OSRTransform.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OSRTransform.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/ReadXML.cs b/swig/csharp/apps/ReadXML.cs
index eb8720a8ad16..2510adaaa9d3 100644
--- a/swig/csharp/apps/ReadXML.cs
+++ b/swig/csharp/apps/ReadXML.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ReadXML.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/VSIMem.cs b/swig/csharp/apps/VSIMem.cs
index 2d316944732d..1ec207bf3edb 100644
--- a/swig/csharp/apps/VSIMem.cs
+++ b/swig/csharp/apps/VSIMem.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     VSIMem.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/WKT2WKB.cs b/swig/csharp/apps/WKT2WKB.cs
index f331b6f6eb88..2d2ed405b16c 100644
--- a/swig/csharp/apps/WKT2WKB.cs
+++ b/swig/csharp/apps/WKT2WKB.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     WKT2WKB.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/createdata.cs b/swig/csharp/apps/createdata.cs
index d24aaf32059f..89f53d1383be 100644
--- a/swig/csharp/apps/createdata.cs
+++ b/swig/csharp/apps/createdata.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     createdata.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/csharp/apps/ogrinfo.cs b/swig/csharp/apps/ogrinfo.cs
index 400649e8f279..7ea877fb5ee5 100644
--- a/swig/csharp/apps/ogrinfo.cs
+++ b/swig/csharp/apps/ogrinfo.cs
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ogrinfo.cs
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/Band.i b/swig/include/Band.i
index 6c45f714e078..66d809e166c3 100644
--- a/swig/include/Band.i
+++ b/swig/include/Band.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     Band.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/ColorTable.i b/swig/include/ColorTable.i
index 2ecf1b80d245..00a7468c190d 100644
--- a/swig/include/ColorTable.i
+++ b/swig/include/ColorTable.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ColorTable.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/Dataset.i b/swig/include/Dataset.i
index 098d6350e02c..e572f3f1323a 100644
--- a/swig/include/Dataset.i
+++ b/swig/include/Dataset.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     Dataset.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/Driver.i b/swig/include/Driver.i
index 28833a194683..43ad651f8258 100644
--- a/swig/include/Driver.i
+++ b/swig/include/Driver.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     Driver.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/MajorObject.i b/swig/include/MajorObject.i
index 1b44689adb46..9ce6d40635e4 100644
--- a/swig/include/MajorObject.i
+++ b/swig/include/MajorObject.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL SWIG Interfaces.
  * Purpose:  SWIG Definitions for GDALMajorObject.
diff --git a/swig/include/MultiDimensional.i b/swig/include/MultiDimensional.i
index 4cdf65ab0471..ebfafeda3c44 100644
--- a/swig/include/MultiDimensional.i
+++ b/swig/include/MultiDimensional.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     MultiDimensional.i
  * Purpose:  GDAL Core SWIG Interface declarations.
diff --git a/swig/include/Operations.i b/swig/include/Operations.i
index d036dc037be8..10a6203fedc5 100644
--- a/swig/include/Operations.i
+++ b/swig/include/Operations.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     Operations.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/RasterAttributeTable.i b/swig/include/RasterAttributeTable.i
index 7896e860a6a0..78c182e13e65 100644
--- a/swig/include/RasterAttributeTable.i
+++ b/swig/include/RasterAttributeTable.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     RAT.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/Relationship.i b/swig/include/Relationship.i
index 6b8ba07b991c..99441c555942 100644
--- a/swig/include/Relationship.i
+++ b/swig/include/Relationship.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     Relationship.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/SubdatasetInfo.i b/swig/include/SubdatasetInfo.i
index 2813c044825f..2dc5998bcc91 100644
--- a/swig/include/SubdatasetInfo.i
+++ b/swig/include/SubdatasetInfo.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     SubdatasetInfo.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/Transform.i b/swig/include/Transform.i
index a647e08de115..dd5c485c0a81 100644
--- a/swig/include/Transform.i
+++ b/swig/include/Transform.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL SWIG Interfaces.
  * Purpose:  GDAL transformer related declarations.
diff --git a/swig/include/XMLNode.i b/swig/include/XMLNode.i
index ea9b4e5cda6d..362c56097abc 100644
--- a/swig/include/XMLNode.i
+++ b/swig/include/XMLNode.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL SWIG Interface
  * Purpose:  GDAL XML SWIG Interface declarations.
diff --git a/swig/include/cpl.i b/swig/include/cpl.i
index 4b4c2a66fee9..fcf0f210892f 100644
--- a/swig/include/cpl.i
+++ b/swig/include/cpl.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     cpl.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/cpl_exceptions.i b/swig/include/cpl_exceptions.i
index ec68e3af09f6..7e8100fa8fe2 100644
--- a/swig/include/cpl_exceptions.i
+++ b/swig/include/cpl_exceptions.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Code for Optional Exception Handling through UseExceptions(),
  * DontUseExceptions()
diff --git a/swig/include/cplvirtualmem.i b/swig/include/cplvirtualmem.i
index 632a4ca93165..a2edc35b5f57 100644
--- a/swig/include/cplvirtualmem.i
+++ b/swig/include/cplvirtualmem.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     cplvirtualmem.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/csharp/gdal_csharp.i b/swig/include/csharp/gdal_csharp.i
index 83d2073b1c7e..d65237050b40 100644
--- a/swig/include/csharp/gdal_csharp.i
+++ b/swig/include/csharp/gdal_csharp.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdal_csharp.i
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/csharp/gdal_csharp_extend.i b/swig/include/csharp/gdal_csharp_extend.i
index 51053dfe3d57..3a615c158bd2 100644
--- a/swig/include/csharp/gdal_csharp_extend.i
+++ b/swig/include/csharp/gdal_csharp_extend.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdal_csharp_extend.i
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/csharp/gnm_csharp.i b/swig/include/csharp/gnm_csharp.i
index 5cc7e6d1abcb..f0221a8c30e8 100644
--- a/swig/include/csharp/gnm_csharp.i
+++ b/swig/include/csharp/gnm_csharp.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
 ******************************************************************************/
 
 %include cpl_exceptions.i
diff --git a/swig/include/csharp/ogr_csharp.i b/swig/include/csharp/ogr_csharp.i
index 98c72e4d5bff..ff7ce752e625 100644
--- a/swig/include/csharp/ogr_csharp.i
+++ b/swig/include/csharp/ogr_csharp.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ogr_csharp.i
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/csharp/ogr_csharp_extend.i b/swig/include/csharp/ogr_csharp_extend.i
index e8f15841762e..bd832143fe9b 100644
--- a/swig/include/csharp/ogr_csharp_extend.i
+++ b/swig/include/csharp/ogr_csharp_extend.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ogr_csharp_extend.i
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/csharp/osr_csharp.i b/swig/include/csharp/osr_csharp.i
index d02a8b2530e4..1abc53492b48 100644
--- a/swig/include/csharp/osr_csharp.i
+++ b/swig/include/csharp/osr_csharp.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     osr_csharp.i
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/csharp/swig_csharp_extensions.i b/swig/include/csharp/swig_csharp_extensions.i
index bca07e14c91e..ac7a81add510 100644
--- a/swig/include/csharp/swig_csharp_extensions.i
+++ b/swig/include/csharp/swig_csharp_extensions.i
@@ -1,6 +1,5 @@
 
 /******************************************************************************
- * $Id$
  *
  * Name:     swig_csharp_extensions.i
  * Purpose:  Fix for the SWIG Interface problems (early GC)
diff --git a/swig/include/csharp/typemaps_csharp.i b/swig/include/csharp/typemaps_csharp.i
index d8d61f09fef8..1cdc6d80a6b5 100644
--- a/swig/include/csharp/typemaps_csharp.i
+++ b/swig/include/csharp/typemaps_csharp.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     typemaps_csharp.i
  * Project:  GDAL CSharp Interface
diff --git a/swig/include/gdal.i b/swig/include/gdal.i
index 98d047eee5d4..b4953ec2299d 100644
--- a/swig/include/gdal.i
+++ b/swig/include/gdal.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdal.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
index bac638072efb..5cefdda97231 100644
--- a/swig/include/gdal_array.i
+++ b/swig/include/gdal_array.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdal_array.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/gdal_typemaps.i b/swig/include/gdal_typemaps.i
index 9b3f36c8db18..03fe815259e0 100644
--- a/swig/include/gdal_typemaps.i
+++ b/swig/include/gdal_typemaps.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     typemaps.i
  * Project:  GDAL Typemap library
diff --git a/swig/include/gdalconst.i b/swig/include/gdalconst.i
index f8ef99517ae9..2f8c3937d3dc 100644
--- a/swig/include/gdalconst.i
+++ b/swig/include/gdalconst.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdalconst.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/gnm.i b/swig/include/gnm.i
index ff031e726f71..3e1148d5d253 100644
--- a/swig/include/gnm.i
+++ b/swig/include/gnm.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GNM Core SWIG Interface declarations.
  * Purpose:  GNM declarations.
diff --git a/swig/include/java/gdal_java.i b/swig/include/java/gdal_java.i
index 65e1919370e5..4063e8d9c5ea 100644
--- a/swig/include/java/gdal_java.i
+++ b/swig/include/java/gdal_java.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdal_java.i
  * Project:  GDAL SWIG Interface
diff --git a/swig/include/java/gdalconst_java.i b/swig/include/java/gdalconst_java.i
index 42de8ec4946c..fc2fc8367cfe 100644
--- a/swig/include/java/gdalconst_java.i
+++ b/swig/include/java/gdalconst_java.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdalconst_java.i
  * Project:  GDAL SWIG Interface
diff --git a/swig/include/java/gnm_java.i b/swig/include/java/gnm_java.i
index c9be12c323f5..0216f104afb5 100644
--- a/swig/include/java/gnm_java.i
+++ b/swig/include/java/gnm_java.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GNM Core SWIG Interface declarations.
  * Purpose:  GNM declarations.
diff --git a/swig/include/java/ogr_java.i b/swig/include/java/ogr_java.i
index 231281ccf8c1..6fa59e06d1f9 100644
--- a/swig/include/java/ogr_java.i
+++ b/swig/include/java/ogr_java.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ogr_java.i
  * Project:  GDAL SWIG Interface
diff --git a/swig/include/java/ogr_java_extend.i b/swig/include/java/ogr_java_extend.i
index 9115a81e1d84..b90cca04f859 100644
--- a/swig/include/java/ogr_java_extend.i
+++ b/swig/include/java/ogr_java_extend.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ogr_java_extend.i
  * Project:  GDAL SWIG Interface
diff --git a/swig/include/java/osr_java.i b/swig/include/java/osr_java.i
index b038ce66e5df..b93d7d18a705 100644
--- a/swig/include/java/osr_java.i
+++ b/swig/include/java/osr_java.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     osr_java.i
  * Project:  GDAL SWIG Interface
diff --git a/swig/include/java/typemaps_java.i b/swig/include/java/typemaps_java.i
index c4d3c259d897..764a93e358f4 100644
--- a/swig/include/java/typemaps_java.i
+++ b/swig/include/java/typemaps_java.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     typemaps_java.i
  * Project:  GDAL SWIG Interface
diff --git a/swig/include/ogr.i b/swig/include/ogr.i
index 0290aca1fa81..f540a1cd77f6 100644
--- a/swig/include/ogr.i
+++ b/swig/include/ogr.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OGR Core SWIG Interface declarations.
  * Purpose:  OGR declarations.
diff --git a/swig/include/ogr_error_map.i b/swig/include/ogr_error_map.i
index 97ed768dc430..b42b2d624bea 100644
--- a/swig/include/ogr_error_map.i
+++ b/swig/include/ogr_error_map.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL SWIG Interfaces.
  * Purpose:  OGRErr handling typemap.
diff --git a/swig/include/osr.i b/swig/include/osr.i
index 4b26c8d4a48c..231353b0f485 100644
--- a/swig/include/osr.i
+++ b/swig/include/osr.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL SWIG Interfaces.
  * Purpose:  OGRSpatialReference related declarations.
diff --git a/swig/include/python/gdal_python.i b/swig/include/python/gdal_python.i
index d3fc11f86ff3..aaa309afc615 100644
--- a/swig/include/python/gdal_python.i
+++ b/swig/include/python/gdal_python.i
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * python specific code for gdal bindings.
  */
diff --git a/swig/include/python/gnm_python.i b/swig/include/python/gnm_python.i
index 93281718521a..5124c01aea93 100644
--- a/swig/include/python/gnm_python.i
+++ b/swig/include/python/gnm_python.i
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * python specific code for ogr bindings.
  */
diff --git a/swig/include/python/ogr_python.i b/swig/include/python/ogr_python.i
index 7c99653c8f4d..57f5d9129db9 100644
--- a/swig/include/python/ogr_python.i
+++ b/swig/include/python/ogr_python.i
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * python specific code for ogr bindings.
  */
diff --git a/swig/include/python/osr_python.i b/swig/include/python/osr_python.i
index a559cbfed129..e39c23516e7c 100644
--- a/swig/include/python/osr_python.i
+++ b/swig/include/python/osr_python.i
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * python specific code for ogr bindings.
  */
diff --git a/swig/include/python/python_strings.i b/swig/include/python/python_strings.i
index 38ac34b10b0a..a7b089bea7af 100644
--- a/swig/include/python/python_strings.i
+++ b/swig/include/python/python_strings.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     python_strings.i
  * Project:  GDAL Python Interface
diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i
index 1a20779192c1..e8a6cbbe9f0b 100644
--- a/swig/include/python/typemaps_python.i
+++ b/swig/include/python/typemaps_python.i
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     typemaps_python.i
  * Project:  GDAL Python Interface
diff --git a/swig/java/add_javadoc.c b/swig/java/add_javadoc.c
index 353c33b5d322..9d2ff489b48f 100644
--- a/swig/java/add_javadoc.c
+++ b/swig/java/add_javadoc.c
@@ -1,7 +1,5 @@
 
 /******************************************************************************
-* $Id$
-*
 * Project:  GDAL/OGR Java bindings
 * Purpose:  Add javadoc located in a special file into generated SWIG Java files
 * Author:   Even Rouault <even dot rouault at spatialys.com>
diff --git a/swig/java/apps/GDALOverviews.java b/swig/java/apps/GDALOverviews.java
index da57cb9cee02..25548e9b98d3 100644
--- a/swig/java/apps/GDALOverviews.java
+++ b/swig/java/apps/GDALOverviews.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALOverviews.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/GDALProximity.java b/swig/java/apps/GDALProximity.java
index f824aaddb5db..2dde13cc7b94 100644
--- a/swig/java/apps/GDALProximity.java
+++ b/swig/java/apps/GDALProximity.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project: GDAL
  * Purpose: Compute each pixel's proximity to a set of target pixels.
diff --git a/swig/java/apps/GDALTestIO.java b/swig/java/apps/GDALTestIO.java
index 20d32bfb5b0a..84c5562d2cf8 100644
--- a/swig/java/apps/GDALTestIO.java
+++ b/swig/java/apps/GDALTestIO.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALTestIO.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/GDALTestMultiDim.java b/swig/java/apps/GDALTestMultiDim.java
index f6bba5c97f86..a85ca97e2e21 100644
--- a/swig/java/apps/GDALTestMultiDim.java
+++ b/swig/java/apps/GDALTestMultiDim.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALTestMultiDim.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/GDALtest.java b/swig/java/apps/GDALtest.java
index 113e77e1aad3..dabf4637d1d3 100644
--- a/swig/java/apps/GDALtest.java
+++ b/swig/java/apps/GDALtest.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     GDALtest.java
  * Project:  GDAL SWIG Interface
diff --git a/swig/java/apps/OGRFeature.java b/swig/java/apps/OGRFeature.java
index 0d2d7f47abee..7ab5bf9badc9 100644
--- a/swig/java/apps/OGRFeature.java
+++ b/swig/java/apps/OGRFeature.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OGRFeature.java
  * Project:  OGR Java Interface
diff --git a/swig/java/apps/OGRTestGC.java b/swig/java/apps/OGRTestGC.java
index 10e971f5e040..f117d34f4dfe 100644
--- a/swig/java/apps/OGRTestGC.java
+++ b/swig/java/apps/OGRTestGC.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OGRTestGC.java
  * Project:  OGR Java Interface
diff --git a/swig/java/apps/OSRTransform.java b/swig/java/apps/OSRTransform.java
index f122e77c7eb0..bccba76e63c4 100644
--- a/swig/java/apps/OSRTransform.java
+++ b/swig/java/apps/OSRTransform.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     OSRTransform.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/ReadXML.java b/swig/java/apps/ReadXML.java
index 69bdeea6526d..8e5c71624322 100644
--- a/swig/java/apps/ReadXML.java
+++ b/swig/java/apps/ReadXML.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ReadXML.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/WKT2WKB.java b/swig/java/apps/WKT2WKB.java
index 27f0f19114e8..d818329d193c 100644
--- a/swig/java/apps/WKT2WKB.java
+++ b/swig/java/apps/WKT2WKB.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     WKT2WKB.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/gdalinfo.java b/swig/java/apps/gdalinfo.java
index 5e80ce676fd9..68f468ced479 100644
--- a/swig/java/apps/gdalinfo.java
+++ b/swig/java/apps/gdalinfo.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdalinfo.java
  * Project:  GDAL SWIG Interface
diff --git a/swig/java/apps/gdalmajorobject.java b/swig/java/apps/gdalmajorobject.java
index a7d6228dc231..1011c5d7388f 100644
--- a/swig/java/apps/gdalmajorobject.java
+++ b/swig/java/apps/gdalmajorobject.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdalmajorobject.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/gdaltransformer.java b/swig/java/apps/gdaltransformer.java
index 03a731b793d4..028a414339b5 100644
--- a/swig/java/apps/gdaltransformer.java
+++ b/swig/java/apps/gdaltransformer.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     gdaltransformer.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/multireadtest.java b/swig/java/apps/multireadtest.java
index cba4fd27558e..9cdea13868c9 100644
--- a/swig/java/apps/multireadtest.java
+++ b/swig/java/apps/multireadtest.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     multireadtest.java
  * Project:  GDAL Java Interface
diff --git a/swig/java/apps/ogr2ogr.java b/swig/java/apps/ogr2ogr.java
index be69d26190ca..40339cf897cb 100644
--- a/swig/java/apps/ogr2ogr.java
+++ b/swig/java/apps/ogr2ogr.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Java port of a simple client for translating between formats.
diff --git a/swig/java/apps/ogr2ogr_new.java b/swig/java/apps/ogr2ogr_new.java
index 7ffa9ff16ac1..576f8ffe936f 100644
--- a/swig/java/apps/ogr2ogr_new.java
+++ b/swig/java/apps/ogr2ogr_new.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Simple client for translating between formats.
diff --git a/swig/java/apps/ogrinfo.java b/swig/java/apps/ogrinfo.java
index 9b2e0633ebcc..2edf62bde641 100644
--- a/swig/java/apps/ogrinfo.java
+++ b/swig/java/apps/ogrinfo.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     ogrinfo.java
  * Project:  GDAL SWIG Interface
diff --git a/swig/java/apps/ogrtindex.java b/swig/java/apps/ogrtindex.java
index d872423f4d36..a70db8ce2936 100644
--- a/swig/java/apps/ogrtindex.java
+++ b/swig/java/apps/ogrtindex.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Program to generate a UMN MapServer compatible tile index for a
diff --git a/swig/java/apps/test_ogrfielddomains.java b/swig/java/apps/test_ogrfielddomains.java
index ffcb345ad4b6..fb6e0dfd10ca 100644
--- a/swig/java/apps/test_ogrfielddomains.java
+++ b/swig/java/apps/test_ogrfielddomains.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     test_ogrfielddomains.java
  * Project:  GDAL SWIG Interface
diff --git a/swig/java/apps/testgetpoints.java b/swig/java/apps/testgetpoints.java
index ec62ad7e8a28..1437883464e7 100644
--- a/swig/java/apps/testgetpoints.java
+++ b/swig/java/apps/testgetpoints.java
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Name:     testgetpoints.java
  * Project:  OGR Java Interface
diff --git a/swig/java/javadoc.java b/swig/java/javadoc.java
index 81e830bd051f..cddd24d91de2 100644
--- a/swig/java/javadoc.java
+++ b/swig/java/javadoc.java
@@ -1,5 +1,4 @@
 /* ***************************************************************************
-* $Id$
 *
 * Project:  GDAL/OGR Java bindings
 * Purpose:  Documentation for the Java bindings
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py
index 901cf50b6150..e2cf90a88e15 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py
@@ -1,6 +1,5 @@
 # !/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL utils.auxiliary
 #  Purpose:  OSR utility functions
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py
index c3d95ec88ae5..cad22babbbef 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL
 # Purpose:  Handles progress callback functions
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
index a8d6d2f40654..2d970a6de3fd 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 # Project:  Google Summer of Code 2007, 2008 (http://code.google.com/soc/)
 # Support:  BRGM (http://www.brgm.fr)
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py b/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py
index 3847ef2e9dbe..e9bc0a04324d 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL
 # Purpose:  Script to translate GDAL supported raster into XYZ ASCII
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_edit.py b/swig/python/gdal-utils/osgeo_utils/gdal_edit.py
index c35ba30344c6..2233abdca838 100755
--- a/swig/python/gdal-utils/osgeo_utils/gdal_edit.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_edit.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Edit in place various information of an existing GDAL dataset
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py b/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py
index ff829cb04172..6c20a3b3d087 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL Python Interface
 #  Purpose:  Application for filling nodata areas in a raster by interpolation
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_merge.py b/swig/python/gdal-utils/osgeo_utils/gdal_merge.py
index 7768c68409c8..764a621cb98a 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_merge.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_merge.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  InSAR Peppers
 # Purpose:  Module to extract data from many rasters into one output.
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py b/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py
index c3848a81ddd4..b1115a2bbd38 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL scripts
 #  Purpose:  Perform a pansharpening operation
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py b/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py
index cfee4a3e4912..ad6a42df2ce1 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL Python Interface
 #  Purpose:  Application for converting raster data to a vector polygon layer.
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py b/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py
index c7541633b5bd..8200e3e789a6 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     gdalproximity
 #  Project:  GDAL Python Interface
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_retile.py b/swig/python/gdal-utils/osgeo_utils/gdal_retile.py
index 6a514712ba9a..43cf6bbd9f78 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_retile.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_retile.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-#  $Id$
 #
 # Purpose:  Module for retiling (merging) tiles and building tiled pyramids
 # Author:   Christian Meuller, christian.mueller@nvoe.at
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py b/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py
index b5e024632b93..b76d7bce78b2 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL Python Interface
 #  Purpose:  Application for applying sieve filter to raster data.
diff --git a/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py
index a44267341340..55a8a9c4d917 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Simple command line program for copying the color table of a
diff --git a/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py b/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py
index fe9f900072a6..ab17a9c66112 100644
--- a/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py
+++ b/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL Python Interface
 #  Purpose:  Application for executing OGR layer algebra operations
diff --git a/swig/python/gdal-utils/osgeo_utils/ogrmerge.py b/swig/python/gdal-utils/osgeo_utils/ogrmerge.py
index d55942ebc0d6..52aca16a30da 100644
--- a/swig/python/gdal-utils/osgeo_utils/ogrmerge.py
+++ b/swig/python/gdal-utils/osgeo_utils/ogrmerge.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR samples
 # Purpose:  Merge the content of several vector datasets into a single one.
diff --git a/swig/python/gdal-utils/osgeo_utils/pct2rgb.py b/swig/python/gdal-utils/osgeo_utils/pct2rgb.py
index 39128fd913b8..4febbab37a9b 100644
--- a/swig/python/gdal-utils/osgeo_utils/pct2rgb.py
+++ b/swig/python/gdal-utils/osgeo_utils/pct2rgb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     pct2rgb
 #  Project:  GDAL Python Interface
diff --git a/swig/python/gdal-utils/osgeo_utils/rgb2pct.py b/swig/python/gdal-utils/osgeo_utils/rgb2pct.py
index 5eaf4dab037b..137b92c446d5 100644
--- a/swig/python/gdal-utils/osgeo_utils/rgb2pct.py
+++ b/swig/python/gdal-utils/osgeo_utils/rgb2pct.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     rgb2pct
 #  Project:  GDAL Python Interface
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py b/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py
index e1533cfc17b3..a57807bbcde9 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Assemble polygon geometries from arcs fulled from an arc layer.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py b/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py
index 9913bbb92ddc..e682286429b8 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Build a JPEG2000 file from the XML structure dumped by dump_jp2.py
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/densify.py b/swig/python/gdal-utils/osgeo_utils/samples/densify.py
index 58b2727494d7..e3895d777838 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/densify.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/densify.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Densifies linestrings by a tolerance.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py b/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py
index 743447ea1e90..7250213726d5 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Dump JPEG2000 file structure
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py b/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py
index 025832e3c44f..38ec4b6e64f9 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  CFS OGC MapServer
 #  Purpose:  Script to create WKT and PROJ.4 dictionaries for EPSG GCS/PCS
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/fft.py b/swig/python/gdal-utils/osgeo_utils/samples/fft.py
index 543eba855616..81db9fd6e84a 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/fft.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/fft.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL Python samples
 # Purpose:  Script to perform forward and inverse two-dimensional fast
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py b/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py
index 83209b51808f..875cdfa095e7 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR
 # Purpose:  Fix invalid GeoPackage files
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py
index 246da128de85..5ae3aee34794 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Outputs GDAL GCPs as OGR points
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py
index b4c594bd24e0..306fa7b62966 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Convert GCPs to a point layer.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py
index f7afcbd25983..977dd3453844 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     gcps2wld
 #  Project:  GDAL Python Interface
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py
index 83792d3e6e7f..ea69c115d32a 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL Python samples
 # Purpose:  Script to write out ASCII GRD rasters (used in Golden Software
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py
index 245a0b6c6290..844fc1515cd3 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Application for Google web service authentication.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py
index 864152562d3d..2d1b6ad68567 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Copy a virtual file
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py
index 3a0143dca805..b3a18b4297cf 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Create a PDF from a XML composition file
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py
index fbcc631ea186..8298e9930bba 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Display the list of files in a virtual directory, like /vsicurl or /vsizip
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py
index f1bab71d4511..7ef9958223ef 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Create a virtual directory
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py
index 51289f40669c..93b366fcc58f 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Remove TOWGS84[] clause from dataset SRS definitions
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py
index d79abfde1580..f984b5be1ade 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Delete a virtual file
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py
index 10d06ddc1193..061e7d33a17c 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 #  Project:  GDAL samples
 #  Purpose:  Delete a virtual directory
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py
index 8fd6b8511ee5..0f103dc151a1 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Application to checksum a GDAL image file.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py
index 6ad6eaa15394..b47e03df77b9 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     gdalcopyproj.py
 #  Project:  GDAL Python Interface
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py
index 3cea498d73f4..dc56f8358eb6 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Filter an input file, producing an output file.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py
index fa1c635072c9..78933b454424 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Application to identify files by format.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py
index 1fd388548d94..e43cb2f4599a 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     gdalimport
 #  Project:  GDAL Python Interface
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py
index 5d8484b5e1e4..0aa6acecbde5 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # *****************************************************************************
-# $Id$
 #
 # Project:  GDAL Utilities
 # Purpose:  Python port of Commandline application to list info about a file.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py
index 5260752b8a8c..6c11b7c9869b 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py
@@ -1,6 +1,5 @@
 # !/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL utils
 # Purpose:  Query information about a pixel given its location
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py b/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py
index b144a3722ae0..26266b913da7 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Extract SOUNDGings from an S-57 dataset, and write them to
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/histrep.py b/swig/python/gdal-utils/osgeo_utils/samples/histrep.py
index fc0084d29f93..9db77daccc09 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/histrep.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/histrep.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL Python Samples
 # Purpose:  Report histogram from file.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py b/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py
index aa34a453f696..deaae34fa3dd 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL Python Interface
 #  Purpose:  Script to merge greyscale as intensity into an RGB(A) image, for
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py b/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py
index f5113442c5eb..bd3aeb793187 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR samples
 # Purpose:  Extract a JPEG file from a JPEG-in-TIFF tile/strip
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py b/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py
index 3b5d77492736..9f5cc1e3f03e 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Load ODBC table to an ODBC datastore.  Uses direct SQL
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py b/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py
index e8f404819f78..8aac8c469a88 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Make fuzzer friendly archive (only works in DEBUG mode)
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py b/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py
index ac139c3a7aaf..1527d4269aea 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Produce a graticule (grid) dataset.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py
index 2a3c46a574c6..04fe3064d6e5 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Create OGR VRT from source datasource
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py
index f044b87aa7e8..58932df63fd4 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py
@@ -2,9 +2,7 @@
 #
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
-#  Name:     $Id$
 #  Project:
 #  Purpose:  Build a junction table from _href fields
 #  Author:   Even Rouault, <even dot rouault at spatialys.com>
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py
index 35a5627679f7..ee0550182cb9 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR samples
 # Purpose:  Dispatch features into layers according to the value of some fields
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py
index 44621b769feb..a330393cce76 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # *****************************************************************************
-# $Id$
 #
 # Project:  OpenGIS Simple Features Reference Implementation
 # Purpose:  Python port of a simple client for viewing OGR driver data.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py b/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py
index 90e88d1c51b2..5d615180527d 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR samples
 # Purpose:  Update an existing datasource with features from another one
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/rel.py b/swig/python/gdal-utils/osgeo_utils/samples/rel.py
index 3397e197f2b3..75d01aacb197 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/rel.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/rel.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL Python samples
 # Purpose:  Script to produce a shaded relief image from elevation data
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py b/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py
index f014ddc2a960..0f21815d8756 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Assemble TIGER Polygons.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py b/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py
index 84a085f45029..ce83b3cb18c5 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Generate the extent of each raster tile in a overview as a vector layer
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py b/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py
index 88304ae34b98..13de21540b18 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL Python samples
 # Purpose:  Script to read coordinate system and geotransformation matrix
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py b/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py
index 04e4033edab5..7f0ba78abca1 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL Python samples
 # Purpose:  Script to replace specified values from the input raster file
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
index 935ddddc30db..52e087e55128 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # *****************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Validate Cloud Optimized GeoTIFF file structure
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py
index 0e170ae379bc..f9d46eb9b016 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR
 # Purpose:  Test compliance of GeoParquet file
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py
index 0ebe5e7eacd0..a05771e72434 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR
 # Purpose:  Test compliance of GeoPackage database w.r.t GeoPackage spec
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py
index f561b80c01ce..819c4bfe64b4 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Project:  GDAL
 #  Purpose:  Validate JPEG2000 file structure
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py
index 006e2bbcfdb1..4c1a403cdb6e 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Apply a transformation to all OGR geometries.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py
index 79c4ecfbd199..548f3bde59f0 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###############################################################################
-# $Id$
 #
 # Project:  OGR Python samples
 # Purpose:  Apply a transformation to all OGR geometries.
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py b/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py
index 3308b3623585..395136c47772 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py
@@ -2,7 +2,6 @@
 #
 # -*- coding: utf-8 -*-
 # ******************************************************************************
-#  $Id$
 #
 #  Name:     wcs_virtds_params.py
 #  Project:  GDAL Python Interface

From d667af0c5c406d8aa396581f26eb39527e958cac Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 24 Nov 2024 19:04:15 +0100
Subject: [PATCH 15/21] gdal2tiles: change __version__ to be gdal.__version__

---
 swig/python/gdal-utils/osgeo_utils/gdal2tiles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
index 2d970a6de3fd..a24cb6df1282 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
@@ -52,7 +52,7 @@
     # 'antialias' resampling is not available
     numpy_available = False
 
-__version__ = "$Id$"
+__version__ = gdal.__version__
 
 resampling_list = (
     "average",

From 33fe7fe82da53074bdc90b398c48d63911e3344b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 24 Nov 2024 22:11:10 +0100
Subject: [PATCH 16/21] Coverity warnings fixes (for false positives or
 unlikely events)

---
 alg/internal_libqhull/poly_r.c          |  6 ++--
 autotest/ogr/ogr_geom.py                | 12 ++++----
 frmts/jpeg/jpgdataset.cpp               | 38 ++++++++++++-------------
 ogr/ogrlinestring.cpp                   | 10 ++++---
 ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp | 33 ++++++++++++---------
 port/cpl_md5.cpp                        |  5 ++--
 port/cpl_path.cpp                       |  1 +
 port/cpl_spawn.cpp                      |  4 +--
 port/cpl_worker_thread_pool.cpp         |  1 +
 9 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/alg/internal_libqhull/poly_r.c b/alg/internal_libqhull/poly_r.c
index b7e09b54fc8d..4a034131f201 100644
--- a/alg/internal_libqhull/poly_r.c
+++ b/alg/internal_libqhull/poly_r.c
@@ -1180,9 +1180,9 @@ int qh_pointid(qhT *qh, pointT *point) {
     /* coverity[divide_arg] */
     id= offset / qh->hull_dim;
   } else {
-    id = qh_setindex(qh->other_points, point);
-    if (id >= 0) {
-      id += qh->num_points;
+    const int idx = qh_setindex(qh->other_points, point);
+    if (idx >= 0) {
+      id = (ptr_intT)idx + qh->num_points;
     } else {
       return qh_IDunknown;
     }
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 67911355b88c..ba80bf8e8b6a 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -931,21 +931,21 @@ def test_ogr_geom_segmentize_issue_1341():
 
     geom = ogr.CreateGeometryFromWkt("LINESTRING(0 0,10 0)")
     geom.Segmentize(0.399999999999)
-    assert geom.ExportToWkt() == expected_geom
+    ogrtest.check_feature_geometry(geom, expected_geom)
     geom.Segmentize(0.399999999999)
-    assert geom.ExportToWkt() == expected_geom
+    ogrtest.check_feature_geometry(geom, expected_geom)
 
     geom = ogr.CreateGeometryFromWkt("LINESTRING(0 0,10 0)")
     geom.Segmentize(0.4)
-    assert geom.ExportToWkt() == expected_geom
+    ogrtest.check_feature_geometry(geom, expected_geom)
     geom.Segmentize(0.4)
-    assert geom.ExportToWkt() == expected_geom
+    ogrtest.check_feature_geometry(geom, expected_geom)
 
     geom = ogr.CreateGeometryFromWkt("LINESTRING(0 0,10 0)")
     geom.Segmentize(0.400000000001)
-    assert geom.ExportToWkt() == expected_geom
+    ogrtest.check_feature_geometry(geom, expected_geom)
     geom.Segmentize(0.400000000001)
-    assert geom.ExportToWkt() == expected_geom
+    ogrtest.check_feature_geometry(geom, expected_geom)
 
 
 ###############################################################################
diff --git a/frmts/jpeg/jpgdataset.cpp b/frmts/jpeg/jpgdataset.cpp
index a8425a65b39a..c49235ed0962 100644
--- a/frmts/jpeg/jpgdataset.cpp
+++ b/frmts/jpeg/jpgdataset.cpp
@@ -3331,29 +3331,27 @@ void JPGDatasetCommon::CheckForMask()
 
     GByte abyEOD[2] = {0, 0};
 
-    if (nImageSize < nFileSize / 2 || nImageSize > nFileSize - 4)
-        goto end;
-
-    // If that seems okay, seek back, and verify that just preceding
-    // the bitmask is an apparent end-of-jpeg-data marker.
-    VSIFSeekL(m_fpImage, nImageSize - 2, SEEK_SET);
-    VSIFReadL(abyEOD, 2, 1, m_fpImage);
-    if (abyEOD[0] != 0xff || abyEOD[1] != 0xd9)
-        goto end;
+    if (nImageSize >= 2 && nImageSize >= nFileSize / 2 &&
+        nImageSize <= nFileSize - 4)
+    {
+        // If that seems okay, seek back, and verify that just preceding
+        // the bitmask is an apparent end-of-jpeg-data marker.
+        VSIFSeekL(m_fpImage, nImageSize - 2, SEEK_SET);
+        VSIFReadL(abyEOD, 2, 1, m_fpImage);
+        if (abyEOD[0] == 0xff && abyEOD[1] == 0xd9)
+        {
+            // We seem to have a mask.  Read it in.
+            nCMaskSize = static_cast<int>(nFileSize - nImageSize - 4);
+            pabyCMask = static_cast<GByte *>(VSI_MALLOC_VERBOSE(nCMaskSize));
+            if (pabyCMask)
+            {
+                VSIFReadL(pabyCMask, nCMaskSize, 1, m_fpImage);
 
-    // We seem to have a mask.  Read it in.
-    nCMaskSize = static_cast<int>(nFileSize - nImageSize - 4);
-    pabyCMask = static_cast<GByte *>(VSI_MALLOC_VERBOSE(nCMaskSize));
-    if (pabyCMask == nullptr)
-    {
-        goto end;
+                CPLDebug("JPEG", "Got %d byte compressed bitmask.", nCMaskSize);
+            }
+        }
     }
-    VSIFReadL(pabyCMask, nCMaskSize, 1, m_fpImage);
-
-    CPLDebug("JPEG", "Got %d byte compressed bitmask.", nCMaskSize);
 
-    // TODO(schwehr): Refactor to not use goto.
-end:
     VSIFSeekL(m_fpImage, nCurOffset, SEEK_SET);
 }
 
diff --git a/ogr/ogrlinestring.cpp b/ogr/ogrlinestring.cpp
index 929b570901e0..1fb68d0c9894 100644
--- a/ogr/ogrlinestring.cpp
+++ b/ogr/ogrlinestring.cpp
@@ -2756,15 +2756,17 @@ bool OGRSimpleCurve::segmentize(double dfMaxLength)
                 sqrt(dfSquareDist / dfSquareMaxLength) - REL_EPSILON_ROUND);
             const int nIntermediatePoints =
                 DoubleToIntClamp(dfIntermediatePoints);
+            const double dfRatioX =
+                dfX / (static_cast<double>(nIntermediatePoints) + 1);
+            const double dfRatioY =
+                dfY / (static_cast<double>(nIntermediatePoints) + 1);
 
             for (int j = 1; j <= nIntermediatePoints; j++)
             {
                 // coverity[overflow_const]
                 const int newI = nNewPointCount + j - 1;
-                paoNewPoints[newI].x =
-                    paoPoints[i].x + j * dfX / (nIntermediatePoints + 1);
-                paoNewPoints[newI].y =
-                    paoPoints[i].y + j * dfY / (nIntermediatePoints + 1);
+                paoNewPoints[newI].x = paoPoints[i].x + j * dfRatioX;
+                paoNewPoints[newI].y = paoPoints[i].y + j * dfRatioY;
                 if (padfZ != nullptr)
                 {
                     // No interpolation.
diff --git a/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp
index 687637754783..5d8ee5e81c15 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp
@@ -442,24 +442,29 @@ int64_t VFKReaderSQLite::ReadDataRecords(IVFKDataBlock *poDataBlock)
         StoreInfo2DB();
 
         /* Insert VFK data records into DB */
-        nDataRecords += VFKReader::ReadDataRecords(poDataBlock);
-
-        /* update VFK_DB_TABLE table */
-        poDataBlockCurrent = nullptr;
-        for (int iDataBlock = 0; iDataBlock < GetDataBlockCount(); iDataBlock++)
+        const int64_t nExtraRecords = VFKReader::ReadDataRecords(poDataBlock);
+        if (nExtraRecords >= 0)
         {
-            poDataBlockCurrent = GetDataBlock(iDataBlock);
+            nDataRecords += nExtraRecords;
 
-            if (poDataBlock && poDataBlock != poDataBlockCurrent)
-                continue;
+            /* update VFK_DB_TABLE table */
+            poDataBlockCurrent = nullptr;
+            for (int iDataBlock = 0; iDataBlock < GetDataBlockCount();
+                 iDataBlock++)
+            {
+                poDataBlockCurrent = GetDataBlock(iDataBlock);
 
-            /* update number of records in metadata table */
-            osSQL.Printf("UPDATE %s SET num_records = %d WHERE "
-                         "table_name = '%s'",
-                         VFK_DB_TABLE, poDataBlockCurrent->GetRecordCount(),
-                         poDataBlockCurrent->GetName());
+                if (poDataBlock && poDataBlock != poDataBlockCurrent)
+                    continue;
 
-            ExecuteSQL(osSQL);
+                /* update number of records in metadata table */
+                osSQL.Printf("UPDATE %s SET num_records = %d WHERE "
+                             "table_name = '%s'",
+                             VFK_DB_TABLE, poDataBlockCurrent->GetRecordCount(),
+                             poDataBlockCurrent->GetName());
+
+                ExecuteSQL(osSQL);
+            }
         }
 
         /* create indices if not exist */
diff --git a/port/cpl_md5.cpp b/port/cpl_md5.cpp
index 4fc85cafb8cf..63b8e34856c3 100644
--- a/port/cpl_md5.cpp
+++ b/port/cpl_md5.cpp
@@ -85,8 +85,9 @@ void CPLMD5Update(struct CPLMD5Context *context, const void *buf, size_t len)
     // Update bitcount
     GUInt32 t = context->bits[0];
     // coverity[overflow_const]
-    if ((context->bits[0] =
-             (t + (static_cast<GUInt32>(len) << 3)) & 0xffffffff) < t)
+    const GUInt32 lenShifted = static_cast<GUInt32>(len) << 3U;
+    context->bits[0] = (t + lenShifted) & 0xffffffff;
+    if (context->bits[0] < t)
         context->bits[1]++; /* Carry from low to high */
     context->bits[1] += static_cast<GUInt32>(len >> 29);
 
diff --git a/port/cpl_path.cpp b/port/cpl_path.cpp
index 0ad0d286a24f..3d98a668adab 100644
--- a/port/cpl_path.cpp
+++ b/port/cpl_path.cpp
@@ -606,6 +606,7 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
     if (nLenPath >= static_cast<size_t>(CPL_PATH_BUF_SIZE))
         return CPLStaticBufferTooSmall(pszStaticResult);
 
+    // coverity[overrun-buffer-arg]
     memcpy(pszStaticResult, pszPath, nLenPath);
     pszStaticResult[nLenPath] = 0;
 
diff --git a/port/cpl_spawn.cpp b/port/cpl_spawn.cpp
index 31dc0341fd73..d3197a970bb4 100644
--- a/port/cpl_spawn.cpp
+++ b/port/cpl_spawn.cpp
@@ -458,7 +458,7 @@ int CPLPipeRead(CPL_FILE_HANDLE fin, void *data, int length)
     {
         while (true)
         {
-            const auto n = read(fin, pabyData, nRemain);
+            const ssize_t n = read(fin, pabyData, nRemain);
             if (n < 0)
             {
                 if (errno == EINTR)
@@ -499,7 +499,7 @@ int CPLPipeWrite(CPL_FILE_HANDLE fout, const void *data, int length)
     {
         while (true)
         {
-            const auto n = write(fout, pabyData, nRemain);
+            const ssize_t n = write(fout, pabyData, nRemain);
             if (n < 0)
             {
                 if (errno == EINTR)
diff --git a/port/cpl_worker_thread_pool.cpp b/port/cpl_worker_thread_pool.cpp
index 387ad7bbba43..da1c69c3f1b6 100644
--- a/port/cpl_worker_thread_pool.cpp
+++ b/port/cpl_worker_thread_pool.cpp
@@ -503,6 +503,7 @@ CPLWorkerThreadPool::GetNextJob(CPLWorkerThread *psWorkerThread)
         std::unique_lock<std::mutex> oGuardThisThread(psWorkerThread->m_mutex);
         // coverity[uninit_use_in_call]
         oGuard.unlock();
+        // coverity[wait_not_in_locked_loop]
         psWorkerThread->m_cv.wait(oGuardThisThread);
     }
 }

From ca16dce69acd6819d7418560d4ee931533077ff1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 24 Nov 2024 23:36:04 +0100
Subject: [PATCH 17/21] Regenerate ods_formula_parser with Bison 3.8.1 to
 hopefully avoid Coverity warnings

---
 .pre-commit-config.yaml                    |    1 +
 ogr/ogrsf_frmts/ods/ods_formula.cpp        |    2 -
 ogr/ogrsf_frmts/ods/ods_formula_parser.cpp | 2466 +++++++++-----------
 ogr/ogrsf_frmts/ods/ods_formula_parser.hpp |   71 +-
 4 files changed, 1189 insertions(+), 1351 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index aeba53308bb2..460236f83428 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -67,6 +67,7 @@ repos:
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|
                 ogr/ogrsf_frmts/pmtiles/pmtiles/|
                 ogr/ogrsf_frmts/ods/ods_formula_parser.cpp|
+                ogr/ogrsf_frmts/ods/ods_formula_parser.hpp|
                 ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load|
                 ogr/swq_parser.cpp|
                 ogr/swq_parser.hpp|
diff --git a/ogr/ogrsf_frmts/ods/ods_formula.cpp b/ogr/ogrsf_frmts/ods/ods_formula.cpp
index e49ff419c212..0e029a2986ee 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula.cpp
+++ b/ogr/ogrsf_frmts/ods/ods_formula.cpp
@@ -27,8 +27,6 @@ int ods_formulalex(ods_formula_node **ppNode,
 #include "ods_formula_parser.cpp"
 } /* end of anonymous namespace */
 
-#define YYSTYPE ods_formula_node *
-
 static const SingleOpStruct apsSingleOp[] = {
     {"ABS", ODS_ABS, fabs},   {"SQRT", ODS_SQRT, sqrt},
     {"COS", ODS_COS, cos},    {"SIN", ODS_SIN, sin},
diff --git a/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp b/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
index b6847476874a..aa9382fba5c5 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
+++ b/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.1.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -34,6 +34,10 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
+
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
@@ -41,14 +45,11 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
+/* Identify Bison output, and Bison version.  */
+#define YYBISON 30802
 
-/* Bison version.  */
-#define YYBISON_VERSION "3.5.1"
+/* Bison version string.  */
+#define YYBISON_VERSION "3.8.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -62,12 +63,13 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+
 /* Substitute the variable and function names.  */
-#define yyparse ods_formulaparse
-#define yylex ods_formulalex
-#define yyerror ods_formulaerror
-#define yydebug ods_formuladebug
-#define yynerrs ods_formulanerrs
+#define yyparse         ods_formulaparse
+#define yylex           ods_formulalex
+#define yyerror         ods_formulaerror
+#define yydebug         ods_formuladebug
+#define yynerrs         ods_formulanerrs
 
 /* First part of user prologue.  */
 
@@ -89,101 +91,100 @@
 #include "cpl_string.h"
 #include "ods_formula.h"
 
-#define YYSTYPE ods_formula_node *
 
-/* Defining YYSTYPE_IS_TRIVIAL is needed because the parser is generated as a
- * C++ file. */
-/* See http://www.gnu.org/s/bison/manual/html_node/Memory-Management.html that
- * suggests */
+#define YYSTYPE  ods_formula_node*
+
+/* Defining YYSTYPE_IS_TRIVIAL is needed because the parser is generated as a C++ file. */
+/* See http://www.gnu.org/s/bison/manual/html_node/Memory-Management.html that suggests */
 /* increase YYINITDEPTH instead, but this will consume memory. */
-/* Setting YYSTYPE_IS_TRIVIAL overcomes this limitation, but might be fragile
- * because */
+/* Setting YYSTYPE_IS_TRIVIAL overcomes this limitation, but might be fragile because */
 /* it appears to be a non documented feature of Bison */
 #define YYSTYPE_IS_TRIVIAL 1
 
-static void ods_formulaerror(ods_formula_parse_context * /* context */,
-                             const char *msg)
+static void ods_formulaerror( ods_formula_parse_context * /* context */,
+                              const char *msg )
 {
-    CPLError(CE_Failure, CPLE_AppDefined, "Formula Parsing Error: %s", msg);
+    CPLError( CE_Failure, CPLE_AppDefined,
+              "Formula Parsing Error: %s", msg );
 }
 
-#ifndef YY_CAST
-#ifdef __cplusplus
-#define YY_CAST(Type, Val) static_cast<Type>(Val)
-#define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type>(Val)
-#else
-#define YY_CAST(Type, Val) ((Type)(Val))
-#define YY_REINTERPRET_CAST(Type, Val) ((Type)(Val))
-#endif
-#endif
-#ifndef YY_NULLPTR
-#if defined __cplusplus
-#if 201103L <= __cplusplus
-#define YY_NULLPTR nullptr
-#else
-#define YY_NULLPTR 0
-#endif
-#else
-#define YY_NULLPTR ((void *)0)
-#endif
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-#undef YYERROR_VERBOSE
-#define YYERROR_VERBOSE 1
-#else
-#define YYERROR_VERBOSE 0
-#endif
-
-/* Use api.header.include to #include this header
-   instead of duplicating it here.  */
-#ifndef YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
-#define YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int ods_formuladebug;
-#endif
 
-/* Token type.  */
-#ifndef YYTOKENTYPE
-#define YYTOKENTYPE
 
-enum yytokentype
+# ifndef YY_CAST
+#  ifdef __cplusplus
+#   define YY_CAST(Type, Val) static_cast<Type> (Val)
+#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
+#  else
+#   define YY_CAST(Type, Val) ((Type) (Val))
+#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
+#  endif
+# endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
+#  else
+#   define YY_NULLPTR ((void*)0)
+#  endif
+# endif
+
+#include "ods_formula_parser.hpp"
+/* Symbol kind.  */
+enum yysymbol_kind_t
 {
-    ODST_NUMBER = 258,
-    ODST_STRING = 259,
-    ODST_IDENTIFIER = 260,
-    ODST_FUNCTION_NO_ARG = 261,
-    ODST_FUNCTION_SINGLE_ARG = 262,
-    ODST_FUNCTION_TWO_ARG = 263,
-    ODST_FUNCTION_THREE_ARG = 264,
-    ODST_FUNCTION_ARG_LIST = 265,
-    ODST_START = 266,
-    ODST_NOT = 267,
-    ODST_OR = 268,
-    ODST_AND = 269,
-    ODST_IF = 270,
-    ODST_UMINUS = 271
+  YYSYMBOL_YYEMPTY = -2,
+  YYSYMBOL_YYEOF = 0,                      /* "end of file"  */
+  YYSYMBOL_YYerror = 1,                    /* error  */
+  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
+  YYSYMBOL_ODST_NUMBER = 3,                /* ODST_NUMBER  */
+  YYSYMBOL_ODST_STRING = 4,                /* ODST_STRING  */
+  YYSYMBOL_ODST_IDENTIFIER = 5,            /* ODST_IDENTIFIER  */
+  YYSYMBOL_ODST_FUNCTION_NO_ARG = 6,       /* ODST_FUNCTION_NO_ARG  */
+  YYSYMBOL_ODST_FUNCTION_SINGLE_ARG = 7,   /* ODST_FUNCTION_SINGLE_ARG  */
+  YYSYMBOL_ODST_FUNCTION_TWO_ARG = 8,      /* ODST_FUNCTION_TWO_ARG  */
+  YYSYMBOL_ODST_FUNCTION_THREE_ARG = 9,    /* ODST_FUNCTION_THREE_ARG  */
+  YYSYMBOL_ODST_FUNCTION_ARG_LIST = 10,    /* ODST_FUNCTION_ARG_LIST  */
+  YYSYMBOL_ODST_START = 11,                /* ODST_START  */
+  YYSYMBOL_ODST_NOT = 12,                  /* ODST_NOT  */
+  YYSYMBOL_ODST_OR = 13,                   /* ODST_OR  */
+  YYSYMBOL_ODST_AND = 14,                  /* ODST_AND  */
+  YYSYMBOL_ODST_IF = 15,                   /* ODST_IF  */
+  YYSYMBOL_16_ = 16,                       /* '+'  */
+  YYSYMBOL_17_ = 17,                       /* '-'  */
+  YYSYMBOL_18_ = 18,                       /* '&'  */
+  YYSYMBOL_19_ = 19,                       /* '*'  */
+  YYSYMBOL_20_ = 20,                       /* '/'  */
+  YYSYMBOL_21_ = 21,                       /* '%'  */
+  YYSYMBOL_ODST_UMINUS = 22,               /* ODST_UMINUS  */
+  YYSYMBOL_23_ = 23,                       /* ','  */
+  YYSYMBOL_24_ = 24,                       /* ';'  */
+  YYSYMBOL_25_ = 25,                       /* '('  */
+  YYSYMBOL_26_ = 26,                       /* ')'  */
+  YYSYMBOL_27_ = 27,                       /* '='  */
+  YYSYMBOL_28_ = 28,                       /* '<'  */
+  YYSYMBOL_29_ = 29,                       /* '>'  */
+  YYSYMBOL_30_ = 30,                       /* '!'  */
+  YYSYMBOL_31_ = 31,                       /* '['  */
+  YYSYMBOL_32_ = 32,                       /* ']'  */
+  YYSYMBOL_33_ = 33,                       /* ':'  */
+  YYSYMBOL_YYACCEPT = 34,                  /* $accept  */
+  YYSYMBOL_input = 35,                     /* input  */
+  YYSYMBOL_comma = 36,                     /* comma  */
+  YYSYMBOL_value_expr = 37,                /* value_expr  */
+  YYSYMBOL_value_expr_list = 38,           /* value_expr_list  */
+  YYSYMBOL_value_expr_and_cell_range_list = 39, /* value_expr_and_cell_range_list  */
+  YYSYMBOL_cell_range = 40                 /* cell_range  */
 };
-#endif
+typedef enum yysymbol_kind_t yysymbol_kind_t;
 
-/* Value type.  */
-#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-#define YYSTYPE_IS_TRIVIAL 1
-#define YYSTYPE_IS_DECLARED 1
-#endif
 
-int ods_formulaparse(ods_formula_parse_context *context);
 
-#endif /* !YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED  */
 
 #ifdef short
-#undef short
+# undef short
 #endif
 
 /* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
@@ -191,11 +192,11 @@ int ods_formulaparse(ods_formula_parse_context *context);
    so that the code can choose integer types of a good width.  */
 
 #ifndef __PTRDIFF_MAX__
-#include <limits.h> /* INFRINGES ON USER NAME SPACE */
-#if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
-#include <stdint.h> /* INFRINGES ON USER NAME SPACE */
-#define YY_STDINT_H
-#endif
+# include <limits.h> /* INFRINGES ON USER NAME SPACE */
+# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
+#  define YY_STDINT_H
+# endif
 #endif
 
 /* Narrow types that promote to a signed type and that can represent a
@@ -219,10 +220,22 @@ typedef int_least16_t yytype_int16;
 typedef short yytype_int16;
 #endif
 
+/* Work around bug in HP-UX 11.23, which defines these macros
+   incorrectly for preprocessor constants.  This workaround can likely
+   be removed in 2023, as HPE has promised support for HP-UX 11.23
+   (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of
+   <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>.  */
+#ifdef __hpux
+# undef UINT_LEAST8_MAX
+# undef UINT_LEAST16_MAX
+# define UINT_LEAST8_MAX 255
+# define UINT_LEAST16_MAX 65535
+#endif
+
 #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
 typedef __UINT_LEAST8_TYPE__ yytype_uint8;
-#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H &&                  \
-       UINT_LEAST8_MAX <= INT_MAX)
+#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST8_MAX <= INT_MAX)
 typedef uint_least8_t yytype_uint8;
 #elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
 typedef unsigned char yytype_uint8;
@@ -232,8 +245,8 @@ typedef short yytype_uint8;
 
 #if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
 typedef __UINT_LEAST16_TYPE__ yytype_uint16;
-#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H &&                 \
-       UINT_LEAST16_MAX <= INT_MAX)
+#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST16_MAX <= INT_MAX)
 typedef uint_least16_t yytype_uint16;
 #elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
 typedef unsigned short yytype_uint16;
@@ -242,40 +255,42 @@ typedef int yytype_uint16;
 #endif
 
 #ifndef YYPTRDIFF_T
-#if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
-#define YYPTRDIFF_T __PTRDIFF_TYPE__
-#define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
-#elif defined PTRDIFF_MAX
-#ifndef ptrdiff_t
-#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#endif
-#define YYPTRDIFF_T ptrdiff_t
-#define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
-#else
-#define YYPTRDIFF_T long
-#define YYPTRDIFF_MAXIMUM LONG_MAX
-#endif
+# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
+#  define YYPTRDIFF_T __PTRDIFF_TYPE__
+#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
+# elif defined PTRDIFF_MAX
+#  ifndef ptrdiff_t
+#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  endif
+#  define YYPTRDIFF_T ptrdiff_t
+#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
+# else
+#  define YYPTRDIFF_T long
+#  define YYPTRDIFF_MAXIMUM LONG_MAX
+# endif
 #endif
 
 #ifndef YYSIZE_T
-#ifdef __SIZE_TYPE__
-#define YYSIZE_T __SIZE_TYPE__
-#elif defined size_t
-#define YYSIZE_T size_t
-#elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
-#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#define YYSIZE_T size_t
-#else
-#define YYSIZE_T unsigned
-#endif
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned
+# endif
 #endif
 
-#define YYSIZE_MAXIMUM                                                         \
-    YY_CAST(YYPTRDIFF_T, (YYPTRDIFF_MAXIMUM < YY_CAST(YYSIZE_T, -1)            \
-                              ? YYPTRDIFF_MAXIMUM                              \
-                              : YY_CAST(YYSIZE_T, -1)))
+#define YYSIZE_MAXIMUM                                  \
+  YY_CAST (YYPTRDIFF_T,                                 \
+           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
+            ? YYPTRDIFF_MAXIMUM                         \
+            : YY_CAST (YYSIZE_T, -1)))
+
+#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
 
-#define YYSIZEOF(X) YY_CAST(YYPTRDIFF_T, sizeof(X))
 
 /* Stored state numbers (used for stacks). */
 typedef yytype_int8 yy_state_t;
@@ -284,503 +299,579 @@ typedef yytype_int8 yy_state_t;
 typedef int yy_state_fast_t;
 
 #ifndef YY_
-#if defined YYENABLE_NLS && YYENABLE_NLS
-#if ENABLE_NLS
-#include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#define YY_(Msgid) dgettext("bison-runtime", Msgid)
-#endif
-#endif
-#ifndef YY_
-#define YY_(Msgid) Msgid
-#endif
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
 #endif
 
+
 #ifndef YY_ATTRIBUTE_PURE
-#if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
-#define YY_ATTRIBUTE_PURE __attribute__((__pure__))
-#else
-#define YY_ATTRIBUTE_PURE
-#endif
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define YY_ATTRIBUTE_PURE
+# endif
 #endif
 
 #ifndef YY_ATTRIBUTE_UNUSED
-#if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
-#define YY_ATTRIBUTE_UNUSED __attribute__((__unused__))
-#else
-#define YY_ATTRIBUTE_UNUSED
-#endif
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define YY_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
-#if !defined lint || defined __GNUC__
-#define YYUSE(E) ((void)(E))
+#if ! defined lint || defined __GNUC__
+# define YY_USE(E) ((void) (E))
 #else
-#define YYUSE(E) /* empty */
+# define YY_USE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && !defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                                    \
-    _Pragma("GCC diagnostic push")                                             \
-        _Pragma("GCC diagnostic ignored \"-Wuninitialized\"")                  \
-            _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-#define YY_IGNORE_MAYBE_UNINITIALIZED_END _Pragma("GCC diagnostic pop")
+#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
+# else
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# endif
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
+    _Pragma ("GCC diagnostic pop")
 #else
-#define YY_INITIAL_VALUE(Value) Value
+# define YY_INITIAL_VALUE(Value) Value
 #endif
 #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-#define YY_IGNORE_MAYBE_UNINITIALIZED_END
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
 #ifndef YY_INITIAL_VALUE
-#define YY_INITIAL_VALUE(Value) /* Nothing. */
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-#if defined __cplusplus && defined __GNUC__ && !defined __ICC && 6 <= __GNUC__
-#define YY_IGNORE_USELESS_CAST_BEGIN                                           \
-    _Pragma("GCC diagnostic push")                                             \
-        _Pragma("GCC diagnostic ignored \"-Wuseless-cast\"")
-#define YY_IGNORE_USELESS_CAST_END _Pragma("GCC diagnostic pop")
+#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
+# define YY_IGNORE_USELESS_CAST_BEGIN                          \
+    _Pragma ("GCC diagnostic push")                            \
+    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
+# define YY_IGNORE_USELESS_CAST_END            \
+    _Pragma ("GCC diagnostic pop")
 #endif
 #ifndef YY_IGNORE_USELESS_CAST_BEGIN
-#define YY_IGNORE_USELESS_CAST_BEGIN
-#define YY_IGNORE_USELESS_CAST_END
+# define YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_END
 #endif
 
-#define YY_ASSERT(E) ((void)(0 && (E)))
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#define YY_ASSERT(E) ((void) (0 && (E)))
 
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-#ifdef YYSTACK_USE_ALLOCA
-#if YYSTACK_USE_ALLOCA
-#ifdef __GNUC__
-#define YYSTACK_ALLOC __builtin_alloca
-#elif defined __BUILTIN_VA_ARG_INCR
-#include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#elif defined _AIX
-#define YYSTACK_ALLOC __alloca
-#elif defined _MSC_VER
-#include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#define alloca _alloca
-#else
-#define YYSTACK_ALLOC alloca
-#if !defined _ALLOCA_H && !defined EXIT_SUCCESS
-#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-/* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#endif
-#endif
-#endif
-#endif
+#if !defined yyoverflow
 
-#ifdef YYSTACK_ALLOC
-/* Pacify GCC's 'empty if-body' warning.  */
-#define YYSTACK_FREE(Ptr)                                                      \
-    do                                                                         \
-    { /* empty */                                                              \
-        ;                                                                      \
-    } while (0)
-#ifndef YYSTACK_ALLOC_MAXIMUM
-/* The OS might guarantee only one guard page at the bottom of the stack,
-   and a page size can be as small as 4096 bytes.  So we cannot safely
-   invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-   to allow for a few compiler-allocated temporary stack slots.  */
-#define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#endif
-#else
-#define YYSTACK_ALLOC YYMALLOC
-#define YYSTACK_FREE YYFREE
-#ifndef YYSTACK_ALLOC_MAXIMUM
-#define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#endif
-#if (defined __cplusplus && !defined EXIT_SUCCESS &&                           \
-     !((defined YYMALLOC || defined malloc) &&                                 \
-       (defined YYFREE || defined free)))
-#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#endif
-#ifndef YYMALLOC
-#define YYMALLOC malloc
-#if !defined malloc && !defined EXIT_SUCCESS
-void *malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#endif
-#endif
-#ifndef YYFREE
-#define YYFREE free
-#if !defined free && !defined EXIT_SUCCESS
-void free(void *);      /* INFRINGES ON USER NAME SPACE */
-#endif
-#endif
-#endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-#if (!defined yyoverflow &&                                                    \
-     (!defined __cplusplus ||                                                  \
-      (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* !defined yyoverflow */
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-    yy_state_t yyss_alloc;
-    YYSTYPE yyvs_alloc;
+  yy_state_t yyss_alloc;
+  YYSTYPE yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-#define YYSTACK_GAP_MAXIMUM (YYSIZEOF(union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
-#define YYSTACK_BYTES(N)                                                       \
-    ((N) * (YYSIZEOF(yy_state_t) + YYSIZEOF(YYSTYPE)) + YYSTACK_GAP_MAXIMUM)
+# define YYSTACK_BYTES(N) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
 
-#define YYCOPY_NEEDED 1
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-#define YYSTACK_RELOCATE(Stack_alloc, Stack)                                   \
-    do                                                                         \
-    {                                                                          \
-        YYPTRDIFF_T yynewbytes;                                                \
-        YYCOPY(&yyptr->Stack_alloc, Stack, yysize);                            \
-        Stack = &yyptr->Stack_alloc;                                           \
-        yynewbytes = yystacksize * YYSIZEOF(*Stack) + YYSTACK_GAP_MAXIMUM;     \
-        yyptr += yynewbytes / YYSIZEOF(*yyptr);                                \
-    } while (0)
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYPTRDIFF_T yynewbytes;                                         \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
+      }                                                                 \
+    while (0)
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
 /* Copy COUNT objects from SRC to DST.  The source and destination do
    not overlap.  */
-#ifndef YYCOPY
-#if defined __GNUC__ && 1 < __GNUC__
-#define YYCOPY(Dst, Src, Count)                                                \
-    __builtin_memcpy(Dst, Src, YY_CAST(YYSIZE_T, (Count)) * sizeof(*(Src)))
-#else
-#define YYCOPY(Dst, Src, Count)                                                \
-    do                                                                         \
-    {                                                                          \
-        YYPTRDIFF_T yyi;                                                       \
-        for (yyi = 0; yyi < (Count); yyi++)                                    \
-            (Dst)[yyi] = (Src)[yyi];                                           \
-    } while (0)
-#endif
-#endif
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYPTRDIFF_T yyi;                      \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL 18
+#define YYFINAL  18
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST 333
+#define YYLAST   333
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS 34
+#define YYNTOKENS  34
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS 7
+#define YYNNTS  7
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES 41
+#define YYNRULES  41
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES 108
+#define YYNSTATES  108
+
+/* YYMAXUTOK -- Last valid token kind.  */
+#define YYMAXUTOK   271
 
-#define YYUNDEFTOK 2
-#define YYMAXUTOK 271
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
-#define YYTRANSLATE(YYX)                                                       \
-    (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX)                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK                     \
+   ? YY_CAST (yysymbol_kind_t, yytranslate[YYX])        \
+   : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
-static const yytype_int8 yytranslate[] = {
-    0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 30, 2, 2, 2, 21, 18, 2,
-    25, 26, 19, 16, 23, 17, 2,  20, 2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  33, 24,
-    28, 27, 29, 2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  31, 2, 32, 2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 2, 2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 2,  2, 2, 1, 2,  3,  4,
-    5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 22};
+static const yytype_int8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    30,     2,     2,     2,    21,    18,     2,
+      25,    26,    19,    16,    23,    17,     2,    20,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    33,    24,
+      28,    27,    29,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    31,     2,    32,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    22
+};
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_int16 yyrline[] = {
-    0,   73,  73,  78,  78,  82,  87,  92,  97,  103, 110, 118, 125, 132,
-    138, 145, 153, 160, 165, 172, 179, 186, 193, 200, 207, 214, 221, 228,
-    246, 253, 260, 267, 274, 281, 288, 295, 301, 308, 314, 319, 325, 332};
+static const yytype_int16 yyrline[] =
+{
+       0,    73,    73,    78,    78,    82,    87,    92,    97,   103,
+     110,   118,   125,   132,   138,   145,   153,   160,   165,   172,
+     179,   186,   193,   200,   207,   214,   221,   228,   246,   253,
+     260,   267,   274,   281,   288,   295,   301,   308,   314,   319,
+     325,   332
+};
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+/** Accessing symbol of state STATE.  */
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State])
+
+#if YYDEBUG || 0
+/* The user-facing name of the symbol whose (internal) number is
+   YYSYMBOL.  No bounds checking.  */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED;
+
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] = {"$end",
-                                      "error",
-                                      "$undefined",
-                                      "ODST_NUMBER",
-                                      "ODST_STRING",
-                                      "ODST_IDENTIFIER",
-                                      "ODST_FUNCTION_NO_ARG",
-                                      "ODST_FUNCTION_SINGLE_ARG",
-                                      "ODST_FUNCTION_TWO_ARG",
-                                      "ODST_FUNCTION_THREE_ARG",
-                                      "ODST_FUNCTION_ARG_LIST",
-                                      "ODST_START",
-                                      "ODST_NOT",
-                                      "ODST_OR",
-                                      "ODST_AND",
-                                      "ODST_IF",
-                                      "'+'",
-                                      "'-'",
-                                      "'&'",
-                                      "'*'",
-                                      "'/'",
-                                      "'%'",
-                                      "ODST_UMINUS",
-                                      "','",
-                                      "';'",
-                                      "'('",
-                                      "')'",
-                                      "'='",
-                                      "'<'",
-                                      "'>'",
-                                      "'!'",
-                                      "'['",
-                                      "']'",
-                                      "':'",
-                                      "$accept",
-                                      "input",
-                                      "comma",
-                                      "value_expr",
-                                      "value_expr_list",
-                                      "value_expr_and_cell_range_list",
-                                      "cell_range",
-                                      YY_NULLPTR};
-#endif
+static const char *const yytname[] =
+{
+  "\"end of file\"", "error", "\"invalid token\"", "ODST_NUMBER",
+  "ODST_STRING", "ODST_IDENTIFIER", "ODST_FUNCTION_NO_ARG",
+  "ODST_FUNCTION_SINGLE_ARG", "ODST_FUNCTION_TWO_ARG",
+  "ODST_FUNCTION_THREE_ARG", "ODST_FUNCTION_ARG_LIST", "ODST_START",
+  "ODST_NOT", "ODST_OR", "ODST_AND", "ODST_IF", "'+'", "'-'", "'&'", "'*'",
+  "'/'", "'%'", "ODST_UMINUS", "','", "';'", "'('", "')'", "'='", "'<'",
+  "'>'", "'!'", "'['", "']'", "':'", "$accept", "input", "comma",
+  "value_expr", "value_expr_list", "value_expr_and_cell_range_list",
+  "cell_range", YY_NULLPTR
+};
 
-#ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_int16 yytoknum[] = {
-    0,   256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
-    267, 268, 269, 270, 43,  45,  38,  42,  47,  37,  271, 44,
-    59,  40,  41,  61,  60,  62,  33,  91,  93,  58};
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
+{
+  return yytname[yysymbol];
+}
 #endif
 
 #define YYPACT_NINF (-75)
 
-#define yypact_value_is_default(Yyn) ((Yyn) == YYPACT_NINF)
+#define yypact_value_is_default(Yyn) \
+  ((Yyn) == YYPACT_NINF)
 
 #define YYTABLE_NINF (-1)
 
-#define yytable_value_is_error(Yyn) 0
+#define yytable_value_is_error(Yyn) \
+  0
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-static const yytype_int16 yypact[] = {
-    -4,  162, 12,  -75, -75, -3,  4,   14,  21,  32,  33,  34,  35,  38,
-    162, 162, 44,  303, -75, 40,  162, 162, 162, 182, 162, 162, 162, 162,
-    -12, 213, 36,  162, 162, 162, 162, 162, 162, 78,  107, 136, 43,  -75,
-    228, 24,  24,  66,  24,  46,  -14, 243, 24,  49,  50,  24,  -75, -75,
-    181, 181, 181, -12, -12, -12, 162, 162, 303, 162, 162, 303, 162, 303,
-    162, -75, -75, -75, 162, 162, -5,  182, -75, 182, -75, 162, -75, -75,
-    162, 303, 303, 303, 303, 303, 303, 258, 24,  72,  -75, -75, -75, 198,
-    -75, 162, 47,  -75, 162, 273, -75, 288, -75, -75};
+static const yytype_int16 yypact[] =
+{
+      -4,   162,    12,   -75,   -75,    -3,     4,    14,    21,    32,
+      33,    34,    35,    38,   162,   162,    44,   303,   -75,    40,
+     162,   162,   162,   182,   162,   162,   162,   162,   -12,   213,
+      36,   162,   162,   162,   162,   162,   162,    78,   107,   136,
+      43,   -75,   228,    24,    24,    66,    24,    46,   -14,   243,
+      24,    49,    50,    24,   -75,   -75,   181,   181,   181,   -12,
+     -12,   -12,   162,   162,   303,   162,   162,   303,   162,   303,
+     162,   -75,   -75,   -75,   162,   162,    -5,   182,   -75,   182,
+     -75,   162,   -75,   -75,   162,   303,   303,   303,   303,   303,
+     303,   258,    24,    72,   -75,   -75,   -75,   198,   -75,   162,
+      47,   -75,   162,   273,   -75,   288,   -75,   -75
+};
 
 /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
    Performed when YYTABLE does not specify something else to do.  Zero
    means the default is an error.  */
-static const yytype_int8 yydefact[] = {
-    0,  0,  0,  5,  6,  0,  0,  0,  0,  0, 0,  0,  0,  0,  0,  0,  0,  2,
-    1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 27, 0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  7,  0,  0,  0,  0, 38, 0,  40, 0,  36, 0,  0,  0,
-    17, 34, 28, 29, 30, 31, 32, 33, 0,  0, 18, 0,  0,  21, 0,  22, 0,  8,
-    3,  4,  0,  0,  0,  0,  16, 0,  13, 0, 12, 11, 0,  24, 25, 23, 19, 26,
-    20, 0,  0,  0,  37, 39, 35, 0,  9,  0, 0,  14, 0,  0,  41, 0,  10, 15};
+static const yytype_int8 yydefact[] =
+{
+       0,     0,     0,     5,     6,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     2,     1,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    27,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     7,     0,     0,     0,     0,    38,     0,    40,     0,
+      36,     0,     0,     0,    17,    34,    28,    29,    30,    31,
+      32,    33,     0,     0,    18,     0,     0,    21,     0,    22,
+       0,     8,     3,     4,     0,     0,     0,     0,    16,     0,
+      13,     0,    12,    11,     0,    24,    25,    23,    19,    26,
+      20,     0,     0,     0,    37,    39,    35,     0,     9,     0,
+       0,    14,     0,     0,    41,     0,    10,    15
+};
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] = {-75, -75, -42, -1, -25, -74, -75};
+static const yytype_int8 yypgoto[] =
+{
+     -75,   -75,   -42,    -1,   -25,   -74,   -75
+};
 
 /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] = {-1, 2, 74, 46, 51, 47, 48};
+static const yytype_int8 yydefgoto[] =
+{
+       0,     2,    74,    46,    51,    47,    48
+};
 
 /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule whose
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_int8 yytable[] = {
-    17, 52,  75, 94, 77, 95,  79, 1,   81,  72, 73, 84,  18, 28, 29, 37, 38, 39,
-    40, 42,  43, 44, 19, 49,  50, 50,  53,  55, 93, 20,  56, 57, 58, 59, 60, 61,
-    64, 67,  69, 21, 31, 32,  33, 34,  35,  36, 22, 72,  73, 30, 99, 37, 38, 39,
-    40, 102, 96, 23, 24, 25,  26, 85,  86,  27, 87, 88,  41, 89, 55, 90, 70, 76,
-    78, 91,  92, 82, 83, 100, 0,  104, 50,  3,  4,  97,  5,  6,  7,  8,  9,  0,
-    10, 11,  12, 13, 0,  14,  0,  0,   103, 0,  0,  105, 0,  15, 0,  0,  62, 63,
-    0,  16,  3,  4,  0,  5,   6,  7,   8,   9,  0,  10,  11, 12, 13, 0,  14, 0,
-    0,  0,   0,  0,  0,  0,   15, 0,   65,  0,  66, 0,   16, 3,  4,  0,  5,  6,
-    7,  8,   9,  0,  10, 11,  12, 13,  0,   14, 0,  0,   0,  0,  0,  0,  0,  15,
-    0,  68,  0,  3,  4,  16,  5,  6,   7,   8,  9,  0,   10, 11, 12, 13, 0,  14,
-    0,  0,   0,  0,  0,  3,   4,  15,  5,   6,  7,  8,   9,  16, 10, 11, 12, 13,
-    0,  14,  34, 35, 36, 0,   0,  0,   0,   15, 37, 38,  39, 40, 0,  45, 31, 32,
-    33, 34,  35, 36, 0,  72,  73, 0,   101, 37, 38, 39,  40, 31, 32, 33, 34, 35,
-    36, 0,   0,  0,  0,  54,  37, 38,  39,  40, 31, 32,  33, 34, 35, 36, 0,  0,
-    0,  0,   71, 37, 38, 39,  40, 31,  32,  33, 34, 35,  36, 0,  0,  0,  0,  80,
-    37, 38,  39, 40, 31, 32,  33, 34,  35,  36, 0,  0,   0,  0,  98, 37, 38, 39,
-    40, 31,  32, 33, 34, 35,  36, 0,   0,   0,  0,  106, 37, 38, 39, 40, 31, 32,
-    33, 34,  35, 36, 0,  0,   0,  0,   107, 37, 38, 39,  40, 31, 32, 33, 34, 35,
-    36, 0,   0,  0,  0,  0,   37, 38,  39,  40};
-
-static const yytype_int8 yycheck[] = {
-    1,  26, 44, 77, 46, 79, 48,  11, 50, 23, 24, 53, 0,  14, 15, 27, 28, 29, 30,
-    20, 21, 22, 25, 24, 25, 26,  27, 32, 33, 25, 31, 32, 33, 34, 35, 36, 37, 38,
-    39, 25, 16, 17, 18, 19, 20,  21, 25, 23, 24, 5,  92, 27, 28, 29, 30, 97, 81,
-    25, 25, 25, 25, 62, 63, 25,  65, 66, 26, 68, 32, 70, 27, 5,  26, 74, 75, 26,
-    26, 5,  -1, 32, 81, 3,  4,   84, 6,  7,  8,  9,  10, -1, 12, 13, 14, 15, -1,
-    17, -1, -1, 99, -1, -1, 102, -1, 25, -1, -1, 28, 29, -1, 31, 3,  4,  -1, 6,
-    7,  8,  9,  10, -1, 12, 13,  14, 15, -1, 17, -1, -1, -1, -1, -1, -1, -1, 25,
-    -1, 27, -1, 29, -1, 31, 3,   4,  -1, 6,  7,  8,  9,  10, -1, 12, 13, 14, 15,
-    -1, 17, -1, -1, -1, -1, -1,  -1, -1, 25, -1, 27, -1, 3,  4,  31, 6,  7,  8,
-    9,  10, -1, 12, 13, 14, 15,  -1, 17, -1, -1, -1, -1, -1, 3,  4,  25, 6,  7,
-    8,  9,  10, 31, 12, 13, 14,  15, -1, 17, 19, 20, 21, -1, -1, -1, -1, 25, 27,
-    28, 29, 30, -1, 31, 16, 17,  18, 19, 20, 21, -1, 23, 24, -1, 26, 27, 28, 29,
-    30, 16, 17, 18, 19, 20, 21,  -1, -1, -1, -1, 26, 27, 28, 29, 30, 16, 17, 18,
-    19, 20, 21, -1, -1, -1, -1,  26, 27, 28, 29, 30, 16, 17, 18, 19, 20, 21, -1,
-    -1, -1, -1, 26, 27, 28, 29,  30, 16, 17, 18, 19, 20, 21, -1, -1, -1, -1, 26,
-    27, 28, 29, 30, 16, 17, 18,  19, 20, 21, -1, -1, -1, -1, 26, 27, 28, 29, 30,
-    16, 17, 18, 19, 20, 21, -1,  -1, -1, -1, 26, 27, 28, 29, 30, 16, 17, 18, 19,
-    20, 21, -1, -1, -1, -1, -1,  27, 28, 29, 30};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_int8 yystos[] = {
-    0,  11, 35, 3,  4,  6,  7,  8,  9,  10, 12, 13, 14, 15, 17, 25, 31, 37,
-    0,  25, 25, 25, 25, 25, 25, 25, 25, 25, 37, 37, 5,  16, 17, 18, 19, 20,
-    21, 27, 28, 29, 30, 26, 37, 37, 37, 31, 37, 39, 40, 37, 37, 38, 38, 37,
-    26, 32, 37, 37, 37, 37, 37, 37, 28, 29, 37, 27, 29, 37, 27, 37, 27, 26,
-    23, 24, 36, 36, 5,  36, 26, 36, 26, 36, 26, 26, 36, 37, 37, 37, 37, 37,
-    37, 37, 37, 33, 39, 39, 38, 37, 26, 36, 5,  26, 36, 37, 32, 37, 26, 26};
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_int8 yyr1[] = {0,  34, 35, 36, 36, 37, 37, 37, 37, 37, 37,
-                                   37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-                                   37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-                                   37, 37, 38, 38, 39, 39, 39, 39, 40};
-
-/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_int8 yyr2[] = {0, 2, 2, 1, 1, 1, 1, 3, 4, 6, 8, 4, 4, 4,
-                                   6, 8, 4, 3, 3, 4, 4, 3, 3, 4, 4, 4, 4, 2,
-                                   3, 3, 3, 3, 3, 3, 3, 3, 1, 3, 1, 3, 1, 5};
-
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                                                 \
-    do                                                                         \
-        if (yychar == YYEMPTY)                                                 \
-        {                                                                      \
-            yychar = (Token);                                                  \
-            yylval = (Value);                                                  \
-            YYPOPSTACK(yylen);                                                 \
-            yystate = *yyssp;                                                  \
-            goto yybackup;                                                     \
-        }                                                                      \
-        else                                                                   \
-        {                                                                      \
-            yyerror(context, YY_("syntax error: cannot back up"));             \
-            YYERROR;                                                           \
-        }                                                                      \
-    while (0)
+static const yytype_int8 yytable[] =
+{
+      17,    52,    75,    94,    77,    95,    79,     1,    81,    72,
+      73,    84,    18,    28,    29,    37,    38,    39,    40,    42,
+      43,    44,    19,    49,    50,    50,    53,    55,    93,    20,
+      56,    57,    58,    59,    60,    61,    64,    67,    69,    21,
+      31,    32,    33,    34,    35,    36,    22,    72,    73,    30,
+      99,    37,    38,    39,    40,   102,    96,    23,    24,    25,
+      26,    85,    86,    27,    87,    88,    41,    89,    55,    90,
+      70,    76,    78,    91,    92,    82,    83,   100,     0,   104,
+      50,     3,     4,    97,     5,     6,     7,     8,     9,     0,
+      10,    11,    12,    13,     0,    14,     0,     0,   103,     0,
+       0,   105,     0,    15,     0,     0,    62,    63,     0,    16,
+       3,     4,     0,     5,     6,     7,     8,     9,     0,    10,
+      11,    12,    13,     0,    14,     0,     0,     0,     0,     0,
+       0,     0,    15,     0,    65,     0,    66,     0,    16,     3,
+       4,     0,     5,     6,     7,     8,     9,     0,    10,    11,
+      12,    13,     0,    14,     0,     0,     0,     0,     0,     0,
+       0,    15,     0,    68,     0,     3,     4,    16,     5,     6,
+       7,     8,     9,     0,    10,    11,    12,    13,     0,    14,
+       0,     0,     0,     0,     0,     3,     4,    15,     5,     6,
+       7,     8,     9,    16,    10,    11,    12,    13,     0,    14,
+      34,    35,    36,     0,     0,     0,     0,    15,    37,    38,
+      39,    40,     0,    45,    31,    32,    33,    34,    35,    36,
+       0,    72,    73,     0,   101,    37,    38,    39,    40,    31,
+      32,    33,    34,    35,    36,     0,     0,     0,     0,    54,
+      37,    38,    39,    40,    31,    32,    33,    34,    35,    36,
+       0,     0,     0,     0,    71,    37,    38,    39,    40,    31,
+      32,    33,    34,    35,    36,     0,     0,     0,     0,    80,
+      37,    38,    39,    40,    31,    32,    33,    34,    35,    36,
+       0,     0,     0,     0,    98,    37,    38,    39,    40,    31,
+      32,    33,    34,    35,    36,     0,     0,     0,     0,   106,
+      37,    38,    39,    40,    31,    32,    33,    34,    35,    36,
+       0,     0,     0,     0,   107,    37,    38,    39,    40,    31,
+      32,    33,    34,    35,    36,     0,     0,     0,     0,     0,
+      37,    38,    39,    40
+};
+
+static const yytype_int8 yycheck[] =
+{
+       1,    26,    44,    77,    46,    79,    48,    11,    50,    23,
+      24,    53,     0,    14,    15,    27,    28,    29,    30,    20,
+      21,    22,    25,    24,    25,    26,    27,    32,    33,    25,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    25,
+      16,    17,    18,    19,    20,    21,    25,    23,    24,     5,
+      92,    27,    28,    29,    30,    97,    81,    25,    25,    25,
+      25,    62,    63,    25,    65,    66,    26,    68,    32,    70,
+      27,     5,    26,    74,    75,    26,    26,     5,    -1,    32,
+      81,     3,     4,    84,     6,     7,     8,     9,    10,    -1,
+      12,    13,    14,    15,    -1,    17,    -1,    -1,    99,    -1,
+      -1,   102,    -1,    25,    -1,    -1,    28,    29,    -1,    31,
+       3,     4,    -1,     6,     7,     8,     9,    10,    -1,    12,
+      13,    14,    15,    -1,    17,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    25,    -1,    27,    -1,    29,    -1,    31,     3,
+       4,    -1,     6,     7,     8,     9,    10,    -1,    12,    13,
+      14,    15,    -1,    17,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    25,    -1,    27,    -1,     3,     4,    31,     6,     7,
+       8,     9,    10,    -1,    12,    13,    14,    15,    -1,    17,
+      -1,    -1,    -1,    -1,    -1,     3,     4,    25,     6,     7,
+       8,     9,    10,    31,    12,    13,    14,    15,    -1,    17,
+      19,    20,    21,    -1,    -1,    -1,    -1,    25,    27,    28,
+      29,    30,    -1,    31,    16,    17,    18,    19,    20,    21,
+      -1,    23,    24,    -1,    26,    27,    28,    29,    30,    16,
+      17,    18,    19,    20,    21,    -1,    -1,    -1,    -1,    26,
+      27,    28,    29,    30,    16,    17,    18,    19,    20,    21,
+      -1,    -1,    -1,    -1,    26,    27,    28,    29,    30,    16,
+      17,    18,    19,    20,    21,    -1,    -1,    -1,    -1,    26,
+      27,    28,    29,    30,    16,    17,    18,    19,    20,    21,
+      -1,    -1,    -1,    -1,    26,    27,    28,    29,    30,    16,
+      17,    18,    19,    20,    21,    -1,    -1,    -1,    -1,    26,
+      27,    28,    29,    30,    16,    17,    18,    19,    20,    21,
+      -1,    -1,    -1,    -1,    26,    27,    28,    29,    30,    16,
+      17,    18,    19,    20,    21,    -1,    -1,    -1,    -1,    -1,
+      27,    28,    29,    30
+};
+
+/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
+   state STATE-NUM.  */
+static const yytype_int8 yystos[] =
+{
+       0,    11,    35,     3,     4,     6,     7,     8,     9,    10,
+      12,    13,    14,    15,    17,    25,    31,    37,     0,    25,
+      25,    25,    25,    25,    25,    25,    25,    25,    37,    37,
+       5,    16,    17,    18,    19,    20,    21,    27,    28,    29,
+      30,    26,    37,    37,    37,    31,    37,    39,    40,    37,
+      37,    38,    38,    37,    26,    32,    37,    37,    37,    37,
+      37,    37,    28,    29,    37,    27,    29,    37,    27,    37,
+      27,    26,    23,    24,    36,    36,     5,    36,    26,    36,
+      26,    36,    26,    26,    36,    37,    37,    37,    37,    37,
+      37,    37,    37,    33,    39,    39,    38,    37,    26,    36,
+       5,    26,    36,    37,    32,    37,    26,    26
+};
+
+/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+static const yytype_int8 yyr1[] =
+{
+       0,    34,    35,    36,    36,    37,    37,    37,    37,    37,
+      37,    37,    37,    37,    37,    37,    37,    37,    37,    37,
+      37,    37,    37,    37,    37,    37,    37,    37,    37,    37,
+      37,    37,    37,    37,    37,    38,    38,    39,    39,    39,
+      39,    40
+};
+
+/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+static const yytype_int8 yyr2[] =
+{
+       0,     2,     2,     1,     1,     1,     1,     3,     4,     6,
+       8,     4,     4,     4,     6,     8,     4,     3,     3,     4,
+       4,     3,     3,     4,     4,     4,     4,     2,     3,     3,
+       3,     3,     3,     3,     3,     3,     1,     3,     1,     3,
+       1,     5
+};
+
+
+enum { YYENOMEM = -2 };
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+#define YYNOMEM         goto yyexhaustedlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (context, YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
+
+/* Backward compatibility with an undocumented macro.
+   Use YYerror or YYUNDEF. */
+#define YYERRCODE YYUNDEF
 
-/* Error token number */
-#define YYTERROR 1
-#define YYERRCODE 256
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
-#ifndef YYFPRINTF
-#include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#define YYFPRINTF fprintf
-#endif
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
 
-#define YYDPRINTF(Args)                                                        \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-            YYFPRINTF Args;                                                    \
-    } while (0)
 
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-#define YY_LOCATION_PRINT(File, Loc) ((void)0)
-#endif
 
-#define YY_SYMBOL_PRINT(Title, Type, Value, Location)                          \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-        {                                                                      \
-            YYFPRINTF(stderr, "%s ", Title);                                   \
-            yy_symbol_print(stderr, Type, Value, context);                     \
-            YYFPRINTF(stderr, "\n");                                           \
-        }                                                                      \
-    } while (0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Kind, Value, context); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
 
 /*-----------------------------------.
 | Print this symbol's value on YYO.  |
 `-----------------------------------*/
 
-static void yy_symbol_value_print(FILE *yyo, int yytype,
-                                  YYSTYPE const *const yyvaluep,
-                                  ods_formula_parse_context *context)
+static void
+yy_symbol_value_print (FILE *yyo,
+                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, ods_formula_parse_context *context)
 {
-    FILE *yyoutput = yyo;
-    YYUSE(yyoutput);
-    YYUSE(context);
-    if (!yyvaluep)
-        return;
-#ifdef YYPRINT
-    if (yytype < YYNTOKENS)
-        YYPRINT(yyo, yytoknum[yytype], *yyvaluep);
-#endif
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    YYUSE(yytype);
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  FILE *yyoutput = yyo;
+  YY_USE (yyoutput);
+  YY_USE (context);
+  if (!yyvaluep)
+    return;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YY_USE (yykind);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
+
 /*---------------------------.
 | Print this symbol on YYO.  |
 `---------------------------*/
 
-static void yy_symbol_print(FILE *yyo, int yytype,
-                            YYSTYPE const *const yyvaluep,
-                            ods_formula_parse_context *context)
+static void
+yy_symbol_print (FILE *yyo,
+                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, ods_formula_parse_context *context)
 {
-    YYFPRINTF(yyo, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm",
-              yytname[yytype]);
+  YYFPRINTF (yyo, "%s %s (",
+             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
-    yy_symbol_value_print(yyo, yytype, yyvaluep, context);
-    YYFPRINTF(yyo, ")");
+  yy_symbol_value_print (yyo, yykind, yyvaluep, context);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -788,66 +879,69 @@ static void yy_symbol_print(FILE *yyo, int yytype,
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-static void yy_stack_print(yy_state_t *yybottom, yy_state_t *yytop)
+static void
+yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
 {
-    YYFPRINTF(stderr, "Stack now");
-    for (; yybottom <= yytop; yybottom++)
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
     {
-        int yybot = *yybottom;
-        YYFPRINTF(stderr, " %d", yybot);
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
     }
-    YYFPRINTF(stderr, "\n");
+  YYFPRINTF (stderr, "\n");
 }
 
-#define YY_STACK_PRINT(Bottom, Top)                                            \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-            yy_stack_print((Bottom), (Top));                                   \
-    } while (0)
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-static void yy_reduce_print(yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule,
-                            ods_formula_parse_context *context)
+static void
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+                 int yyrule, ods_formula_parse_context *context)
 {
-    int yylno = yyrline[yyrule];
-    int yynrhs = yyr2[yyrule];
-    int yyi;
-    YYFPRINTF(stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1,
-              yylno);
-    /* The symbols being reduced.  */
-    for (yyi = 0; yyi < yynrhs; yyi++)
+  int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
     {
-        YYFPRINTF(stderr, "   $%d = ", yyi + 1);
-        yy_symbol_print(stderr, yystos[+yyssp[yyi + 1 - yynrhs]],
-                        &yyvsp[(yyi + 1) - (yynrhs)], context);
-        YYFPRINTF(stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
+                       &yyvsp[(yyi + 1) - (yynrhs)], context);
+      YYFPRINTF (stderr, "\n");
     }
 }
 
-#define YY_REDUCE_PRINT(Rule)                                                  \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-            yy_reduce_print(yyssp, yyvsp, Rule, context);                      \
-    } while (0)
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, context); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-#define YYDPRINTF(Args)
-#define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-#define YY_STACK_PRINT(Bottom, Top)
-#define YY_REDUCE_PRINT(Rule)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
+
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
 /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
@@ -858,763 +952,524 @@ int yydebug;
    evaluated with infinite-precision integer arithmetic.  */
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
 
-#if YYERROR_VERBOSE
 
-#ifndef yystrlen
-#if defined __GLIBC__ && defined _STRING_H
-#define yystrlen(S) (YY_CAST(YYPTRDIFF_T, strlen(S)))
-#else
-/* Return the length of YYSTR.  */
-static YYPTRDIFF_T yystrlen(const char *yystr)
-{
-    YYPTRDIFF_T yylen;
-    for (yylen = 0; yystr[yylen]; yylen++)
-        continue;
-    return yylen;
-}
-#endif
-#endif
 
-#ifndef yystpcpy
-#if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#define yystpcpy stpcpy
-#else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *yystpcpy(char *yydest, const char *yysrc)
-{
-    char *yyd = yydest;
-    const char *yys = yysrc;
 
-    while ((*yyd++ = *yys++) != '\0')
-        continue;
 
-    return yyd - 1;
-}
-#endif
-#endif
-
-#ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYPTRDIFF_T yytnamerr(char *yyres, const char *yystr)
-{
-    if (*yystr == '"')
-    {
-        YYPTRDIFF_T yyn = 0;
-        char const *yyp = yystr;
-
-        for (;;)
-            switch (*++yyp)
-            {
-                case '\'':
-                case ',':
-                    goto do_not_strip_quotes;
-
-                case '\\':
-                    if (*++yyp != '\\')
-                        goto do_not_strip_quotes;
-                    else
-                        goto append;
-
-                append:
-                default:
-                    if (yyres)
-                        yyres[yyn] = *yyp;
-                    yyn++;
-                    break;
-
-                case '"':
-                    if (yyres)
-                        yyres[yyn] = '\0';
-                    return yyn;
-            }
-    do_not_strip_quotes:;
-    }
-
-    if (yyres)
-        return yystpcpy(yyres, yystr) - yyres;
-    else
-        return yystrlen(yystr);
-}
-#endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int yysyntax_error(YYPTRDIFF_T *yymsg_alloc, char **yymsg,
-                          yy_state_t *yyssp, int yytoken)
-{
-    enum
-    {
-        YYERROR_VERBOSE_ARGS_MAXIMUM = 5
-    };
-
-    /* Internationalized format string. */
-    const char *yyformat = YY_NULLPTR;
-    /* Arguments of yyformat: reported tokens (one for the "unexpected",
-       one per "expected"). */
-    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-    /* Actual size of YYARG. */
-    int yycount = 0;
-    /* Cumulated lengths of YYARG.  */
-    YYPTRDIFF_T yysize = 0;
-
-    /* There are many possibilities here to consider:
-       - If this state is a consistent state with a default action, then
-         the only way this function was invoked is if the default action
-         is an error action.  In that case, don't check for expected
-         tokens because there are none.
-       - The only way there can be no lookahead present (in yychar) is if
-         this state is a consistent state with a default action.  Thus,
-         detecting the absence of a lookahead is sufficient to determine
-         that there is no unexpected or expected token to report.  In that
-         case, just report a simple "syntax error".
-       - Don't assume there isn't a lookahead just because this state is a
-         consistent state with a default action.  There might have been a
-         previous inconsistent state, consistent state with a non-default
-         action, or user semantic action that manipulated yychar.
-       - Of course, the expected token list depends on states to have
-         correct lookahead information, and it depends on the parser not
-         to perform extra reductions after fetching a lookahead from the
-         scanner and before detecting a syntax error.  Thus, state merging
-         (from LALR or IELR) and default reductions corrupt the expected
-         token list.  However, the list is correct for canonical LR with
-         one exception: it will still contain any token that will not be
-         accepted due to an error action in a later state.
-    */
-    if (yytoken != YYEMPTY)
-    {
-        int yyn = yypact[+*yyssp];
-        YYPTRDIFF_T yysize0 = yytnamerr(YY_NULLPTR, yytname[yytoken]);
-        yysize = yysize0;
-        yyarg[yycount++] = yytname[yytoken];
-        if (!yypact_value_is_default(yyn))
-        {
-            /* Start YYX at -YYN if negative to avoid negative indexes in
-               YYCHECK.  In other words, skip the first -YYN actions for
-               this state because they are default actions.  */
-            int yyxbegin = yyn < 0 ? -yyn : 0;
-            /* Stay within bounds of both yycheck and yytname.  */
-            int yychecklim = YYLAST - yyn + 1;
-            int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-            int yyx;
-
-            for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-                if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR &&
-                    !yytable_value_is_error(yytable[yyx + yyn]))
-                {
-                    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                    {
-                        yycount = 1;
-                        yysize = yysize0;
-                        break;
-                    }
-                    yyarg[yycount++] = yytname[yyx];
-                    {
-                        YYPTRDIFF_T yysize1 =
-                            yysize + yytnamerr(YY_NULLPTR, yytname[yyx]);
-                        if (yysize <= yysize1 &&
-                            yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                            yysize = yysize1;
-                        else
-                            return 2;
-                    }
-                }
-        }
-    }
-
-    switch (yycount)
-    {
-#define YYCASE_(N, S)                                                          \
-    case N:                                                                    \
-        yyformat = S;                                                          \
-        break
-        default: /* Avoid compiler warnings. */
-            YYCASE_(0, YY_("syntax error"));
-            YYCASE_(1, YY_("syntax error, unexpected %s"));
-            YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-            YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-            YYCASE_(
-                4,
-                YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-            YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or "
-                           "%s or %s"));
-#undef YYCASE_
-    }
-
-    {
-        /* Don't count the "%s"s in the final size, but reserve room for
-           the terminator.  */
-        YYPTRDIFF_T yysize1 = yysize + (yystrlen(yyformat) - 2 * yycount) + 1;
-        if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-            yysize = yysize1;
-        else
-            return 2;
-    }
-
-    if (*yymsg_alloc < yysize)
-    {
-        *yymsg_alloc = 2 * yysize;
-        if (!(yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-        return 1;
-    }
-
-    /* Avoid sprintf, as that infringes on the user's name space.
-       Don't have undefined behavior even if the translation
-       produced a string with the wrong number of "%s"s.  */
-    {
-        char *yyp = *yymsg;
-        int yyi = 0;
-        while ((*yyp = *yyformat) != '\0')
-            if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-            {
-                yyp += yytnamerr(yyp, yyarg[yyi++]);
-                yyformat += 2;
-            }
-            else
-            {
-                ++yyp;
-                ++yyformat;
-            }
-    }
-    return 0;
-}
-#endif /* YYERROR_VERBOSE */
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-static void yydestruct(const char *yymsg, int yytype, YYSTYPE *yyvaluep,
-                       ods_formula_parse_context *context)
+static void
+yydestruct (const char *yymsg,
+            yysymbol_kind_t yykind, YYSTYPE *yyvaluep, ods_formula_parse_context *context)
 {
-    YYUSE(yyvaluep);
-    YYUSE(context);
-    if (!yymsg)
-        yymsg = "Deleting";
-    YY_SYMBOL_PRINT(yymsg, yytype, yyvaluep, yylocationp);
-
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    switch (yytype)
+  YY_USE (yyvaluep);
+  YY_USE (context);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  switch (yykind)
     {
-        case 3: /* ODST_NUMBER  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_NUMBER: /* ODST_NUMBER  */
+            { delete (*yyvaluep); }
         break;
 
-        case 4: /* ODST_STRING  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_STRING: /* ODST_STRING  */
+            { delete (*yyvaluep); }
         break;
 
-        case 5: /* ODST_IDENTIFIER  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_IDENTIFIER: /* ODST_IDENTIFIER  */
+            { delete (*yyvaluep); }
         break;
 
-        case 6: /* ODST_FUNCTION_NO_ARG  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_FUNCTION_NO_ARG: /* ODST_FUNCTION_NO_ARG  */
+            { delete (*yyvaluep); }
         break;
 
-        case 7: /* ODST_FUNCTION_SINGLE_ARG  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_FUNCTION_SINGLE_ARG: /* ODST_FUNCTION_SINGLE_ARG  */
+            { delete (*yyvaluep); }
         break;
 
-        case 8: /* ODST_FUNCTION_TWO_ARG  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_FUNCTION_TWO_ARG: /* ODST_FUNCTION_TWO_ARG  */
+            { delete (*yyvaluep); }
         break;
 
-        case 9: /* ODST_FUNCTION_THREE_ARG  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_FUNCTION_THREE_ARG: /* ODST_FUNCTION_THREE_ARG  */
+            { delete (*yyvaluep); }
         break;
 
-        case 10: /* ODST_FUNCTION_ARG_LIST  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_ODST_FUNCTION_ARG_LIST: /* ODST_FUNCTION_ARG_LIST  */
+            { delete (*yyvaluep); }
         break;
 
-        case 37: /* value_expr  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_value_expr: /* value_expr  */
+            { delete (*yyvaluep); }
         break;
 
-        case 38: /* value_expr_list  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_value_expr_list: /* value_expr_list  */
+            { delete (*yyvaluep); }
         break;
 
-        case 39: /* value_expr_and_cell_range_list  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_value_expr_and_cell_range_list: /* value_expr_and_cell_range_list  */
+            { delete (*yyvaluep); }
         break;
 
-        case 40: /* cell_range  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_cell_range: /* cell_range  */
+            { delete (*yyvaluep); }
         break;
 
-        default:
-            break;
+      default:
+        break;
     }
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
+
+
+
+
+
 /*----------.
 | yyparse.  |
 `----------*/
 
-int yyparse(ods_formula_parse_context *context)
+int
+yyparse (ods_formula_parse_context *context)
 {
-    /* The lookahead symbol.  */
-    int yychar;
+/* Lookahead token kind.  */
+int yychar;
+
 
-    /* The semantic value of the lookahead symbol.  */
-    /* Default value used for initialization, for pacifying older GCCs
-       or non-GCC compilers.  */
-    YY_INITIAL_VALUE(static YYSTYPE yyval_default;)
-    YYSTYPE yylval YY_INITIAL_VALUE(= yyval_default);
+/* The semantic value of the lookahead symbol.  */
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
-    int yynerrs;
+    int yynerrs = 0;
 
-    yy_state_fast_t yystate;
+    yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
+    int yyerrstatus = 0;
 
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
+    /* Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
-    /* The state stack.  */
+    /* Their size.  */
+    YYPTRDIFF_T yystacksize = YYINITDEPTH;
+
+    /* The state stack: array, bottom, top.  */
     yy_state_t yyssa[YYINITDEPTH];
-    yy_state_t *yyss;
-    yy_state_t *yyssp;
+    yy_state_t *yyss = yyssa;
+    yy_state_t *yyssp = yyss;
 
-    /* The semantic value stack.  */
+    /* The semantic value stack: array, bottom, top.  */
     YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYPTRDIFF_T yystacksize;
-
-    int yyn;
-    int yyresult;
-    /* Lookahead token as an internal (translated) token number.  */
-    int yytoken = 0;
-    /* The variables used to return semantic value and location from the
-       action routines.  */
-    YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
-    /* Buffer for error messages, and its allocated size.  */
-    char yymsgbuf[128];
-    char *yymsg = yymsgbuf;
-    YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+    YYSTYPE *yyvs = yyvsa;
+    YYSTYPE *yyvsp = yyvs;
+
+  int yyn;
+  /* The return value of yyparse.  */
+  int yyresult;
+  /* Lookahead symbol kind.  */
+  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
-    /* The number of symbols on the RHS of the reduced rule.
-       Keep to zero when no symbol should be popped.  */
-    int yylen = 0;
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
-    yyssp = yyss = yyssa;
-    yyvsp = yyvs = yyvsa;
-    yystacksize = YYINITDEPTH;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
 
-    YYDPRINTF((stderr, "Starting parse\n"));
+  goto yysetstate;
 
-    yystate = 0;
-    yyerrstatus = 0;
-    yynerrs = 0;
-    yychar = YYEMPTY; /* Cause a token to be read.  */
-    goto yysetstate;
 
 /*------------------------------------------------------------.
 | yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
 yynewstate:
-    /* In all cases, when you get here, the value and location stacks
-       have just been pushed.  So pushing a state here evens the stacks.  */
-    yyssp++;
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
 
 /*--------------------------------------------------------------------.
 | yysetstate -- set current state (the top of the stack) to yystate.  |
 `--------------------------------------------------------------------*/
 yysetstate:
-    YYDPRINTF((stderr, "Entering state %d\n", yystate));
-    YY_ASSERT(0 <= yystate && yystate < YYNSTATES);
-    YY_IGNORE_USELESS_CAST_BEGIN
-    *yyssp = YY_CAST(yy_state_t, yystate);
-    YY_IGNORE_USELESS_CAST_END
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  YY_IGNORE_USELESS_CAST_BEGIN
+  *yyssp = YY_CAST (yy_state_t, yystate);
+  YY_IGNORE_USELESS_CAST_END
+  YY_STACK_PRINT (yyss, yyssp);
 
-    if (yyss + yystacksize - 1 <= yyssp)
+  if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-        goto yyexhaustedlab;
+    YYNOMEM;
 #else
     {
-        /* Get the current used size of the three stacks, in elements.  */
-        YYPTRDIFF_T yysize = yyssp - yyss + 1;
-
-#if defined yyoverflow
-        {
-            /* Give user a chance to reallocate the stack.  Use copies of
-               these so that the &'s don't force the real ones into
-               memory.  */
-            yy_state_t *yyss1 = yyss;
-            YYSTYPE *yyvs1 = yyvs;
-
-            /* Each stack pointer address is followed by the size of the
-               data in use in that stack, in bytes.  This used to be a
-               conditional around just the two extra args, but that might
-               be undefined if yyoverflow is a macro.  */
-            yyoverflow(YY_("memory exhausted"), &yyss1,
-                       yysize * YYSIZEOF(*yyssp), &yyvs1,
-                       yysize * YYSIZEOF(*yyvsp), &yystacksize);
-            yyss = yyss1;
-            yyvs = yyvs1;
-        }
-#else /* defined YYSTACK_RELOCATE */
-        /* Extend the stack our own way.  */
-        if (YYMAXDEPTH <= yystacksize)
-            goto yyexhaustedlab;
-        yystacksize *= 2;
-        if (YYMAXDEPTH < yystacksize)
-            yystacksize = YYMAXDEPTH;
-
-        {
-            yy_state_t *yyss1 = yyss;
-            union yyalloc *yyptr = YY_CAST(
-                union yyalloc *,
-                YYSTACK_ALLOC(YY_CAST(YYSIZE_T, YYSTACK_BYTES(yystacksize))));
-            if (!yyptr)
-                goto yyexhaustedlab;
-            YYSTACK_RELOCATE(yyss_alloc, yyss);
-            YYSTACK_RELOCATE(yyvs_alloc, yyvs);
-#undef YYSTACK_RELOCATE
-            if (yyss1 != yyssa)
-                YYSTACK_FREE(yyss1);
-        }
-#endif
-
-        yyssp = yyss + yysize - 1;
-        yyvsp = yyvs + yysize - 1;
-
-        YY_IGNORE_USELESS_CAST_BEGIN
-        YYDPRINTF((stderr, "Stack size increased to %ld\n",
-                   YY_CAST(long, yystacksize)));
-        YY_IGNORE_USELESS_CAST_END
-
-        if (yyss + yystacksize - 1 <= yyssp)
-            YYABORT;
+      /* Get the current used size of the three stacks, in elements.  */
+      YYPTRDIFF_T yysize = yyssp - yyss + 1;
+
+# if defined yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        yy_state_t *yyss1 = yyss;
+        YYSTYPE *yyvs1 = yyvs;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * YYSIZEOF (*yyssp),
+                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
+                    &yystacksize);
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+# else /* defined YYSTACK_RELOCATE */
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        YYNOMEM;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yy_state_t *yyss1 = yyss;
+        union yyalloc *yyptr =
+          YY_CAST (union yyalloc *,
+                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
+        if (! yyptr)
+          YYNOMEM;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+                  YY_CAST (long, yystacksize)));
+      YY_IGNORE_USELESS_CAST_END
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-    if (yystate == YYFINAL)
-        YYACCEPT;
 
-    goto yybackup;
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
 
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-    /* Do appropriate processing given the current state.  Read a
-       lookahead token if we need one and don't already have one.  */
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
 
-    /* First try to decide what to do without reference to lookahead token.  */
-    yyn = yypact[yystate];
-    if (yypact_value_is_default(yyn))
-        goto yydefault;
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
 
-    /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-    /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-    if (yychar == YYEMPTY)
+  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
+  if (yychar == YYEMPTY)
     {
-        YYDPRINTF((stderr, "Reading a token: "));
-        yychar = yylex(&yylval, context);
+      YYDPRINTF ((stderr, "Reading a token\n"));
+      yychar = yylex (&yylval, context);
     }
 
-    if (yychar <= YYEOF)
+  if (yychar <= YYEOF)
+    {
+      yychar = YYEOF;
+      yytoken = YYSYMBOL_YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else if (yychar == YYerror)
     {
-        yychar = yytoken = YYEOF;
-        YYDPRINTF((stderr, "Now at end of input.\n"));
+      /* The scanner already issued an error message, process directly
+         to error recovery.  But do not keep the error token as
+         lookahead, it is too special and may lead us to an endless
+         loop in error recovery. */
+      yychar = YYUNDEF;
+      yytoken = YYSYMBOL_YYerror;
+      goto yyerrlab1;
     }
-    else
+  else
     {
-        yytoken = YYTRANSLATE(yychar);
-        YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-    /* If the proper action on seeing token YYTOKEN is to reduce or to
-       detect an error, take that action.  */
-    yyn += yytoken;
-    if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-        goto yydefault;
-    yyn = yytable[yyn];
-    if (yyn <= 0)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
     {
-        if (yytable_value_is_error(yyn))
-            goto yyerrlab;
-        yyn = -yyn;
-        goto yyreduce;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
     }
 
-    /* Count tokens shifted since error; after three, turn off error
-       status.  */
-    if (yyerrstatus)
-        yyerrstatus--;
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
-    /* Shift the lookahead token.  */
-    YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
-    yystate = yyn;
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    *++yyvsp = yylval;
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+  goto yynewstate;
 
-    /* Discard the shifted token.  */
-    yychar = YYEMPTY;
-    goto yynewstate;
 
 /*-----------------------------------------------------------.
 | yydefault -- do the default action for the current state.  |
 `-----------------------------------------------------------*/
 yydefault:
-    yyn = yydefact[yystate];
-    if (yyn == 0)
-        goto yyerrlab;
-    goto yyreduce;
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
 
 /*-----------------------------.
 | yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
-    /* yyn is the number of a rule to reduce with.  */
-    yylen = yyr2[yyn];
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
 
-    /* If YYLEN is nonzero, implement the default value of the action:
-       '$$ = $1'.
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
 
-       Otherwise, the following line sets YYVAL to garbage.
-       This behavior is undocumented and Bison
-       users should not rely upon it.  Assigning to YYVAL
-       unconditionally makes the parser a bit smaller, and it avoids a
-       GCC warning that YYVAL may be used uninitialized.  */
-    yyval = yyvsp[1 - yylen];
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
 
-    YY_REDUCE_PRINT(yyn);
-    switch (yyn)
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-        case 2:
+  case 2: /* input: ODST_START value_expr  */
         {
             context->poRoot = yyvsp[0];
         }
-        break;
+    break;
 
-        case 5:
+  case 5: /* value_expr: ODST_NUMBER  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 6:
+  case 6: /* value_expr: ODST_STRING  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 7:
+  case 7: /* value_expr: ODST_FUNCTION_NO_ARG '(' ')'  */
         {
             yyval = yyvsp[-2];
         }
-        break;
+    break;
 
-        case 8:
+  case 8: /* value_expr: ODST_FUNCTION_SINGLE_ARG '(' value_expr ')'  */
         {
             yyval = yyvsp[-3];
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 9:
+  case 9: /* value_expr: ODST_FUNCTION_TWO_ARG '(' value_expr comma value_expr ')'  */
         {
             yyval = yyvsp[-5];
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 10:
+  case 10: /* value_expr: ODST_FUNCTION_THREE_ARG '(' value_expr comma value_expr comma value_expr ')'  */
         {
             yyval = yyvsp[-7];
-            yyval->PushSubExpression(yyvsp[-5]);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval->PushSubExpression( yyvsp[-5] );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 11:
+  case 11: /* value_expr: ODST_AND '(' value_expr_list ')'  */
         {
-            yyval = new ods_formula_node(ODS_AND);
+            yyval = new ods_formula_node( ODS_AND );
             yyvsp[-1]->ReverseSubExpressions();
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 12:
+  case 12: /* value_expr: ODST_OR '(' value_expr_list ')'  */
         {
-            yyval = new ods_formula_node(ODS_OR);
+            yyval = new ods_formula_node( ODS_OR );
             yyvsp[-1]->ReverseSubExpressions();
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 13:
+  case 13: /* value_expr: ODST_NOT '(' value_expr ')'  */
         {
-            yyval = new ods_formula_node(ODS_NOT);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval = new ods_formula_node( ODS_NOT );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 14:
+  case 14: /* value_expr: ODST_IF '(' value_expr comma value_expr ')'  */
         {
-            yyval = new ods_formula_node(ODS_IF);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval = new ods_formula_node( ODS_IF );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 15:
+  case 15: /* value_expr: ODST_IF '(' value_expr comma value_expr comma value_expr ')'  */
         {
-            yyval = new ods_formula_node(ODS_IF);
-            yyval->PushSubExpression(yyvsp[-5]);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval = new ods_formula_node( ODS_IF );
+            yyval->PushSubExpression( yyvsp[-5] );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 16:
+  case 16: /* value_expr: ODST_FUNCTION_ARG_LIST '(' value_expr_and_cell_range_list ')'  */
         {
             yyval = yyvsp[-3];
             yyvsp[-1]->ReverseSubExpressions();
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 17:
+  case 17: /* value_expr: '(' value_expr ')'  */
         {
             yyval = yyvsp[-1];
         }
-        break;
+    break;
 
-        case 18:
+  case 18: /* value_expr: value_expr '=' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_EQ);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_EQ );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 19:
+  case 19: /* value_expr: value_expr '<' '>' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_NE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_NE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 20:
+  case 20: /* value_expr: value_expr '!' '=' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_NE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_NE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 21:
+  case 21: /* value_expr: value_expr '<' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_LT);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_LT );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 22:
+  case 22: /* value_expr: value_expr '>' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_GT);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_GT );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 23:
+  case 23: /* value_expr: value_expr '<' '=' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_LE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_LE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 24:
+  case 24: /* value_expr: value_expr '=' '<' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_LE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_LE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 25:
+  case 25: /* value_expr: value_expr '=' '>' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_LE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_LE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 26:
+  case 26: /* value_expr: value_expr '>' '=' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_GE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_GE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 27:
+  case 27: /* value_expr: '-' value_expr  */
         {
             if (yyvsp[0]->eNodeType == SNT_CONSTANT &&
                 !(yyvsp[0]->field_type == ODS_FIELD_TYPE_INTEGER &&
@@ -1626,223 +1481,191 @@ int yyparse(ods_formula_parse_context *context)
             }
             else
             {
-                yyval = new ods_formula_node(ODS_MULTIPLY);
-                yyval->PushSubExpression(new ods_formula_node(-1));
-                yyval->PushSubExpression(yyvsp[0]);
+                yyval = new ods_formula_node( ODS_MULTIPLY );
+                yyval->PushSubExpression( new ods_formula_node(-1) );
+                yyval->PushSubExpression( yyvsp[0] );
             }
         }
-        break;
+    break;
 
-        case 28:
+  case 28: /* value_expr: value_expr '+' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_ADD);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_ADD );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 29:
+  case 29: /* value_expr: value_expr '-' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_SUBTRACT);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_SUBTRACT );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 30:
+  case 30: /* value_expr: value_expr '&' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_CONCAT);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_CONCAT );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 31:
+  case 31: /* value_expr: value_expr '*' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_MULTIPLY);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_MULTIPLY );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 32:
+  case 32: /* value_expr: value_expr '/' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_DIVIDE);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_DIVIDE );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 33:
+  case 33: /* value_expr: value_expr '%' value_expr  */
         {
-            yyval = new ods_formula_node(ODS_MODULUS);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new ods_formula_node( ODS_MODULUS );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 34:
+  case 34: /* value_expr: '[' ODST_IDENTIFIER ']'  */
         {
-            yyval = new ods_formula_node(ODS_CELL);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval = new ods_formula_node( ODS_CELL );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        case 35:
+  case 35: /* value_expr_list: value_expr comma value_expr_list  */
         {
             yyval = yyvsp[0];
-            yyvsp[0]->PushSubExpression(yyvsp[-2]);
+            yyvsp[0]->PushSubExpression( yyvsp[-2] );
         }
-        break;
+    break;
 
-        case 36:
-        {
-            yyval = new ods_formula_node(ODS_LIST);
-            yyval->PushSubExpression(yyvsp[0]);
+  case 36: /* value_expr_list: value_expr  */
+            {
+            yyval = new ods_formula_node( ODS_LIST );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 37:
+  case 37: /* value_expr_and_cell_range_list: value_expr comma value_expr_and_cell_range_list  */
         {
             yyval = yyvsp[0];
-            yyvsp[0]->PushSubExpression(yyvsp[-2]);
+            yyvsp[0]->PushSubExpression( yyvsp[-2] );
         }
-        break;
+    break;
 
-        case 38:
-        {
-            yyval = new ods_formula_node(ODS_LIST);
-            yyval->PushSubExpression(yyvsp[0]);
+  case 38: /* value_expr_and_cell_range_list: value_expr  */
+            {
+            yyval = new ods_formula_node( ODS_LIST );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 39:
+  case 39: /* value_expr_and_cell_range_list: cell_range comma value_expr_and_cell_range_list  */
         {
             yyval = yyvsp[0];
-            yyvsp[0]->PushSubExpression(yyvsp[-2]);
+            yyvsp[0]->PushSubExpression( yyvsp[-2] );
         }
-        break;
+    break;
 
-        case 40:
-        {
-            yyval = new ods_formula_node(ODS_LIST);
-            yyval->PushSubExpression(yyvsp[0]);
+  case 40: /* value_expr_and_cell_range_list: cell_range  */
+            {
+            yyval = new ods_formula_node( ODS_LIST );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 41:
+  case 41: /* cell_range: '[' ODST_IDENTIFIER ':' ODST_IDENTIFIER ']'  */
         {
-            yyval = new ods_formula_node(ODS_CELL_RANGE);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-1]);
+            yyval = new ods_formula_node( ODS_CELL_RANGE );
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[-1] );
         }
-        break;
+    break;
 
-        default:
-            break;
-    }
-    /* User semantic actions sometimes alter yychar, and that requires
-       that yytoken be updated with the new translation.  We take the
-       approach of translating immediately before every use of yytoken.
-       One alternative is translating here after every semantic action,
-       but that translation would be missed if the semantic action invokes
-       YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-       if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-       incorrect destructor might then be invoked immediately.  In the
-       case of YYERROR or YYBACKUP, subsequent parser actions might lead
-       to an incorrect destructor call or verbose syntax error message
-       before the lookahead is translated.  */
-    YY_SYMBOL_PRINT("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-    YYPOPSTACK(yylen);
-    yylen = 0;
-    YY_STACK_PRINT(yyss, yyssp);
-
-    *++yyvsp = yyval;
-
-    /* Now 'shift' the result of the reduction.  Determine what state
-       that goes to, based on the state we popped back to and the rule
-       number reduced by.  */
-    {
-        const int yylhs = yyr1[yyn] - YYNTOKENS;
-        const int yyi = yypgoto[yylhs] + *yyssp;
-        yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
-                       ? yytable[yyi]
-                       : yydefgoto[yylhs]);
+
+
+      default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+  {
+    const int yylhs = yyr1[yyn] - YYNTOKENS;
+    const int yyi = yypgoto[yylhs] + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+               ? yytable[yyi]
+               : yydefgoto[yylhs]);
+  }
+
+  goto yynewstate;
 
-    goto yynewstate;
 
 /*--------------------------------------.
 | yyerrlab -- here on detecting error.  |
 `--------------------------------------*/
 yyerrlab:
-    /* Make sure we have latest lookahead translation.  See comments at
-       user semantic actions for why this is necessary.  */
-    yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE(yychar);
-
-    /* If not already recovering from an error, report this error.  */
-    if (!yyerrstatus)
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
-        ++yynerrs;
-        (void)yynerrs;
-#if !YYERROR_VERBOSE
-        yyerror(context, YY_("syntax error"));
-#else
-#define YYSYNTAX_ERROR yysyntax_error(&yymsg_alloc, &yymsg, yyssp, yytoken)
-        {
-            char const *yymsgp = YY_("syntax error");
-            int yysyntax_error_status;
-            yysyntax_error_status = YYSYNTAX_ERROR;
-            if (yysyntax_error_status == 0)
-                yymsgp = yymsg;
-            else if (yysyntax_error_status == 1)
-            {
-                if (yymsg != yymsgbuf)
-                    YYSTACK_FREE(yymsg);
-                yymsg = YY_CAST(char *,
-                                YYSTACK_ALLOC(YY_CAST(YYSIZE_T, yymsg_alloc)));
-                if (!yymsg)
-                {
-                    yymsg = yymsgbuf;
-                    yymsg_alloc = sizeof yymsgbuf;
-                    yysyntax_error_status = 2;
-                }
-                else
-                {
-                    yysyntax_error_status = YYSYNTAX_ERROR;
-                    yymsgp = yymsg;
-                }
-            }
-            yyerror(context, yymsgp);
-            if (yysyntax_error_status == 2)
-                goto yyexhaustedlab;
-        }
-#undef YYSYNTAX_ERROR
-#endif
+      ++yynerrs; (void)yynerrs;
+      yyerror (context, YY_("syntax error"));
     }
 
-    if (yyerrstatus == 3)
+  if (yyerrstatus == 3)
     {
-        /* If just tried and failed to reuse lookahead token after an
-           error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
 
-        if (yychar <= YYEOF)
+      if (yychar <= YYEOF)
         {
-            /* Return failure if at end of input.  */
-            if (yychar == YYEOF)
-                YYABORT;
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
         }
-        else
+      else
         {
-            yydestruct("Error: discarding", yytoken, &yylval, context);
-            yychar = YYEMPTY;
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, context);
+          yychar = YYEMPTY;
         }
     }
 
-    /* Else will try to reuse lookahead token after shifting the error
-       token.  */
-    goto yyerrlab1;
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
 
 /*---------------------------------------------------.
 | yyerrorlab -- error raised explicitly by YYERROR.  |
@@ -1853,6 +1676,7 @@ int yyparse(ods_formula_parse_context *context)
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
+  ++yynerrs; (void)yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -1868,93 +1692,99 @@ int yyparse(ods_formula_parse_context *context)
 `-------------------------------------------------------------*/
 #endif
 yyerrlab1:
-    yyerrstatus = 3; /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
-    for (;;)
+  /* Pop stack until we find a state that shifts the error token.  */
+  for (;;)
     {
-        yyn = yypact[yystate];
-        if (!yypact_value_is_default(yyn))
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
         {
-            yyn += YYTERROR;
-            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+          yyn += YYSYMBOL_YYerror;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
             {
-                yyn = yytable[yyn];
-                if (0 < yyn)
-                    break;
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
             }
         }
 
-        /* Pop the current state because it cannot handle the error token.  */
-        if (yyssp == yyss)
-            YYABORT;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
 
-        yydestruct("Error: popping", yystos[yystate], yyvsp, context);
-        YYPOPSTACK(1);
-        yystate = *yyssp;
-        YY_STACK_PRINT(yyss, yyssp);
+
+      yydestruct ("Error: popping",
+                  YY_ACCESSING_SYMBOL (yystate), yyvsp, context);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
 
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    *++yyvsp = yylval;
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
 
-    /* Shift the error token.  */
-    YY_SYMBOL_PRINT("Shifting", yystos[yyn], yyvsp, yylsp);
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
 
-    yystate = yyn;
-    goto yynewstate;
 
 /*-------------------------------------.
 | yyacceptlab -- YYACCEPT comes here.  |
 `-------------------------------------*/
 yyacceptlab:
-    yyresult = 0;
-    goto yyreturn;
+  yyresult = 0;
+  goto yyreturnlab;
+
 
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
-    yyresult = 1;
-    goto yyreturn;
+  yyresult = 1;
+  goto yyreturnlab;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
+
+/*-----------------------------------------------------------.
+| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
+`-----------------------------------------------------------*/
 yyexhaustedlab:
-    yyerror(context, YY_("memory exhausted"));
-    yyresult = 2;
-    /* Fall through.  */
-#endif
+  yyerror (context, YY_("memory exhausted"));
+  yyresult = 2;
+  goto yyreturnlab;
+
 
-/*-----------------------------------------------------.
-| yyreturn -- parsing is finished, return the result.  |
-`-----------------------------------------------------*/
-yyreturn:
-    if (yychar != YYEMPTY)
+/*----------------------------------------------------------.
+| yyreturnlab -- parsing is finished, clean up and return.  |
+`----------------------------------------------------------*/
+yyreturnlab:
+  if (yychar != YYEMPTY)
     {
-        /* Make sure we have latest lookahead translation.  See comments at
-           user semantic actions for why this is necessary.  */
-        yytoken = YYTRANSLATE(yychar);
-        yydestruct("Cleanup: discarding lookahead", yytoken, &yylval, context);
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, context);
     }
-    /* Do not reclaim the symbols of the rule whose action triggered
-       this YYABORT or YYACCEPT.  */
-    YYPOPSTACK(yylen);
-    YY_STACK_PRINT(yyss, yyssp);
-    while (yyssp != yyss)
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
     {
-        yydestruct("Cleanup: popping", yystos[+*yyssp], yyvsp, context);
-        YYPOPSTACK(1);
+      yydestruct ("Cleanup: popping",
+                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, context);
+      YYPOPSTACK (1);
     }
 #ifndef yyoverflow
-    if (yyss != yyssa)
-        YYSTACK_FREE(yyss);
-#endif
-#if YYERROR_VERBOSE
-    if (yymsg != yymsgbuf)
-        YYSTACK_FREE(yymsg);
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    return yyresult;
+
+  return yyresult;
 }
+
diff --git a/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp b/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp
index 5971a0de025a..5c81d326d276 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp
+++ b/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.1.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -31,49 +31,58 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
 #ifndef YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
-#define YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
+# define YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
-#define YYDEBUG 0
+# define YYDEBUG 0
 #endif
 #if YYDEBUG
 extern int ods_formuladebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
-#define YYTOKENTYPE
-
-enum yytokentype
-{
-    ODST_NUMBER = 258,
-    ODST_STRING = 259,
-    ODST_IDENTIFIER = 260,
-    ODST_FUNCTION_NO_ARG = 261,
-    ODST_FUNCTION_SINGLE_ARG = 262,
-    ODST_FUNCTION_TWO_ARG = 263,
-    ODST_FUNCTION_THREE_ARG = 264,
-    ODST_FUNCTION_ARG_LIST = 265,
-    ODST_START = 266,
-    ODST_NOT = 267,
-    ODST_OR = 268,
-    ODST_AND = 269,
-    ODST_IF = 270,
-    ODST_UMINUS = 271
-};
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    ODST_NUMBER = 258,             /* ODST_NUMBER  */
+    ODST_STRING = 259,             /* ODST_STRING  */
+    ODST_IDENTIFIER = 260,         /* ODST_IDENTIFIER  */
+    ODST_FUNCTION_NO_ARG = 261,    /* ODST_FUNCTION_NO_ARG  */
+    ODST_FUNCTION_SINGLE_ARG = 262, /* ODST_FUNCTION_SINGLE_ARG  */
+    ODST_FUNCTION_TWO_ARG = 263,   /* ODST_FUNCTION_TWO_ARG  */
+    ODST_FUNCTION_THREE_ARG = 264, /* ODST_FUNCTION_THREE_ARG  */
+    ODST_FUNCTION_ARG_LIST = 265,  /* ODST_FUNCTION_ARG_LIST  */
+    ODST_START = 266,              /* ODST_START  */
+    ODST_NOT = 267,                /* ODST_NOT  */
+    ODST_OR = 268,                 /* ODST_OR  */
+    ODST_AND = 269,                /* ODST_AND  */
+    ODST_IF = 270,                 /* ODST_IF  */
+    ODST_UMINUS = 271              /* ODST_UMINUS  */
+  };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
 
 /* Value type.  */
-#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-#define YYSTYPE_IS_TRIVIAL 1
-#define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
-int ods_formulaparse(ods_formula_parse_context *context);
+
+
+
+int ods_formulaparse (ods_formula_parse_context *context);
+
 
 #endif /* !YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED  */

From 5178303e1997d582dd5c541dc76f12b1a5999f68 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 25 Nov 2024 01:02:12 +0100
Subject: [PATCH 18/21] Fix lots of Coverity Scan warnings in
 frmts/hdf4/hdf-eos

---
 frmts/hdf4/hdf-eos/EHapi.c | 131 ++++---
 frmts/hdf4/hdf-eos/GDapi.c | 595 +++++++++++++++++++-----------
 frmts/hdf4/hdf-eos/SWapi.c | 736 +++++++++++++++++++++++--------------
 3 files changed, 907 insertions(+), 555 deletions(-)

diff --git a/frmts/hdf4/hdf-eos/EHapi.c b/frmts/hdf4/hdf-eos/EHapi.c
index 46f1d4bb17fd..3da68c6a9e75 100644
--- a/frmts/hdf4/hdf-eos/EHapi.c
+++ b/frmts/hdf4/hdf-eos/EHapi.c
@@ -10,9 +10,9 @@
 /*
 Copyright (C) 1996 Hughes and Applied Research Corporation
 
-Permission to use, modify, and distribute this software and its documentation 
-for any purpose without fee is hereby granted, provided that the above 
-copyright notice appear in all copies and that both that copyright notice and 
+Permission to use, modify, and distribute this software and its documentation
+for any purpose without fee is hereby granted, provided that the above
+copyright notice appear in all copies and that both that copyright notice and
 this permission notice appear in supporting documentation.
 */
 
@@ -30,10 +30,10 @@ static int32 *EHXfidTable = NULL;
 static int32 *EHXsdTable = NULL;
 
 /* define a macro for the string size of the utility strings and some dimension
-   list strings. The value in previous versions of this code may not be 
-   enough in some cases. The length now is 512 which seems to be more than 
+   list strings. The value in previous versions of this code may not be
+   enough in some cases. The length now is 512 which seems to be more than
    enough to hold larger strings. */
-   
+
 #define UTLSTR_MAX_SIZE 512
 #define UTLSTRSIZE  32000
 
@@ -198,7 +198,7 @@ EHopen(const char *filename, intn access)
 		    /* ------------------------- */
 		    metabuf = (char *) calloc(32000, 1);
 		    if(metabuf == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"EHopen", __FILE__, __LINE__);
 			return(-1);
 		    }
@@ -237,7 +237,7 @@ EHopen(const char *filename, intn access)
 		/* Get HDF file ID */
 		/* --------------- */
 #ifndef _PGS_OLDNFS
-/* The following loop around the function Hopen is intended to deal with the NFS cache 
+/* The following loop around the function Hopen is intended to deal with the NFS cache
    problem when opening file fails with errno = 150 or 151. When NFS cache is updated,
    this part of change is no longer necessary.              10/18/1999   */
                 retryCount = 0;
@@ -271,7 +271,7 @@ EHopen(const char *filename, intn access)
                     {
                        /* Set HDFEOS version number in file */
                        /* --------------------------------- */
-		      
+
 		      attrIndex = SDfindattr(sdInterfaceID, "HDFEOSVersion");
 		      if (attrIndex == -1)
 			{
@@ -294,7 +294,7 @@ EHopen(const char *filename, intn access)
 		       {
 			  metabuf = (char *) calloc(32000, 1);
 			  if(metabuf == NULL)
-			  { 
+			  {
 			      HEpush(DFE_NOSPACE,"EHopen", __FILE__, __LINE__);
 			      return(-1);
 			  }
@@ -344,7 +344,7 @@ EHopen(const char *filename, intn access)
 		/* Get HDF file ID */
 		/* --------------- */
 #ifndef _PGS_OLDNFS
-/* The following loop around the function Hopen is intended to deal with the NFS cache 
+/* The following loop around the function Hopen is intended to deal with the NFS cache
    problem when opening file fails with errno = 150 or 151. When NFS cache is updated,
    this part of change is no longer necessary.              10/18/1999   */
                 retryCount = 0;
@@ -371,10 +371,7 @@ EHopen(const char *filename, intn access)
 		    fid = -1;
 		    status = -1;
 		    HEpush(DFE_FNF, "EHopen", __FILE__, __LINE__);
-		    strcpy(errbuf, "\"");
-		    strcat(errbuf, filename);
-		    strcat(errbuf, "\" (opened for READONLY access)");
-		    strcat(errbuf, " does not exist.");
+            snprintf(errbuf, sizeof(errbuf), "\"%s\" (opened for READONLY access) does not exist.", filename);
 		    HEreport("%s\n", errbuf);
 		} else
 		{
@@ -386,7 +383,7 @@ EHopen(const char *filename, intn access)
                         /* ------------------------- */
                         if (sdInterfaceID != -1)
                         {
- 
+
 		           /* Set open access to read-only */
 		           /* ---------------------------- */
 		           acs = 0;
@@ -1012,13 +1009,13 @@ EHstrwithin(const char *target, const char *search, const char delim)
     /* ----------------------------------------- */
     ptr = (char **) calloc(nentries, sizeof(char *));
     if(ptr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHstrwithin", __FILE__, __LINE__);
 	return(-1);
     }
     slen = (int32 *) calloc(nentries, sizeof(int32));
     if(slen == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHstrwithin", __FILE__, __LINE__);
 	free(ptr);
 	return(-1);
@@ -1200,13 +1197,13 @@ EHgetid(int32 fid, int32 vgid, const char *objectname, intn code,
 	/* ---------------------------------- */
 	tags = (int32 *) malloc(sizeof(int32) * nObjects);
 	if(tags == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHgetid", __FILE__, __LINE__);
 	    return(-1);
 	}
 	refs = (int32 *) malloc(sizeof(int32) * nObjects);
 	if(refs == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHgetid", __FILE__, __LINE__);
 	    free(tags);
 	    return(-1);
@@ -1332,7 +1329,7 @@ EHrevflds(const char *dimlist, char *revdimlist)
     /* ------------------------------ */
     tempdimlist = (char *) malloc(strlen(dimlist) + 1);
     if(tempdimlist == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHrevflds", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1348,14 +1345,14 @@ EHrevflds(const char *dimlist, char *revdimlist)
     /* ----------------------------------------- */
     ptr = (char **) calloc(nentries, sizeof(char *));
     if(ptr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHrevflds", __FILE__, __LINE__);
 	free(tempdimlist);
 	return(-1);
     }
     slen = (int32 *) calloc(nentries, sizeof(int32));
     if(slen == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHrevflds", __FILE__, __LINE__);
 	free(ptr);
 	free(tempdimlist);
@@ -1567,13 +1564,13 @@ EHmetalist(const char *instring, char *outstring)
     /* ----------------------------------------- */
     ptr = (char **) calloc(nentries, sizeof(char *));
     if(ptr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHmetalist", __FILE__, __LINE__);
 	return(-1);
     }
     slen = (int32 *) calloc(nentries, sizeof(int32));
     if(slen == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHmetalist", __FILE__, __LINE__);
 	free(ptr);
 	return(-1);
@@ -1699,7 +1696,7 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
     char           *metaptr;	/* Metadata pointer */
     char           *prevmetaptr;/* Previous position of metadata pointer */
     char           *ptr[8];	/* String pointer array (for dim map parsing) */
-    char            type[32];	/* Number type descriptor string */
+    char            type[32] = {0};	/* Number type descriptor string */
     char           *metaArr[2];	/* Array of metadata positions */
     char           *colon;	/* Colon position */
     char           *colon2;	/* 2nd colon position */
@@ -1712,14 +1709,14 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
     /* ---------------------------------- */
     utlstr = (char *) calloc(UTLSTRSIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
 	return(-1);
     }
 
     utlstr2 = (char *) calloc(UTLSTRSIZE, sizeof(char));
     if(utlstr2 == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
 	free(utlstr);
 	return(-1);
@@ -1752,7 +1749,7 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
     /* ----------------------------------------------------- */
     metabuf = (char *) calloc(32000 * nmeta, 1);
     if(metabuf == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
 	free(utlstr);
 	free(utlstr2);
@@ -2005,9 +2002,14 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 	/* Find colon (parse off field name) */
 	/* --------------------------------- */
 	colon = strchr(metastr, ':');
+	if (colon == NULL)
+	{
+		free(utlstr);
+		free(utlstr2);
+		return -1;
+	}
 	*colon = 0;
 
-
 	/* Search for next colon (compression and/or tiling parameters) */
 	/* ------------------------------------------------------------ */
 	colon2 = strchr(colon + 1, ':');
@@ -2067,9 +2069,14 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 	/* Find colon (parse off field name) */
 	/* --------------------------------- */
 	colon = strchr(metastr, ':');
+	if (colon == NULL)
+	{
+		free(utlstr);
+		free(utlstr2);
+		return -1;
+	}
 	*colon = 0;
 
-
 	/* Search for next colon (compression and/or tiling parameters) */
 	/* ------------------------------------------------------------ */
 	colon2 = strchr(colon + 1, ':');
@@ -2129,13 +2136,17 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 	/* Find colon (parse off merged fieldname) */
 	/* --------------------------------------- */
 	colon = strchr(metastr, ':');
-
+	if (colon == NULL)
+	{
+		free(utlstr);
+		free(utlstr2);
+		return -1;
+	}
+	*colon = 0;
 
 	/* Make metadata string list from field list */
 	/* ----------------------------------------- */
 	EHmetalist(colon + 1, utlstr2);
-	*colon = 0;
-
 
 	/* Build metadata entry string */
 	/* --------------------------- */
@@ -2183,9 +2194,14 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 	/* Find colon (parse off point field name) */
 	/* --------------------------------------- */
 	colon = strchr(metastr, ':');
+	if (colon == NULL)
+	{
+		free(utlstr);
+		free(utlstr2);
+		return -1;
+	}
 	*colon = 0;
 
-
 	/* Find beginning and ending of metadata section */
 	/* --------------------------------------------- */
 	strcpy(utlstr, "\t\t\t\tLevelName=\"");
@@ -2238,15 +2254,25 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 	/* Find colon (parse off parent/child level names from link field) */
 	/* --------------------------------------------------------------- */
 	colon = strchr(metastr, ':');
+	if (colon == NULL)
+	{
+		free(utlstr);
+		free(utlstr2);
+		return -1;
+	}
 	*colon = 0;
 
-
 	/* Find slash (divide parent and child levels) */
 	/* ------------------------------------------- */
 	slash = strchr(metastr, '/');
+	if (slash == NULL)
+	{
+		free(utlstr);
+		free(utlstr2);
+		return -1;
+	}
 	*slash = 0;
 
-
 	/* Build metadata entry string */
 	/* --------------------------- */
 	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%s%s%d%s",
@@ -2315,7 +2341,7 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 	/* ------------------------------------------------------ */
 	metabuf = (char *) realloc((void *) metabuf, 32000 * (nmeta + 1));
 	if(metabuf == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
 	    free(utlstr);
 	    free(utlstr2);
@@ -2434,6 +2460,11 @@ EHgetmetavalue(char *metaptrs[], const char *parameter, char *retstr)
 	/* Find newline "\n" character */
 	/* --------------------------- */
 	newline = strchr(metaptrs[0], '\n');
+	if (newline == NULL)
+	{
+		retstr[0] = 0;
+		return -1;
+	}
 
 	/* Copy from "=" to "\n" (exclusive) into return string */
 	/* ---------------------------------------------------- */
@@ -2511,9 +2542,9 @@ EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
      /* ---------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE,sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
         HEpush(DFE_NOSPACE,"EHEHmetagroup", __FILE__, __LINE__);
-	
+
         return( NULL);
     }
     /* Determine number of structural metadata "sections" */
@@ -2542,14 +2573,14 @@ EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
     /* Allocate space for metadata (in units of 32000 bytes) */
     /* ----------------------------------------------------- */
     metabuf = (char *) calloc(32000 * nmeta, 1);
-    
+
     if(metabuf == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"EHmetagroup", __FILE__, __LINE__);
 	free(utlstr);
 	return(metabuf);
     }
-    
+
 
     /* Read structural metadata */
     /* ------------------------ */
@@ -2730,11 +2761,11 @@ EHfillfld(int32 sdid, int32 rank, CPL_UNUSED int32 truerank, int32 size, int32 o
 	/* -------------------- */
 	fillbuf = (char *) malloc(totN * size);
 	if(fillbuf == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHfillfld", __FILE__, __LINE__);
 	    return(-1);
 	}
-	
+
 
 	/* Fill buffer with fill value */
 	/* --------------------------- */
@@ -2770,7 +2801,7 @@ EHfillfld(int32 sdid, int32 rank, CPL_UNUSED int32 truerank, int32 size, int32 o
 	/* -------------------- */
 	fillbuf = (char *) malloc(planeN * size * n);
 	if(fillbuf == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHfillfld", __FILE__, __LINE__);
 	    return(-1);
 	}
@@ -2825,7 +2856,7 @@ EHfillfld(int32 sdid, int32 rank, CPL_UNUSED int32 truerank, int32 size, int32 o
 	/* -------------------- */
 	fillbuf = (char *) malloc(dims[rank - 1] * size * n);
 	if(fillbuf == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHfillfld", __FILE__, __LINE__);
 	    return(-1);
 	}
@@ -2935,7 +2966,7 @@ EHbisect(float64(*func) (float64[]), float64 funcParms[], int32 nParms,
     /* -------------------------------------- */
     parms = (float64 *) calloc(nParms + 1, sizeof(float64));
     if(parms == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE, "EHbisect", __FILE__, __LINE__);
 	return(-1);
     }
@@ -3272,13 +3303,13 @@ EHattrcat(int32 fid, int32 attrVgrpID, char *attrnames, int32 * strbufsize)
 	/* ------------------------------------------- */
 	tags = (int32 *) malloc(sizeof(int32) * nObjects);
 	if(tags == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHattrcat", __FILE__, __LINE__);
 	    return(-1);
 	}
 	refs = (int32 *) malloc(sizeof(int32) * nObjects);
 	if(refs == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"EHattrcat", __FILE__, __LINE__);
 	    free(tags);
 	    return(-1);
diff --git a/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c
index 1a8be985d47b..6ff94e30836c 100644
--- a/frmts/hdf4/hdf-eos/GDapi.c
+++ b/frmts/hdf4/hdf-eos/GDapi.c
@@ -10,9 +10,9 @@
 /*
 Copyright (C) 1996 Hughes and Applied Research Corporation
 
-Permission to use, modify, and distribute this software and its documentation 
-for any purpose without fee is hereby granted, provided that the above 
-copyright notice appear in all copies and that both that copyright notice and 
+Permission to use, modify, and distribute this software and its documentation
+for any purpose without fee is hereby granted, provided that the above
+copyright notice appear in all copies and that both that copyright notice and
 this permission notice appear in supporting documentation.
 */
 /*****************************************************************************
@@ -35,53 +35,53 @@ Jan  15, 2003   Abe Taaheri  Modified for generalization of EASE Grid.
 Jun  05, 2003 Bruce Beaumont / Abe Taaheri
 
                              Fixed SQUARE definition.
-                             Added static projection number/name translation 
+                             Added static projection number/name translation
                              Added projection table lookup in GDdefproj.
                              Removed projection table from GDdefproj
                              Added projection table lookup in GDprojinfo
                              Removed projection table from GDprojinfo
                              Added cast for compcode in call to SDsetcompress
                                 in GDdeffield to avoid compiler errors
-                             Removed declaration for unused variable endptr 
+                             Removed declaration for unused variable endptr
                                 in GDSDfldsrch
                              Removed initialization code for unused variables
                                 in GDSDfldsrch
-                             Removed declarations for unused variables 
-                                BCEA_scale, r0, s0, xMtr0, xMtr1, yMtr0, 
+                             Removed declarations for unused variables
+                                BCEA_scale, r0, s0, xMtr0, xMtr1, yMtr0,
                                 and yMtr1 in GDll2ij
                              Removed initialization code for unused variables
                                 in GDll2ij
-                             Added code in GEO projection handling to allow 
+                             Added code in GEO projection handling to allow
                                 map to span dateline in GDll2ij
-                             Changed "for each point" loop in GDll2ij to 
-                                return -2147483648.0 for xVal and yVal if 
-                                for_trans returned an error instead of 
+                             Changed "for each point" loop in GDll2ij to
+                                return -2147483648.0 for xVal and yVal if
+                                for_trans returned an error instead of
                                 returning an error to the caller
                                 (Note: MAXLONG is defined as 2147483647.0 in
                                  function cproj.c of GCTP)
-                             Added code in GDij2ll to use for_trans to 
-                                translate the BCEA corner points from packed 
+                             Added code in GDij2ll to use for_trans to
+                                translate the BCEA corner points from packed
                                 degrees to meters
-                             Removed declarations for unused variables 
-                                BCEA_scale, r0, s0, xMtr, yMtr, epsilon, 
-                                beta, qp_cea, kz_cea, eccen, eccen_sq, 
-                                phi1, sinphi1, cosphi1, lon, lat, xcor, 
+                             Removed declarations for unused variables
+                                BCEA_scale, r0, s0, xMtr, yMtr, epsilon,
+                                beta, qp_cea, kz_cea, eccen, eccen_sq,
+                                phi1, sinphi1, cosphi1, lon, lat, xcor,
                                 ycor, and nlatlon from GDij2ll
                              Removed initialization code for unused variables
                                 in GDij2ll
-                             Added declarations for xMtr0, yMtr0, xMtr1, and 
+                             Added declarations for xMtr0, yMtr0, xMtr1, and
                                 yMtr1 in GDij2ll
                              Added special-case code for BCEA
-                             Changed "for each point" loop in GDij2ll to 
-                                return PGSd_GCT_IN_ERROR (1.0e51) for 
-                                longitude and latitude values if inv_trans 
-                                returned an error instead of return an error 
+                             Changed "for each point" loop in GDij2ll to
+                                return PGSd_GCT_IN_ERROR (1.0e51) for
+                                longitude and latitude values if inv_trans
+                                returned an error instead of return an error
                                 to the caller
-                             Removed declaration for unused variable ii in 
+                             Removed declaration for unused variable ii in
                                 GDgetpixvalues
-                             Removed declaration for unused variable 
+                             Removed declaration for unused variable
                                 numTileDims in GDtileinfo
-                             Added error message and error return at the 
+                             Added error message and error return at the
                                 end of GDll2mm_cea
                              Added return statement to GDll2mm_cea
 ******************************************************************************/
@@ -109,7 +109,7 @@ static char  GDXSDdims[HDFE_DIMBUFSIZE];
 
 #define NGRID 200
 /* Grid Structure External Arrays */
-struct gridStructure 
+struct gridStructure
 {
     int32 active;
     int32 IDTable;
@@ -147,10 +147,10 @@ struct gridRegion
 static struct gridRegion *GDXRegion[NGRIDREGN];
 
 /* define a macro for the string size of the utility strings and some dimension
-   list strings. The value of 80 in the previous version of this code 
-   may not be enough in some cases. The length now is 512 which seems to 
+   list strings. The value of 80 in the previous version of this code
+   may not be enough in some cases. The length now is 512 which seems to
    be more than enough to hold larger strings. */
-   
+
 #define UTLSTR_MAX_SIZE 512
 
 /* Static projection table */
@@ -221,7 +221,7 @@ static const char * const pixregNames[] = {
 
 /* Grid Function Prototypes (internal routines) */
 static intn GDchkgdid(int32, const char *, int32 *, int32 *, int32 *);
-static intn GDSDfldsrch(int32, int32, const char *, int32 *, int32 *, 
+static intn GDSDfldsrch(int32, int32, const char *, int32 *, int32 *,
                         int32 *, int32 *, int32 [], int32 *);
 static intn GDwrrdfield(int32, const char *, const char *,
                         int32 [], int32 [], int32 [], VOIDP datbuf);
@@ -471,7 +471,7 @@ GDcreate(int32 fid, const char *gridname, int32 xdimsize, int32 ydimsize,
 			"\t\tYDim=", (int)ydimsize, "\n");
 
 
-		snprintf(footer, sizeof(footer), 
+		snprintf(footer, sizeof(footer),
 			"%s%s%s%s%s%s%s%d%s",
 			"\t\tGROUP=Dimension\n",
 			"\t\tEND_GROUP=Dimension\n",
@@ -673,13 +673,13 @@ GDattach(int32 fid, const char *gridname)
 		    /* ----------------------------------------------------- */
 		    tags = (int32 *) malloc(sizeof(int32) * 2);
 		    if(tags == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDattach", __FILE__, __LINE__);
 			return(-1);
 		    }
 		    refs = (int32 *) malloc(sizeof(int32) * 2);
 		    if(refs == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDattach", __FILE__, __LINE__);
 			free(tags);
 			return(-1);
@@ -730,13 +730,13 @@ GDattach(int32 fid, const char *gridname)
 			/* ----------------------------------------- */
 			tags = (int32 *) malloc(sizeof(int32) * nObjects);
 			if(tags == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"GDattach", __FILE__, __LINE__);
 			    return(-1);
 			}
 			refs = (int32 *) malloc(sizeof(int32) * nObjects);
 			if(refs == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"GDattach", __FILE__, __LINE__);
 			    free(tags);
 			    return(-1);
@@ -755,7 +755,7 @@ GDattach(int32 fid, const char *gridname)
 			}
 			GDXGrid[i].sdsID = (int32 *) calloc(nSDS, 4);
 			if(GDXGrid[i].sdsID == NULL && nSDS != 0)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"GDattach", __FILE__, __LINE__);
 			    free(tags);
 			    free(refs);
@@ -882,7 +882,10 @@ GDchkgdid(int32 gridID, const char *routname,
 	/* Compute "reduced" ID */
 	/* -------------------- */
 	gID = gridID % idOffset;
-
+	if (gID >= NGRID)
+	{
+	   return -1;
+	}
 
 	/* Check for active grid ID */
 	/* ------------------------ */
@@ -971,11 +974,17 @@ GDdefdim(int32 gridID, const char *dimname, int32 dim)
     /* -------------------------------------- */
     if (status == 0)
     {
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+		return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
         /* The cast to char* is somehow nasty since EHinsertmeta can modify */
         /* dimname, but not in this case since we call with metacode = 0 */
+	int32 dimArray[1] = { dim };
 	status = EHinsertmeta(sdInterfaceID, gridname, "g", 0L,
-			      (char*) dimname, &dim);
+			      (char*) dimname, dimArray);
     }
     return (status);
 
@@ -1052,26 +1061,27 @@ GDdefproj(int32 gridID, int32 projcode, int32 zonecode, int32 spherecode,
 
 	    for (i = 0; i < 13; i++)
 	    {
+        char utlbufSmall[32];
 		/* If projparm[i] = 0 ... */
 		if (projparm[i] == 0.0)
 		{
-		    strcpy(utlbuf, "0,");
+		    strcpy(utlbufSmall, "0,");
 		}
 		else
 		{
 		    /* if projparm[i] is integer ... */
 		    if ((int32) projparm[i] == projparm[i])
 		    {
-			snprintf(utlbuf, sizeof(utlbuf), "%d%s",
+			snprintf(utlbufSmall, sizeof(utlbufSmall), "%d%s",
 				(int) projparm[i], ",");
 		    }
 		    /* else projparm[i] is non-zero floating point ... */
 		    else
 		    {
-			CPLsnprintf(utlbuf, sizeof(utlbuf), "%f%s",	projparm[i], ",");
+			CPLsnprintf(utlbufSmall, sizeof(utlbufSmall), "%f%s",	projparm[i], ",");
 		    }
 		}
-		strcat(projparmbuf, utlbuf);
+		strcat(projparmbuf, utlbufSmall);
 	    }
 	    slen = (int)strlen(projparmbuf);
 
@@ -1116,7 +1126,12 @@ GDdefproj(int32 gridID, int32 projcode, int32 zonecode, int32 spherecode,
 
 	/* Insert in structural metadata */
 	/* ----------------------------- */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	    return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 	status = EHinsertmeta(sdInterfaceID, gridname, "g", 101L,
 			      utlbuf, NULL);
     }
@@ -1186,7 +1201,12 @@ GDblkSOMoffset(int32 gridID, float32 offset[], int32 count, const char *code)
 	/* If SOM projection with projparm[11] non-zero ... */
 	if (projcode == GCTP_SOM && projparm[11] != 0)
 	{
-	    Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+		int gID = gridID % idOffset;
+		if (gID >= NGRID)
+		{
+			return -1;
+		}
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 	    snprintf(utlbuf, sizeof(utlbuf),"%s%s", "_BLKSOM:", gridname);
 
 	    /* Write offset values as attribute */
@@ -1252,7 +1272,10 @@ GDdefcomp(int32 gridID, int32 compcode, intn compparm[])
     if (status == 0)
     {
 	gID = gridID % idOffset;
-
+	if (gID >= NGRID)
+	{
+		return -1;
+	}
 	/* Set compression code in compression external array */
 	GDXGrid[gID].compcode = compcode;
 
@@ -1334,6 +1357,8 @@ GDdeftile(int32 gridID, int32 tilecode, int32 tilerank, int32 tiledims[])
     if (status == 0)
     {
 	gID = gridID % idOffset;
+	if (gID >= NGRID)
+		return -1;
 
 	for (i = 0; i < 8; i++)
 	{
@@ -1431,12 +1456,17 @@ GDdeforigin(int32 gridID, int32 origincode)
     {
 	/* If proper origin code then write to structural metadata */
 	/* ------------------------------------------------------- */
-	if (origincode >= 0 && origincode < (int32)sizeof(originNames))
+	if (origincode >= 0 && origincode < (int32)(sizeof(originNames) / sizeof(originNames[0])))
 	{
+	    int gID = gridID % idOffset;
+	    if (gID >= NGRID)
+	    {
+	        return -1;
+	    }
 	    snprintf(utlbuf, sizeof(utlbuf),"%s%s%s",
 		    "\t\tGridOrigin=", originNames[origincode], "\n");
 
-	    Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 	    status = EHinsertmeta(sdInterfaceID, gridname, "g", 101L,
 				  utlbuf, NULL);
 	}
@@ -1503,12 +1533,17 @@ GDdefpixreg(int32 gridID, int32 pixregcode)
     {
 	/* If proper pix reg code then write to structural metadata */
 	/* -------------------------------------------------------- */
-	if (pixregcode >= 0 && pixregcode < (int32)sizeof(pixregNames))
+	if (pixregcode >= 0 && pixregcode < (int32)(sizeof(pixregNames) / sizeof(pixregNames[0])))
 	{
+		int gID = gridID % idOffset;
+		if (gID >= NGRID)
+		{
+			return -1;
+		}
 	    snprintf(utlbuf, sizeof(utlbuf),"%s%s%s",
 		    "\t\tPixelRegistration=", pixregNames[pixregcode], "\n");
 
-	    Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 	    status = EHinsertmeta(sdInterfaceID, gridname, "g", 101L,
 				  utlbuf, NULL);
 	}
@@ -1581,7 +1616,7 @@ GDdiminfo(int32 gridID, const char *dimname)
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDdiminfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1599,7 +1634,13 @@ GDdiminfo(int32 gridID, const char *dimname)
     {
 	/* Get grid name */
 	/* ------------- */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
 	/* Get pointers to "Dimension" section within SM */
@@ -1611,7 +1652,7 @@ GDdiminfo(int32 gridID, const char *dimname)
 	{
 	    free(utlstr);
 	    return(-1);
-	} 
+	}
 
 	/* Search for dimension name (surrounded by quotes) */
 	/* ------------------------------------------------ */
@@ -1711,7 +1752,7 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDgridinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1723,7 +1764,13 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
     {
 	/* Get grid name */
 	/* ------------- */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
 	/* Get pointers to grid structure section within SM */
@@ -1735,7 +1782,7 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 
 	/* Get xdimsize if requested */
@@ -1904,7 +1951,7 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDprojinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1917,7 +1964,14 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
     {
 	/* Get grid name */
 	/* ------------- */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
 	/* Get pointers to grid structure section within SM */
@@ -1929,7 +1983,7 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 
 	/* Get projcode if requested */
@@ -1969,7 +2023,7 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 
 	/* Get zonecode if requested */
 	/* ------------------------- */
-	if (zonecode != NULL)
+	if (projcode && zonecode != NULL)
 	{
 	    *zonecode = -1;
 
@@ -1996,7 +2050,7 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 
 	/* Get projection parameters if requested */
 	/* -------------------------------------- */
-	if (projparm != NULL)
+	if (projcode && projparm != NULL)
 	{
 
 	    /*
@@ -2052,7 +2106,7 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 
 	/* Get spherecode if requested */
 	/* --------------------------- */
-	if (spherecode != NULL)
+	if (projcode && spherecode != NULL)
 	{
 	    *spherecode = 0;
 
@@ -2127,7 +2181,7 @@ GDorigininfo(int32 gridID, int32 * origincode)
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDorigininfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -2150,7 +2204,14 @@ GDorigininfo(int32 gridID, int32 * origincode)
 
 	/* Get grid name */
 	/* ------------- */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
 	/* Get pointers to grid structure section within SM */
@@ -2162,7 +2223,7 @@ GDorigininfo(int32 gridID, int32 * origincode)
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 
 	statmeta = EHgetmetavalue(metaptrs, "GridOrigin", utlstr);
@@ -2173,7 +2234,7 @@ GDorigininfo(int32 gridID, int32 * origincode)
 	     * If "GridOrigin" string found in metadata then convert to
 	     * numeric origin code (fixed added: Jan 97)
 	     */
-	    for (i = 0; i < (intn)sizeof(originNames); i++)
+	    for (i = 0; i < (intn)(sizeof(originNames) / sizeof(originNames[0])); i++)
 	    {
 		if (strcmp(utlstr, originNames[i]) == 0)
 		{
@@ -2249,7 +2310,7 @@ GDpixreginfo(int32 gridID, int32 * pixregcode)
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDpixreginfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -2266,7 +2327,14 @@ GDpixreginfo(int32 gridID, int32 * pixregcode)
 	*pixregcode = 0;
 
 	/* Get grid name */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 	/* Get pointers to grid structure section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
@@ -2276,7 +2344,7 @@ GDpixreginfo(int32 gridID, int32 * pixregcode)
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 
 	statmeta = EHgetmetavalue(metaptrs, "PixelRegistration", utlstr);
@@ -2288,7 +2356,7 @@ GDpixreginfo(int32 gridID, int32 * pixregcode)
 	     * to numeric origin code (fixed added: Jan 97)
 	     */
 
-	    for (i = 0; i < (intn)sizeof(pixregNames); i++)
+	    for (i = 0; i < (intn)(sizeof(pixregNames) / sizeof(pixregNames[0])); i++)
 	    {
 		if (strcmp(utlstr, pixregNames[i]) == 0)
 		{
@@ -2358,7 +2426,7 @@ GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDcompinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -2369,7 +2437,13 @@ GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[
     if (status == 0)
     {
 	/* Get grid name */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+		free(utlstr);
+		return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 	/* Get pointers to "DataField" section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
@@ -2378,7 +2452,7 @@ GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 
 	/* Search for field */
@@ -2407,7 +2481,7 @@ GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[
 		if (statmeta == 0)
 		{
 		    /* Loop through compression types until match */
-		    for (i = 0; i < (intn)sizeof(HDFcomp); i++)
+		    for (i = 0; i < (intn)(sizeof(HDFcomp) / sizeof(HDFcomp[0])); i++)
 		    {
 			if (strcmp(utlstr, HDFcomp[i]) == 0)
 			{
@@ -2556,7 +2630,7 @@ GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDfieldinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -2567,8 +2641,13 @@ GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
 
     if (status == 0)
     {
-
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	    free(utlstr);
+	    return -1;
+    }
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
 				       "DataField", metaptrs);
@@ -2576,7 +2655,7 @@ GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 
 	/* Search for field */
@@ -2819,6 +2898,10 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
     {
 	/* Remove offset from grid ID & get gridname */
 	gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	    return -1;
+	}
 	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
@@ -2826,13 +2909,13 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
 	/* ---------------------------------------------------------------- */
 	dimbuf = (char *) calloc(strlen(dimlist) + 64, 1);
 	if(dimbuf == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
 	    return(-1);
 	}
 	dimlist0 = (char *) calloc(strlen(dimlist) + 64, 1);
 	if(dimlist0 == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
 	    free(dimbuf);
 	    return(-1);
@@ -2897,7 +2980,7 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
 	    /* ------------------------------------- */
 	    dimcheck = (char *) calloc(comma - dimbuf + 1, 1);
 	    if(dimcheck == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
 		free(dimbuf);
 		free(dimlist0);
@@ -2954,12 +3037,13 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
 		foundAllDim = 0;
 		if (first == 1)
 		{
-		    strcpy(utlbuf, dimcheck);
+		    snprintf(utlbuf, sizeof(utlbuf), "%s", dimcheck);
 		}
 		else
 		{
-		    strcat(utlbuf, ",");
-		    strcat(utlbuf, dimcheck);
+		    char utlbufTmp[sizeof(utlbuf)];
+		    strcpy(utlbufTmp, utlbuf);
+		    CPLsnprintf(utlbuf, sizeof(utlbuf), "%s,%s", utlbufTmp, dimcheck);
 		}
 		first = 0;
 	    }
@@ -2981,7 +3065,7 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
 	{
 /* if ((intn) strlen(fieldname) > MAX_NC_NAME - 7)
 ** this was changed because HDF4.1r3 made a change in the
-** hlimits.h file.  We have notified NCSA and asked to have 
+** hlimits.h file.  We have notified NCSA and asked to have
 ** it made the same as in previous versions of HDF
 ** see ncr 26314.  DaW  Apr 2000
 */
@@ -3299,7 +3383,7 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
 			realloc((void *) GDXGrid[gID].sdsID,
 				(GDXGrid[gID].nSDS + 1) * 4);
 		    if(GDXGrid[gID].sdsID == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
 			free(dimlist0);
 			return(-1);
@@ -3311,7 +3395,7 @@ GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
 		    /* -------------------- */
 		    GDXGrid[gID].sdsID = (int32 *) calloc(1, 4);
 		    if(GDXGrid[gID].sdsID == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
 			free(dimlist0);
 			return(-1);
@@ -3474,9 +3558,16 @@ GDwritefieldmeta(int32 gridID, const char *fieldname, const char *dimlist,
     {
 	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
 
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   return -1;
+	}
+
+	Vgetname(GDXGrid[gID].IDTable, gridname);
+	int32 numbertypeArray[1] = { numbertype };
 	status = EHinsertmeta(sdInterfaceID, gridname, "g", 4L,
-			      utlbuf, &numbertype);
+			      utlbuf, numbertypeArray);
     }
     return (status);
 }
@@ -3548,7 +3639,7 @@ GDSDfldsrch(int32 gridID, int32 sdInterfaceID, const char *fieldname,
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDSDfldsrch", __FILE__, __LINE__);
 	return(-1);
     }
@@ -3560,7 +3651,11 @@ GDSDfldsrch(int32 gridID, int32 sdInterfaceID, const char *fieldname,
     /* Compute "reduced" grid ID */
     /* ------------------------- */
     gID = gridID % idOffset;
-
+    if (gID >= NGRID)
+    {
+        free(utlstr);
+        return -1;
+    }
 
     /* Loop through all SDSs in grid */
     /* ----------------------------- */
@@ -3594,7 +3689,7 @@ GDSDfldsrch(int32 gridID, int32 sdInterfaceID, const char *fieldname,
 		{
 		    free(utlstr);
 		    return(-1);
-		}  
+		}
 
 #ifdef broken_logic
 		/* Initialize metaptr to beg. of section */
@@ -4133,7 +4228,12 @@ GDwrrdattr(int32 gridID, const char *attrname, int32 numbertype, int32 count,
     {
 	/* Perform Attribute I/O */
 	/* --------------------- */
-	attrVgrpID = GDXGrid[gridID % idOffset].VIDTable[1];
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+		return -1;
+	}
+	attrVgrpID = GDXGrid[gID].VIDTable[1];
 	status = EHattr(fid, attrVgrpID, attrname, numbertype, count,
 			wrcode, datbuf);
     }
@@ -4279,7 +4379,12 @@ GDattrinfo(int32 gridID, const char *attrname, int32 * numbertype, int32 * count
 
     status = GDchkgdid(gridID, "GDattrinfo", &fid, &dum, &dum);
 
-    attrVgrpID = GDXGrid[gridID % idOffset].VIDTable[1];
+    int gID = gridID % idOffset;
+    if (gID >= NGRID)
+    {
+        return -1;
+    }
+    attrVgrpID = GDXGrid[gID].VIDTable[1];
 
     status = EHattrinfo(fid, attrVgrpID, attrname, numbertype,
 			count);
@@ -4343,7 +4448,12 @@ GDinqattrs(int32 gridID, char *attrnames, int32 * strbufsize)
 
     if (status == 0)
     {
-	attrVgrpID = GDXGrid[gridID % idOffset].VIDTable[1];
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	    return -1;
+    }
+	attrVgrpID = GDXGrid[gID].VIDTable[1];
 	nattr = EHattrcat(fid, attrVgrpID, attrnames, strbufsize);
     }
 
@@ -4420,7 +4530,7 @@ GDinqdims(int32 gridID, char *dimnames, int32 dims[])
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDinqdims", __FILE__, __LINE__);
 	return(-1);
     }
@@ -4436,7 +4546,13 @@ GDinqdims(int32 gridID, char *dimnames, int32 dims[])
 	{
 	    /* Get grid name */
 	    /* ------------- */
-	    Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	    int gID = gridID % idOffset;
+	    if (gID >= NGRID)
+	    {
+	       free(utlstr);
+	       return -1;
+	    }
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
 	    /* Get pointers to "Dimension" section within SM */
@@ -4447,8 +4563,8 @@ GDinqdims(int32 gridID, char *dimnames, int32 dims[])
 	    {
 		free(utlstr);
 		return(-1);
-	    }  
-	    
+	    }
+
 
 	    /* If dimension names are requested then "clear" name buffer */
 	    /* --------------------------------------------------------- */
@@ -4576,7 +4692,7 @@ GDinqfields(int32 gridID, char *fieldlist, int32 rank[],
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDinqfields", __FILE__, __LINE__);
 	return(-1);
     }
@@ -4592,7 +4708,13 @@ GDinqfields(int32 gridID, char *fieldlist, int32 rank[],
 	{
 	    /* Get grid name */
 	    /* ------------- */
-	    Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	    int gID = gridID % idOffset;
+	    if (gID >= NGRID)
+	    {
+	       free(utlstr);
+	       return -1;
+	    }
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
 	    /* Get pointers to "DataField" section within SM */
@@ -4603,7 +4725,7 @@ GDinqfields(int32 gridID, char *fieldlist, int32 rank[],
 	    {
 		free(utlstr);
 		return(-1);
-	    }  
+	    }
 
 
 	    /* If field names are desired then "clear" name buffer */
@@ -4757,16 +4879,18 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
     int32           nVal = 0;	/* Number of strings to search for */
 
     char           *metabuf = NULL;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char           *metaptrs[2] = {NULL, NULL};/* Pointers to begin and end of SM section */
     char            gridname[80];	/* Grid Name */
     char           *utlstr;/* Utility string */
     char            valName[2][32];	/* Strings to search for */
 
+    memset(valName, 0, sizeof(valName));
+
     /* Allocate space for utility string */
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDnentries", __FILE__, __LINE__);
 	return(-1);
     }
@@ -4775,7 +4899,14 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
     if (status == 0)
     {
 	/* Get grid name */
-	Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 	/* Zero out string buffer size */
 	*strbufsize = 0;
@@ -4795,8 +4926,8 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
 		{
 		    free(utlstr);
 		    return(-1);
-		}  
-		
+		}
+
 		nVal = 1;
 		strcpy(&valName[0][0], "DimensionName");
 	    }
@@ -4810,7 +4941,7 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
 		{
 		    free(utlstr);
 		    return(-1);
-		}  
+		}
 
 		nVal = 1;
 		strcpy(&valName[0][0], "DataFieldName");
@@ -4818,6 +4949,11 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
 	    break;
 	}
 
+	if (!metabuf || metaptrs[0] == NULL)
+    {
+        free(metabuf);
+        return -1;
+    }
 
 	/*
 	 * Check for presence of 'GROUP="' string If found then old metadata,
@@ -5181,6 +5317,10 @@ GDdetach(int32 gridID)
     if (status == 0)
     {
 	gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   return -1;
+	}
 	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 	/* SDS combined fields */
@@ -5193,20 +5333,20 @@ GDdetach(int32 gridID)
 	    /* ---------------------------------------------------- */
 	    nameptr = (char **) calloc(1, sizeof(char *));
 	    if(nameptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		return(-1);
 	    }
 	    namelen = (int32 *) calloc(1, sizeof(int32));
 	    if(namelen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		return(-1);
 	    }
 	    nameptr0 = (char **) calloc(1, sizeof(char *));
 	    if(nameptr0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5214,7 +5354,7 @@ GDdetach(int32 gridID)
 	    }
 	    namelen0 = (int32 *) calloc(1, sizeof(int32));
 	    if(namelen0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5223,7 +5363,7 @@ GDdetach(int32 gridID)
 	    }
 	    dimptr = (char **) calloc(1, sizeof(char *));
 	    if(dimptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5233,7 +5373,7 @@ GDdetach(int32 gridID)
 	    }
 	    dimlen = (int32 *) calloc(1, sizeof(int32));
 	    if(dimlen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5244,7 +5384,7 @@ GDdetach(int32 gridID)
 	    }
 	    offset = (int32 *) calloc(1, sizeof(int32));
 	    if(offset == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5256,7 +5396,7 @@ GDdetach(int32 gridID)
 	    }
 	    indvdims = (int32 *) calloc(1, sizeof(int32));
 	    if(indvdims == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5286,20 +5426,20 @@ GDdetach(int32 gridID)
 	    /* ----------------------------------------- */
 	    nameptr = (char **) calloc(nflds, sizeof(char *));
 	    if(nameptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		return(-1);
 	    }
 	    namelen = (int32 *) calloc(nflds, sizeof(int32));
 	    if(namelen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		return(-1);
 	    }
 	    nameptr0 = (char **) calloc(nflds, sizeof(char *));
 	    if(nameptr0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5307,7 +5447,7 @@ GDdetach(int32 gridID)
 	    }
 	    namelen0 = (int32 *) calloc(nflds, sizeof(int32));
 	    if(namelen0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5316,7 +5456,7 @@ GDdetach(int32 gridID)
 	    }
 	    dimptr = (char **) calloc(nflds, sizeof(char *));
 	    if(dimptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5326,7 +5466,7 @@ GDdetach(int32 gridID)
 	    }
 	    dimlen = (int32 *) calloc(nflds, sizeof(int32));
 	    if(dimlen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5337,7 +5477,7 @@ GDdetach(int32 gridID)
 	    }
 	    offset = (int32 *) calloc(nflds, sizeof(int32));
 	    if(offset == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5349,7 +5489,7 @@ GDdetach(int32 gridID)
 	    }
 	    indvdims = (int32 *) calloc(nflds, sizeof(int32));
 	    if(indvdims == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -5375,7 +5515,7 @@ GDdetach(int32 gridID)
 	    {
 		nambuf = (char *) calloc(strlen(GDXSDname) + 1, 1);
 		if(nambuf == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		    free(nameptr);
 		    free(namelen);
@@ -5384,11 +5524,12 @@ GDdetach(int32 gridID)
 		    free(dimptr);
 		    free(dimlen);
 		    free(offset);
+		    free(indvdims);
 		    return(-1);
 		}
 		utlbuf = (char *) calloc(strlen(GDXSDname) * 2 + 7, 1);
 		if(utlbuf == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
 		    free(nambuf);
 		    free(nameptr);
@@ -5398,6 +5539,7 @@ GDdetach(int32 gridID)
 		    free(dimptr);
 		    free(dimlen);
 		    free(offset);
+		    free(indvdims);
 		    return(-1);
 		}
 
@@ -5783,7 +5925,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 
     float64         lon, lat, plat, x, y;
     float64         plon, tlon, llon, rlon, pplon, LLon, LLat, RLon, RLat;
-    
+
 
     /* invoke GCTP initialization routine */
     /* ---------------------------------- */
@@ -5823,7 +5965,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
       LLat = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LAT, HDFE_DEG_RAD);
       RLon = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LON, HDFE_DEG_RAD);
       RLat = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LAT, HDFE_DEG_RAD);
- 
+
       errorcode = for_trans[projcode] (LLon, LLat, &x, &y);
       if (errorcode != 0)
       {
@@ -5834,7 +5976,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
       }
         upleftpt[0] = x;
         upleftpt[1] = y;
- 
+
       errorcode = for_trans[projcode] (RLon, RLat, &x, &y);
       if (errorcode != 0)
       {
@@ -5845,10 +5987,10 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
       }
       lowrightpt[0] = x;
       lowrightpt[1] = y;
- 
+
     }
- 
-    
+
+
     /* Compute Default Boundary Points for Polar Sterographic */
     /* ------------------------------------------------------ */
     if (projcode == GCTP_PS &&
@@ -5907,7 +6049,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 	}
 
 	upleftpt[0] = x;
-	
+
 	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
 	if (errorcode != 0)
 	{
@@ -5918,7 +6060,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 	}
 
 	lowrightpt[0] = x;
-	
+
 	/*
 	 * Compute the upperleft and lowright y values based on the south or
 	 * north polar projection
@@ -5936,7 +6078,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 	    }
 
 	    upleftpt[1] = y;
-	    
+
 	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
 	    if (errorcode != 0)
 	    {
@@ -5947,7 +6089,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 	    }
 
 	    lowrightpt[1] = y;
-	    
+
 	}
 	else
 	{
@@ -5961,7 +6103,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 	    }
 
 	    upleftpt[1] = y;
-	    
+
 	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
 	    if (errorcode != 0)
 	    {
@@ -5972,7 +6114,7 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 	    }
 
 	    lowrightpt[1] = y;
-	  
+
 	}
     }
 
@@ -6394,8 +6536,8 @@ GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
 	       of r_major and r_minor) using GCTP */
 	    /* ----------------------------------------- */
 	    errorcode = for_trans[projcode] (lonrad0, latrad0, &xMtr0, &yMtr0);
-	    
-	    
+
+
 	    /* Report error if any */
 	    /* ------------------- */
 	    if (errorcode != 0)
@@ -6410,8 +6552,8 @@ GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
 	       of r_major and r_minor) using GCTP */
 	    /* ----------------------------------------- */
 	    errorcode = for_trans[projcode] (lonrad, latrad, &xMtr1, &yMtr1);
-	    
-	    
+
+
 	    /* Report error if any */
 	    /* ------------------- */
 	    if (errorcode != 0)
@@ -6478,7 +6620,7 @@ GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
 		/* ----------------------------------------- */
 		errorcode = for_trans[projcode] (lonrad, latrad, &xMtr, &yMtr);
 
-		
+
 		/* Report error if any */
 		/* ------------------- */
 		if (errorcode != 0)
@@ -6494,13 +6636,13 @@ GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
 		else {
 		  /* if projection is BCEA normalize x and y by cell size and
 		     measure it from the upperleft corner of the grid */
-		  
+
 		  /* Compute scaled distance to point from origin */
 		  /* -------------------------------------------- */
 		  if(  projcode == GCTP_BCEA)
 		    {
 		      xVal = (xMtr - xMtr0) / scaleX;
-		      yVal = (yMtr - yMtr0) / scaleY; 
+		      yVal = (yMtr - yMtr0) / scaleY;
 		    }
 		  else
 		    {
@@ -6602,9 +6744,9 @@ GDrs2ll(int32 projcode, float64 projparm[],
     float64         eccen, eccen_sq;
     float64         phi1, sinphi1, cosphi1;
     float64         scaleX, scaleY;
-    
+
     int32           zonecode=0;
-    
+
     int32           spherecode=0;
     float64         lon[2],lat[2];
     float64         xcor[2], ycor[2];
@@ -6621,7 +6763,7 @@ GDrs2ll(int32 projcode, float64 projparm[],
 	  }
 	else
 	  {
-	    qp_cea = 
+	    qp_cea =
 	      (1.0 - eccen_sq)*((1.0/(1.0 - eccen_sq))-(1.0/(2.0*eccen))*
 				log((1.0 - eccen)/(1.0 + eccen)));
 	  }
@@ -6630,7 +6772,7 @@ GDrs2ll(int32 projcode, float64 projparm[],
 	sinphi1 = sin(phi1);
 	kz_cea = cosphi1/(sqrt(1.0 - (eccen_sq*sinphi1*sinphi1)));
     }
-    
+
 
 
 
@@ -6690,10 +6832,10 @@ GDrs2ll(int32 projcode, float64 projparm[],
     /* ------------------------------------------------------ */
     if (projcode == GCTP_BCEA)
     {
-	
+
 	inv_init(projcode, 0, projparm, 0, NULL, NULL,
 		 &errorcode, inv_trans);
-	
+
 	/* Report error if any */
 	/* ------------------- */
 	if (errorcode != 0)
@@ -6708,7 +6850,7 @@ GDrs2ll(int32 projcode, float64 projparm[],
 	    /* ------------------ */
 	  for (i = 0; i < npnts; i++)
 	    {
-	      /* Convert from EASE grid's (r,s) to lon/lat (radians) 
+	      /* Convert from EASE grid's (r,s) to lon/lat (radians)
 		 using GCTP */
 	      /* --------------------------------------------------- */
 	      nlatlon = 2;
@@ -6716,32 +6858,32 @@ GDrs2ll(int32 projcode, float64 projparm[],
 	      lon[1] = lowright[0];
 	      lat[0] = upleft[1];
 	      lat[1] = lowright[1];
-	      status = 
+	      status =
 		GDll2mm_cea(projcode,zonecode,spherecode,projparm,
 			    xdimsize, ydimsize,
 			    upleft, lowright, nlatlon,
 			    lon, lat,
 			    xcor, ycor, &scaleX, &scaleY);
-	      
+
 	      if (status == -1)
 		{
 		  HEpush(DFE_GENAPP, "GDrs2ll", __FILE__, __LINE__);
 		  return (status);
 		}
-	      
+
 	      xMtr = (r[i]/ scaleX + pixadjX - 0.5)* scaleX;
 	      yMtr = - (s[i]/fabs(scaleY) + pixadjY - 0.5)* fabs(scaleY);
 
-	      
-	      /* allow .5 cell tolerance in arcsin function 
+
+	      /* allow .5 cell tolerance in arcsin function
 		 (used in bceainv function) so that grid
 		 coordinates which are less than .5 cells
-		 above 90.00N or below 90.00S are given lat of 90.00 
+		 above 90.00N or below 90.00S are given lat of 90.00
 	      */
 
 	      epsilon = 1 + 0.5 * (fabs(scaleY)/projparm[0]);
 	      beta = 2.0 * (yMtr - projparm[7]) * kz_cea/(projparm[0] * qp_cea);
-	      
+
 	      if( fabs (beta) > epsilon)
 		{
 		  status = -1;
@@ -6768,7 +6910,7 @@ GDrs2ll(int32 projcode, float64 projparm[],
 		  errorcode = inv_trans[projcode] (xMtr, yMtr,
 						   &lonrad, &latrad);
 		}
-	      
+
 	      /* Report error if any */
 	      /* ------------------- */
 	      if (errorcode != 0)
@@ -6778,7 +6920,7 @@ GDrs2ll(int32 projcode, float64 projparm[],
 		  HEreport("GCTP Error: %d\n", errorcode);
 		  return (status);
 		}
-	      
+
 	      /* Convert from radians to decimal degrees */
 	      /* --------------------------------------- */
 	      longitude[i] = EHconvAng(lonrad, HDFE_RAD_DEG);
@@ -6789,7 +6931,7 @@ GDrs2ll(int32 projcode, float64 projparm[],
 
 
 
-    
+
     return (status);
 }
 
@@ -7063,13 +7205,13 @@ GDtangentpnts(int32 projcode, float64 projparm[], float64 cornerlon[],
     {
       case GCTP_MERCAT:
 	{
-	    /* No need for tangent points, since MERCAT projection 
+	    /* No need for tangent points, since MERCAT projection
 	       is rectangular */
 	}
 	break;
       case GCTP_BCEA:
 	{
-	    /* No need for tangent points, since BCEA projection 
+	    /* No need for tangent points, since BCEA projection
 	       is rectangular */
 	}
 	break;
@@ -7664,13 +7806,13 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 
     utlbuf = (char *)calloc(128, sizeof(char));
     if(utlbuf == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDdefboxregion", __FILE__, __LINE__);
 	return(-1);
     }
     gridname = (char *)calloc(128, sizeof(char));
     if(gridname == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDdefboxregion", __FILE__, __LINE__);
 	free(utlbuf);
 	return(-1);
@@ -7688,8 +7830,8 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 	/* ------------- */
 	status = GDgridinfo(gridID, &xdimsize, &ydimsize,
 			    upleftpt, lowrightpt);
-	
-	
+
+
 	/* If error then bail */
 	/* ------------------ */
 	if (status != 0)
@@ -7760,11 +7902,19 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 	/* ------------------------------------------------- */
 	status = GDtangentpnts(projcode, projparm, cornerlon, cornerlat,
 			       longitude, latitude, &npnts);
- 
+
         /* If SOM projection with projparm[11] non-zero ... */
         if (projcode == GCTP_SOM && projparm[11] != 0)
         {
-            Vgetname(GDXGrid[gridID % idOffset].IDTable, gridname);
+            int gID = gridID % idOffset;
+            if (gID >= NGRID)
+            {
+               free(utlbuf);
+               free(gridname);
+               return -1;
+            }
+
+            Vgetname(GDXGrid[gID].IDTable, gridname);
             snprintf(utlbuf, 128, "%s%s", "_BLKSOM:", gridname);
 	    status = GDreadattr(gridID, utlbuf, offset);
 
@@ -7828,7 +7978,7 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 
 	        /* Check whether subset region is outside grid region */
 	        /* -------------------------------------------------- */
-	        if (minCol >= xdimsize || minRow >= ydimsize || 
+	        if (minCol >= xdimsize || minRow >= ydimsize ||
 		    maxCol < 0 || maxRow < 0)
 	        {
                    if ( blockindexstart == -1 && (projparm[11]) == j)
@@ -7944,7 +8094,7 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 		    GDXRegion[i] = (struct gridRegion *)
 			calloc(1, sizeof(struct gridRegion));
 		    if(GDXRegion[i] == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDdefboxregion", __FILE__, __LINE__);
 			free(utlbuf);
 			free(gridname);
@@ -8037,7 +8187,7 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 		      lon[1] = lowrightpt[0];
 		      lat[0] = upleftpt[1];
 		      lat[1] = lowrightpt[1];
-		      status = 
+		      status =
 			GDll2mm_cea(projcode,zonecode,spherecode,projparm,
 				    xdimsize, ydimsize,
 				    upleftpt, lowrightpt,nlatlon,
@@ -8045,8 +8195,8 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 				    xcor, ycor, &xscale, &yscale);
 		      upleftpt_m[0] = xcor[0];
 		      upleftpt_m[1] = ycor[0];
-		      
-		      
+
+
 		      if (status == -1)
 			{
 			  HEpush(DFE_GENAPP, "GDdefboxregion", __FILE__, __LINE__);
@@ -8077,7 +8227,7 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 			status = GDmm2ll_cea(projcode, zonecode, spherecode,
 					     projparm, xdimsize, ydimsize,
 					     upleftpt, lowrightpt, npnts,
-					     xmtr,  ymtr, 
+					     xmtr,  ymtr,
 					     longitude, latitude);
 			if (status == -1)
 			  {
@@ -8117,17 +8267,17 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
                        }
                        else
                        {
-                          GDXRegion[i]->upleftpt[0] = 
+                          GDXRegion[i]->upleftpt[0] =
 			    (lowrightpt[0] - upleftpt[0])*
 			    (offset[blockindexstart-1]/xdimsize) + upleftpt[0];
-                          GDXRegion[i]->upleftpt[1] = 
+                          GDXRegion[i]->upleftpt[1] =
 			    (lowrightpt[1] - upleftpt[1])*
 			    (blockindexstart+1-1) + upleftpt[1];
 
-                          GDXRegion[i]->lowrightpt[0] = 
+                          GDXRegion[i]->lowrightpt[0] =
 			    (lowrightpt[0] - upleftpt[0])*
 			    (offset[blockindexstart-1]/xdimsize) + lowrightpt[0];
-                          GDXRegion[i]->lowrightpt[1] = 
+                          GDXRegion[i]->lowrightpt[1] =
 			    (lowrightpt[1] - upleftpt[1])*
 			    (blockindexstart+1-1) + lowrightpt[1];
 
@@ -8173,10 +8323,10 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 		    regionID = i;
 		    break;
 		}
-	    
+
 	}
       }
-	    
+
     }
     free(utlbuf);
     free(gridname);
@@ -8771,7 +8921,7 @@ GDdupregion(int32 oldregionID)
 	    GDXRegion[i] = (struct gridRegion *)
 		calloc(1, sizeof(struct gridRegion));
 	    if(GDXRegion[i] == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"GDdupregion", __FILE__, __LINE__);
 		return(-1);
 	    }
@@ -8779,7 +8929,7 @@ GDdupregion(int32 oldregionID)
 
 	    /* Copy old region structure data to new region */
 	    /* -------------------------------------------- */
-	                
+
             GDXRegion[i]->fid = GDXRegion[oldregionID]->fid;
             GDXRegion[i]->gridID = GDXRegion[oldregionID]->gridID;
             GDXRegion[i]->xStart = GDXRegion[oldregionID]->xStart;
@@ -8795,7 +8945,7 @@ GDdupregion(int32 oldregionID)
                 GDXRegion[i]->StartVertical[j] = GDXRegion[oldregionID]->StartVertical[j];
                 GDXRegion[i]->StopVertical[j] = GDXRegion[oldregionID]->StopVertical[j];
             }
-	    
+
             for (j=0; j<8; j++)
             {
                 if(GDXRegion[oldregionID]->DimNamePtr[j] != NULL)
@@ -8805,7 +8955,7 @@ GDdupregion(int32 oldregionID)
                     strcpy(GDXRegion[i]->DimNamePtr[j],GDXRegion[oldregionID]->DimNamePtr[j]);
 		}
             }
-            
+
 
 	    /* Define new region ID */
 	    /* -------------------- */
@@ -8853,6 +9003,7 @@ GDdupregion(int32 oldregionID)
 -----------------------------------------------------------------------------*/
 #define SETGRIDREG \
 \
+regionID = 0; \
 status = GDgridinfo(gridID, &xdimsize, &ydimsize, upleftpt, lowrightpt); \
 for (k = 0; k < NGRIDREGN; k++) \
 { \
@@ -8922,7 +9073,7 @@ GDdefvrtregion(int32 gridID, int32 regionID, const char *vertObj, float64 range[
     /* --------------------------------- */
     dimlist = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(dimlist == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDdefvrtregion", __FILE__, __LINE__);
 	return(-1);
     }
@@ -8952,7 +9103,7 @@ GDdefvrtregion(int32 gridID, int32 regionID, const char *vertObj, float64 range[
 		    GDXRegion[regionID]->DimNamePtr[j] =
 			(char *) malloc(slen + 1);
 		    if(GDXRegion[regionID]->DimNamePtr[j] == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDdefvrtregion", __FILE__, __LINE__);
 			free(dimlist);
 			return(-1);
@@ -8987,7 +9138,7 @@ GDdefvrtregion(int32 gridID, int32 regionID, const char *vertObj, float64 range[
 		    size = DFKNTsize(nt);
 		    vertArr = (char *) calloc(dims[0], size);
 		    if(vertArr == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDdefvrtregion", __FILE__, __LINE__);
 			free(dimlist);
 			return(-1);
@@ -9320,13 +9471,13 @@ GDgetpixels(int32 gridID, int32 nLonLat, float64 lonVal[], float64 latVal[],
 	/* ---------------------------------- */
 	xVal = (float64 *) calloc(nLonLat, sizeof(float64));
 	if(xVal == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"GDgetpixels", __FILE__, __LINE__);
 	    return(-1);
 	}
 	yVal = (float64 *) calloc(nLonLat, sizeof(float64));
 	if(yVal == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"GDgetpixels", __FILE__, __LINE__);
 	    free(xVal);
 	    return(-1);
@@ -9496,7 +9647,7 @@ GDgetpixvalues(int32 gridID, int32 nPixels, int32 pixRow[], int32 pixCol[],
     /* --------------------------------- */
     dimlist = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(dimlist == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDgetpixvalues", __FILE__, __LINE__);
 	return(-1);
     }
@@ -9619,9 +9770,9 @@ GDgetpixvalues(int32 gridID, int32 nPixels, int32 pixRow[], int32 pixCol[],
 
 			/* Set I/O offset and count Section */
 			/* ---------------------- */
-			
+
 			/*
-			 * start and edge != NULL, set I/O offset and count to 
+			 * start and edge != NULL, set I/O offset and count to
 			 * user values, adjusting the
 			 * 0th field with the merged field offset (if any)
 			 */
@@ -9649,12 +9800,12 @@ GDgetpixvalues(int32 gridID, int32 nPixels, int32 pixRow[], int32 pixCol[],
 			    offset[0] = mrgOffset;
 			    count[0] = 1;
 			}
-			
-			
-			
+
+
+
 			/* Set I/O stride Section */
 			/* ---------------------- */
-			
+
 			/* In original code stride entered as NULL.
 			   Abe Taaheri June 12, 1998 */
 			/*
@@ -9664,7 +9815,7 @@ GDgetpixvalues(int32 gridID, int32 nPixels, int32 pixRow[], int32 pixCol[],
 			{
 			    incr[j] = 1;
 			}
-			
+
 
 			/* Read into data buffer */
 			/* --------------------- */
@@ -9784,7 +9935,7 @@ GDinterpolate(int32 gridID, int32 nValues, float64 lonVal[], float64 latVal[],
     /* --------------------------------- */
     dimlist = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(dimlist == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"GDinterpolate", __FILE__, __LINE__);
 	return(-1);
     }
@@ -9963,7 +10114,7 @@ GDinterpolate(int32 gridID, int32 nValues, float64 lonVal[], float64 latVal[],
 		    /* -------------------------------- */
 		    pixVal = (char *) malloc(4 * size);
 		    if(pixVal == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"GDinterpolate", __FILE__, __LINE__);
 			free(dimlist);
 			return(-1);
@@ -10501,7 +10652,7 @@ GDsettilecomp(int32 gridID, const char *fieldname, int32 tilerank, int32*
                tiledims, int32 compcode, intn* compparm)
 {
     intn            status;     /* routine return status variable */
- 
+
     int32           fid;        /* HDF-EOS file ID */
     int32           sdInterfaceID;      /* HDF SDS interface ID */
     int32           gdVgrpID;   /* Grid root Vgroup ID */
@@ -10514,18 +10665,18 @@ GDsettilecomp(int32 gridID, const char *fieldname, int32 tilerank, int32*
     comp_info       c_info;     /* Compression parameter structure */
     HDF_CHUNK_DEF   chunkDef;   /* Tiling structure */
     int32           chunkFlag;  /* Chunking (Tiling) flag */
- 
+
     c_info.nbit.nt = 0;
- 
+
     /* Check for valid grid ID and get SDS interface ID */
     status = GDchkgdid(gridID, "GDsetfillvalue",
                        &fid, &sdInterfaceID, &gdVgrpID);
- 
+
     if (status == 0)
     {
         /* Get field info */
         status = GDfieldinfo(gridID, fieldname, &dum, dims, &nt, NULL);
- 
+
         if (status == 0)
         {
             /* Get SDS ID and solo flag */
@@ -10539,8 +10690,8 @@ GDsettilecomp(int32 gridID, const char *fieldname, int32 tilerank, int32*
             }
             /* Tiling with Compression */
             /* ----------------------- */
- 
- 
+
+
             /* Setup Compression */
             /* ----------------- */
             if (compcode == HDFE_COMP_NBIT)
@@ -10559,19 +10710,19 @@ GDsettilecomp(int32 gridID, const char *fieldname, int32 tilerank, int32*
               {
                 c_info.deflate.level = compparm[0];
               }
- 
+
             /* Setup chunk lengths */
             /* ------------------- */
             for (i = 0; i < tilerank; i++)
               {
                 chunkDef.comp.chunk_lengths[i] = tiledims[i];
               }
- 
+
             /* Setup chunk flag & chunk compression type */
             /* ----------------------------------------- */
             chunkFlag = HDF_CHUNK | HDF_COMP;
             chunkDef.comp.comp_type = compcode;
- 
+
             /* Setup chunk compression parameters */
             /* ---------------------------------- */
             if (compcode == HDFE_COMP_SKPHUFF)
@@ -10673,22 +10824,22 @@ static intn GDll2mm_cea(int32 projcode,int32 zonecode, int32 spherecode,
 		 &errorcode, for_trans);
 	/* Convert upleft and lowright X coords from DMS to radians */
 	/* -------------------------------------------------------- */
-	
+
 	lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
 	lonrad = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
-	
+
 	/* Convert upleft and lowright Y coords from DMS to radians */
 	/* -------------------------------------------------------- */
 	latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
 	latrad = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
-	
+
 	/* Convert from lon/lat to meters(or whatever unit is, i.e unit
 	   of r_major and r_minor) using GCTP */
 	/* ----------------------------------------- */
 	errorcode = for_trans[projcode] (lonrad0, latrad0, &xMtr0, &yMtr0);
 	x[0] = xMtr0;
 	y[0] = yMtr0;
-	
+
 	/* Report error if any */
 	/* ------------------- */
 	if (errorcode != 0)
@@ -10698,14 +10849,14 @@ static intn GDll2mm_cea(int32 projcode,int32 zonecode, int32 spherecode,
 	    HEreport("GCTP Error: %d\n", errorcode);
 	    return (status);
 	  }
-	
+
 	/* Convert from lon/lat to meters(or whatever unit is, i.e unit
 	   of r_major and r_minor) using GCTP */
 	/* ----------------------------------------- */
 	errorcode = for_trans[projcode] (lonrad, latrad, &xMtr1, &yMtr1);
 	x[1] = xMtr1;
 	y[1] = yMtr1;
-	
+
 	/* Report error if any */
 	/* ------------------- */
 	if (errorcode != 0)
@@ -10715,11 +10866,11 @@ static intn GDll2mm_cea(int32 projcode,int32 zonecode, int32 spherecode,
 	    HEreport("GCTP Error: %d\n", errorcode);
 	    return (status);
 	  }
-	
+
 	/* Compute x scale factor */
 	/* ---------------------- */
 	*scaleX = (xMtr1 - xMtr0) / xdimsize;
-	
+
 	/* Compute y scale factor */
 	/* ---------------------- */
 	*scaleY = (yMtr1 - yMtr0) / ydimsize;
@@ -10777,7 +10928,7 @@ static intn GDmm2ll_cea(int32 projcode,int32 zonecode, int32 spherecode,
 		 float64 projparm[],
 		 CPL_UNUSED int32 xdimsize, CPL_UNUSED int32 ydimsize,
 		 CPL_UNUSED float64 upleftpt[], CPL_UNUSED float64 lowrightpt[], int32 npnts,
-		 float64 x[], float64 y[], 
+		 float64 x[], float64 y[],
 		 float64 longitude[], float64 latitude[])
 {
     intn            status = 0;	/* routine return status variable */
@@ -10797,13 +10948,13 @@ static intn GDmm2ll_cea(int32 projcode,int32 zonecode, int32 spherecode,
       {
 	inv_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
 		 &errorcode, inv_trans);
-	
+
 	/* Convert from meters(or whatever unit is, i.e unit
 	   of r_major and r_minor) to lat/lon using GCTP */
 	/* ----------------------------------------- */
 	for(i=0; i<npnts; i++)
 	  {
-	    errorcode = 
+	    errorcode =
 	      inv_trans[projcode] (x[i], y[i],&longitude[i], &latitude[i]);
 	    /* Report error if any */
 	    /* ------------------- */
diff --git a/frmts/hdf4/hdf-eos/SWapi.c b/frmts/hdf4/hdf-eos/SWapi.c
index 4ceb690b3cce..4e51d32666bc 100644
--- a/frmts/hdf4/hdf-eos/SWapi.c
+++ b/frmts/hdf4/hdf-eos/SWapi.c
@@ -10,9 +10,9 @@
 /*
 Copyright (C) 1996 Hughes and Applied Research Corporation
 
-Permission to use, modify, and distribute this software and its documentation 
-for any purpose without fee is hereby granted, provided that the above 
-copyright notice appear in all copies and that both that copyright notice and 
+Permission to use, modify, and distribute this software and its documentation
+for any purpose without fee is hereby granted, provided that the above
+copyright notice appear in all copies and that both that copyright notice and
 this permission notice appear in supporting documentation.
 */
 /*****************************************************************************
@@ -30,47 +30,47 @@ Aug 31, 1999  Abe Taaheri    Changed memory allocation for utility strings to
 June 05, 2003 Abe Taaheri / Bruce Beaumont
 
                             Changed MAXNREGIONS to 1024 to support MOPITT data
-			    Supplied cast for compcode in call to 
+			    Supplied cast for compcode in call to
 			      SDsetcompress to avoid compiler error
-			    Removed declaration for unused variable rstatus 
+			    Removed declaration for unused variable rstatus
 			      in SWwrrdfield
-			    Removed initialization code for unused variables 
+			    Removed initialization code for unused variables
 			      in SWwrrdfield
-			    Removed declaration for unused variable tmpVal 
+			    Removed declaration for unused variable tmpVal
 			      in SWdefboxregion
 			    Added code in SWdefboxregion to check for l_index k
-			      exceeding NSWATHREGN to avoid overwriting 
+			      exceeding NSWATHREGN to avoid overwriting
 			      memory
-			    Removed declaration for unused variable retchar 
+			    Removed declaration for unused variable retchar
 			      in SWregionl_index
-			    Removed initialization code for unused variables 
+			    Removed initialization code for unused variables
 			      in SWregionl_index
 			    Removed declarations for unused variables tstatus,
 			      nfields, nflgs, and swathname in SWextractregion
-			    Removed initialization code for unused variables 
+			    Removed initialization code for unused variables
 			      in SWextractregion
-			    Removed declaration for unused variable 
+			    Removed declaration for unused variable
 			      land_status in SWscan2longlat
-			    Removed initialization code for unused variables 
+			    Removed initialization code for unused variables
 			      in SWscan2longlat
-			    Added clear (0) of timeflag in SWextractperiod if 
+			    Added clear (0) of timeflag in SWextractperiod if
 			      return status from SWextractregion is non-zero
 			    Removed declarations for unused variables tstatus,
-			      scandim, ndfields, ndflds, and swathname in 
+			      scandim, ndfields, ndflds, and swathname in
 			      SWregioninfo
-			    Removed initialization code for unused variables 
+			    Removed initialization code for unused variables
 			      in SWregioninfo
-			    Added clear (0) of timeflag in SWperiodinfo if 
+			    Added clear (0) of timeflag in SWperiodinfo if
 			      return status from SWregioninfo is non-zero
-			    Removed declarations for unused variables size, 
-			      nfields, nflds, nswath, idxsz, cornerlon, and 
+			    Removed declarations for unused variables size,
+			      nfields, nflds, nswath, idxsz, cornerlon, and
 			      cornerlat in SWdefscanregion
-			    Removed initialization code for unused variables 
+			    Removed initialization code for unused variables
 			      in SWdefscanregion
-			    Removed declarations for unused variables dims2, 
-			      rank, nt, swathname, dimlist, and buffer in 
+			    Removed declarations for unused variables dims2,
+			      rank, nt, swathname, dimlist, and buffer in
 			      SWupdateidxmap
-			    Removed declaration for unused variable statmeta 
+			    Removed declaration for unused variable statmeta
 			      in SWgeomapinfo
 ******************************************************************************/
 
@@ -107,7 +107,7 @@ static intn  timeflag = 0;
 
 #define NSWATH 200
 /* Swath Structure External Arrays */
-struct swathStructure 
+struct swathStructure
 {
     int32 active;
     int32 IDTable;
@@ -145,13 +145,13 @@ struct swathRegion
 static struct swathRegion *SWXRegion[NSWATHREGN];
 
 /* define a macro for the string size of the utility strings. The value
-   of 80 in previous version of this code was resulting in core dump (Array 
-   Bounds Write and Array Bounds Read problem in SWfinfo function and the 
-   functions called from there) for 7-8 dimensional fields where the 
-   string length for "DimList" can exceed 80 characters, including " and 
-   commas in the string. The length now is 512 which seems to be more 
+   of 80 in previous version of this code was resulting in core dump (Array
+   Bounds Write and Array Bounds Read problem in SWfinfo function and the
+   functions called from there) for 7-8 dimensional fields where the
+   string length for "DimList" can exceed 80 characters, including " and
+   commas in the string. The length now is 512 which seems to be more
    than enough to avoid the problem mentioned above. */
-   
+
 #define UTLSTR_MAX_SIZE 512
 
 /* Swath Prototypes (internal routines) */
@@ -162,7 +162,7 @@ static intn SWdefinefield(int32, const char *, const char *, const char *, int32
 static intn SWwrrdattr(int32, const char *, int32, int32, const char *, VOIDP);
 static intn SW1dfldsrch(int32, int32, const char *, const char *, int32 *,
                         int32 *, int32 *);
-static intn SWSDfldsrch(int32, int32, const char *, int32 *, int32 *, 
+static intn SWSDfldsrch(int32, int32, const char *, int32 *, int32 *,
                         int32 *, int32 *, int32 [], int32 *);
 static intn SWwrrdfield(int32, const char *, const char *,
                         int32 [], int32 [], int32 [], VOIDP);
@@ -576,13 +576,13 @@ SWattach(int32 fid, const char *swathname)
 		    /* ------------------------------------------------- */
 		    tags = (int32 *) malloc(sizeof(int32) * 3);
 		    if(tags == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			return(-1);
 		    }
 		    refs = (int32 *) malloc(sizeof(int32) * 3);
 		    if(refs == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			free(tags);
 			return(-1);
@@ -637,13 +637,13 @@ SWattach(int32 fid, const char *swathname)
 			/* ------------------------------------------------ */
 			tags = (int32 *) malloc(sizeof(int32) * nObjects);
 			if(tags == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			    return(-1);
 			}
 			refs = (int32 *) malloc(sizeof(int32) * nObjects);
 			if(refs == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			    free(tags);
 			    return(-1);
@@ -662,7 +662,7 @@ SWattach(int32 fid, const char *swathname)
 			}
 			SWXSwath[i].sdsID = (int32 *) calloc(nSDS, 4);
 			if(SWXSwath[i].sdsID == NULL && nSDS != 0)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			    free(tags);
 			    free(refs);
@@ -703,13 +703,13 @@ SWattach(int32 fid, const char *swathname)
 			/* ----------------------------------------- */
 			tags = (int32 *) malloc(sizeof(int32) * nObjects);
 			if(tags == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			    return(-1);
 			}
 			refs = (int32 *) malloc(sizeof(int32) * nObjects);
 			if(refs == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			    free(tags);
 			    return(-1);
@@ -731,7 +731,7 @@ SWattach(int32 fid, const char *swathname)
 			    realloc((void *) SWXSwath[i].sdsID,
 				    (SWXSwath[i].nSDS + nSDS) * 4);
 			if(SWXSwath[i].sdsID == NULL && nSDS != 0)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWattach", __FILE__, __LINE__);
 			    return(-1);
 			}
@@ -843,9 +843,14 @@ SWchkswid(int32 swathID, const char *routname,
     }
     else
     {
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
 	/* Check for active swath ID */
 	/* ------------------------- */
-	if (SWXSwath[swathID % idOffset].active == 0)
+	if (SWXSwath[sID].active == 0)
 	{
 	    status = -1;
 	    HEpush(DFE_GENAPP, "SWchkswid", __FILE__, __LINE__);
@@ -856,9 +861,9 @@ SWchkswid(int32 swathID, const char *routname,
 
 	    /* Get file & SDS ids and Swath Vgroup */
 	    /* ----------------------------------- */
-	    status = EHchkfid(SWXSwath[swathID % idOffset].fid, " ", fid,
+	    status = EHchkfid(SWXSwath[sID].fid, " ", fid,
 			      sdInterfaceID, &l_access);
-	    *swVgrpID = SWXSwath[swathID % idOffset].IDTable;
+	    *swVgrpID = SWXSwath[sID].IDTable;
 	}
     }
     return (status);
@@ -934,9 +939,15 @@ SWdefdim(int32 swathID, char *dimname, int32 dim)
     /* -------------------------------------- */
     if (status == 0)
     {
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
+	int32 dimArray[1] = { dim };
 	status = EHinsertmeta(sdInterfaceID, swathname, "s", 0L,
-			      dimname, &dim);
+			      dimname, dimArray);
     }
     return (status);
 }
@@ -997,7 +1008,7 @@ SWdiminfo(int32 swathID, const char *dimname)
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWdiminfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1010,7 +1021,13 @@ SWdiminfo(int32 swathID, const char *dimname)
     if (status == 0)
     {
 	/* Get swath name */
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    free(utlstr);
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	/* Get pointers to "Dimension" section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
@@ -1020,7 +1037,7 @@ SWdiminfo(int32 swathID, const char *dimname)
 	{
 	    free(utlstr);
 	    return(-1);
-	}  
+	}
 
 	/* Search for dimension name (surrounded by quotes) */
 	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", dimname, "\"\n");
@@ -1117,7 +1134,7 @@ SWmapinfo(int32 swathID, const char *geodim, const char *datadim, int32 * offset
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWmapinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1131,7 +1148,13 @@ SWmapinfo(int32 swathID, const char *geodim, const char *datadim, int32 * offset
     if (status == 0)
     {
 	/* Get swath name */
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    free(utlstr);
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	/* Get pointers to "DimensionMap" section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
@@ -1250,7 +1273,12 @@ SWidxmapinfo(int32 swathID, const char *geodim, const char *datadim, int32 l_ind
     {
 	/* Find Index Mapping Vdata with Swath Attributes Vgroup */
 	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s%s", "INDXMAP:", geodim, "/", datadim);
-	vgid = SWXSwath[swathID % idOffset].VIDTable[2];
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	vgid = SWXSwath[sID].VIDTable[2];
 	vdataID = EHgetid(fid, vgid, utlbuf, 1, "r");
 
 	/* If found then get geodim size & read l_index mapping values */
@@ -1331,7 +1359,7 @@ SWcompinfo(int32 swathID, const char *fieldname, int32 * compcode, intn compparm
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWcompinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1343,7 +1371,13 @@ SWcompinfo(int32 swathID, const char *fieldname, int32 * compcode, intn compparm
     if (status == 0)
     {
 	/* Get swath name */
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    free(utlstr);
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	/* Get pointers to "DataField" section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
@@ -1465,7 +1499,7 @@ SWcompinfo(int32 swathID, const char *fieldname, int32 * compcode, intn compparm
 	free(metabuf);
     }
     free(utlstr);
-    
+
     return (status);
 }
 
@@ -1539,7 +1573,7 @@ SWfinfo(int32 swathID, const char *fieldtype, const char *fieldname,
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWfinfo", __FILE__, __LINE__);
 	return(-1);
     }
@@ -1553,14 +1587,20 @@ SWfinfo(int32 swathID, const char *fieldtype, const char *fieldname,
     status = SWchkswid(swathID, "SWfinfo", &fid, &sdInterfaceID, &dum);
 
     /* Get swath name */
-    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+    int sID = swathID % idOffset;
+    if (sID >= NSWATH)
+    {
+        free(utlstr);
+        return -1;
+    }
+    Vgetname(SWXSwath[sID].IDTable, swathname);
 
     /* Get pointers to appropriate "Field" section within SM */
     if (strcmp(fieldtype, "Geolocation Fields") == 0)
     {
 	metabuf = EHmetagroup(sdInterfaceID, swathname, "s",
 				       "GeoField", metaptrs);
-	
+
 	if(metabuf == NULL)
 	{
 	    free(utlstr);
@@ -1673,7 +1713,7 @@ SWfinfo(int32 swathID, const char *fieldtype, const char *fieldname,
 		    fsize = VSsizeof(vdataID, (char *)fieldname);
 		    buf = (uint8 *) calloc(fsize, 1);
 		    if(buf == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWfinfo", __FILE__, __LINE__);
 			free(utlstr);
 			return(-1);
@@ -1718,7 +1758,7 @@ SWfinfo(int32 swathID, const char *fieldtype, const char *fieldname,
 	status = -1;
     }
     free(utlstr);
-     
+
     return (status);
 }
 
@@ -1887,7 +1927,12 @@ SWdefdimmap(int32 swathID, const char *geodim, const char *datadim, int32 offset
 	    metadata[0] = offset;
 	    metadata[1] = increment;
 
-	    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 	    status = EHinsertmeta(sdInterfaceID, swathname, "s", 1L,
 				  mapname, metadata);
 
@@ -1960,7 +2005,7 @@ SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_inde
 
 	/* Geo Dimension Search */
 	/* -------------------- */
-       
+
 	gsize = SWdiminfo(swathID, geodim);
 
 	if (gsize == -1)
@@ -1989,10 +2034,15 @@ SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_inde
 	{
 	    /* Get attribute Vgroup ID and allocate data buffer */
 	    /* ------------------------------------------------ */
-	    attrVgrpID = SWXSwath[swathID % idOffset].VIDTable[2];
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        return -1;
+	    }
+	    attrVgrpID = SWXSwath[sID].VIDTable[2];
 	    buf = (uint8 *) calloc(4 * gsize, 1);
 	    if(buf == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdefidxmap", __FILE__, __LINE__);
 		return(-1);
 	    }
@@ -2022,9 +2072,10 @@ SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_inde
 
 	    /* Write to Structural Metadata */
 	    snprintf(mapname, sizeof(mapname), "%s%s%s", geodim, "/", datadim);
-	    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
+		int32 dumArray[1] = { dum };
 	    status = EHinsertmeta(sdInterfaceID, swathname, "s", 2L,
-				  mapname, &dum);
+				  mapname, dumArray);
 
 	}
     }
@@ -2080,6 +2131,10 @@ SWdefcomp(int32 swathID, int32 compcode, intn compparm[])
     if (status == 0)
     {
 	sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
 
 	/* Set compression code in compression external array */
 	SWXSwath[sID].compcode = compcode;
@@ -2220,12 +2275,16 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
     {
 	/* Remove offset from swath ID & get swathname */
 	sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
 	Vgetname(swVgrpID, swathname);
 
 	/* Allocate space for dimbuf, copy dimlist into it, & append comma */
 	dimbuf = (char *) calloc(strlen(dimlist) + 64, 1);
 	if(dimbuf == NULL)
-	{ 
+	{
 	    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
 	    return(-1);
 	}
@@ -2245,7 +2304,7 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 	    /* Copy dimension list entry to dimcheck */
 	    dimcheck = (char *) calloc(comma - dimbuf + 1, 1);
 	    if(dimcheck == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
 		free(dimbuf);
 		return(-1);
@@ -2325,7 +2384,7 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 	{
 /* ((intn) strlen(fieldname) > MAX_NC_NAME - 7)
 ** this was changed because HDF4.1r3 made a change in the
-** hlimits.h file.  We have notified NCSA and asked to have 
+** hlimits.h file.  We have notified NCSA and asked to have
 ** it made the same as in previous versions of HDF
 ** see ncr 26314.  DaW  Apr 2000
 */
@@ -2473,7 +2532,7 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 			 */
 			oneDbuf = (uint8 *) calloc(recSize, 1);
 			if(oneDbuf == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
 			    return(-1);
 			}
@@ -2489,7 +2548,7 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 			 */
 			oneDbuf = (uint8 *) calloc(recSize, dims[0]);
 			if(oneDbuf == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
 			    return(-1);
 			}
@@ -2685,7 +2744,7 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 			    realloc((void *) SWXSwath[sID].sdsID,
 				    (SWXSwath[sID].nSDS + 1) * 4);
 			if(SWXSwath[sID].sdsID == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
 			    return(-1);
 			}
@@ -2695,7 +2754,7 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 		    {
 			SWXSwath[sID].sdsID = (int32 *) calloc(1, 4);
 			if(SWXSwath[sID].sdsID == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
 			    return(-1);
 			}
@@ -2935,9 +2994,15 @@ SWwritegeometa(int32 swathID, const char *fieldname, const char *dimlist,
 	/* ------------------------------ */
 	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
 
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
+	int32 numbertypeArray[1] = { numbertype };
 	status = EHinsertmeta(sdInterfaceID, swathname, "s", 3L,
-			      utlbuf, &numbertype);
+			      utlbuf, numbertypeArray);
     }
 
     return (status);
@@ -3000,9 +3065,15 @@ SWwritedatameta(int32 swathID, const char *fieldname, const char *dimlist,
 	/* ------------------------------ */
 	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
 
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
+	int32 numbertypeArray[1] = { numbertype };
 	status = EHinsertmeta(sdInterfaceID, swathname, "s", 4L,
-			      utlbuf, &numbertype);
+			      utlbuf, numbertypeArray);
     }
     return (status);
 }
@@ -3061,7 +3132,12 @@ SWwrrdattr(int32 swathID, const char *attrname, int32 numbertype, int32 count,
     {
 	/* Get attribute Vgroup ID and call EHattr to perform I/O */
 	/* ------------------------------------------------------ */
-	attrVgrpID = SWXSwath[swathID % idOffset].VIDTable[2];
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	attrVgrpID = SWXSwath[sID].VIDTable[2];
 	status = EHattr(fid, attrVgrpID, attrname, numbertype, count,
 			wrcode, datbuf);
     }
@@ -3213,7 +3289,12 @@ SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * coun
     {
 	/* Get attribute Vgroup ID and call EHattrinfo */
 	/* ------------------------------------------- */
-	attrVgrpID = SWXSwath[swathID % idOffset].VIDTable[2];
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	attrVgrpID = SWXSwath[sID].VIDTable[2];
 
 	status = EHattrinfo(fid, attrVgrpID, attrname, numbertype,
 			    count);
@@ -3278,7 +3359,12 @@ SWinqattrs(int32 swathID, char *attrnames, int32 * strbufsize)
     {
 	/* Get attribute Vgroup ID and call EHattrcat */
 	/* ------------------------------------------ */
-	attrVgrpID = SWXSwath[swathID % idOffset].VIDTable[2];
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	attrVgrpID = SWXSwath[sID].VIDTable[2];
 
 	nattr = EHattrcat(fid, attrVgrpID, attrnames, strbufsize);
     }
@@ -3349,7 +3435,7 @@ SWinqdims(int32 swathID, char *dimnames, int32 dims[])
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWinqdims", __FILE__, __LINE__);
 	return(-1);
     }
@@ -3364,7 +3450,13 @@ SWinqdims(int32 swathID, char *dimnames, int32 dims[])
 	if (dimnames != NULL || dims != NULL)
 	{
 	    /* Get swath name */
-	    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	    /* Get pointers to "Dimension" section within SM */
 	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
@@ -3514,7 +3606,7 @@ SWinqmaps(int32 swathID, char *dimmaps, int32 offset[], int32 increment[])
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWinqmaps", __FILE__, __LINE__);
 	return(-1);
     }
@@ -3529,7 +3621,13 @@ SWinqmaps(int32 swathID, char *dimmaps, int32 offset[], int32 increment[])
 	{
 
 	    /* Get swath name */
-	    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	    /* Get pointers to "DimensionMap" section within SM */
 	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
@@ -3680,7 +3778,7 @@ SWinqidxmaps(int32 swathID, char *idxmaps, int32 idxsizes[])
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWinqidxmaps", __FILE__, __LINE__);
 	return(-1);
     }
@@ -3695,7 +3793,13 @@ SWinqidxmaps(int32 swathID, char *idxmaps, int32 idxsizes[])
 	if (idxmaps != NULL || idxsizes != NULL)
 	{
 	    /* Get swath name */
-	    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	    /* Get pointers to "IndexDimensionMap" section within SM */
 	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
@@ -3744,7 +3848,7 @@ SWinqidxmaps(int32 swathID, char *idxmaps, int32 idxsizes[])
 			{
 			    /* Parse off geo dimension and find its size */
 			    slash = strchr(utlstr, '/');
-			    *slash = 0;
+			    if (slash) *slash = 0;
 			    idxsizes[nMap] = SWdiminfo(swathID, utlstr);
 			}
 
@@ -3844,14 +3948,14 @@ SWinqfields(int32 swathID, const char *fieldtype, char *fieldlist, int32 rank[],
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWinqfields", __FILE__, __LINE__);
 	return(-1);
     }
 
     utlstr2 = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr2 == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWinqfields", __FILE__, __LINE__);
 	free(utlstr);
 	return(-1);
@@ -3868,7 +3972,14 @@ SWinqfields(int32 swathID, const char *fieldtype, char *fieldlist, int32 rank[],
 	if (fieldlist != NULL || rank != NULL || numbertype != NULL)
 	{
 	    /* Get swath name */
-	    Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        free(utlstr2);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	    /* Get pointers to "GeoField" or "DataField" section within SM */
 	    if (strcmp(fieldtype, "Geolocation Fields") == 0)
@@ -4153,7 +4264,7 @@ SWnentries(int32 swathID, int32 entrycode, int32 * strbufsize)
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWnemtries", __FILE__, __LINE__);
 	return(-1);
     }
@@ -4164,7 +4275,13 @@ SWnentries(int32 swathID, int32 entrycode, int32 * strbufsize)
     if (status == 0)
     {
 	/* Get swath name */
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    free(utlstr);
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	/* Zero out string buffer size */
 	*strbufsize = 0;
@@ -4420,7 +4537,10 @@ SW1dfldsrch(int32 fid, int32 swathID, const char *fieldname, const char *i_acces
     /* Compute "reduced" swath ID */
     /* -------------------------- */
     sID = swathID % idOffset;
-
+    if (sID >= NSWATH)
+    {
+        return -1;
+    }
 
     /* Get Geolocation Vgroup id and 1D field name Vdata id */
     /* ---------------------------------------------------- */
@@ -4520,7 +4640,7 @@ SWSDfldsrch(int32 swathID, int32 sdInterfaceID, const char *fieldname,
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWSDfldsrch", __FILE__, __LINE__);
 	return(-1);
     }
@@ -4532,7 +4652,10 @@ SWSDfldsrch(int32 swathID, int32 sdInterfaceID, const char *fieldname,
     /* Compute "reduced" swath ID */
     /* -------------------------- */
     sID = swathID % idOffset;
-
+    if (sID >= NSWATH)
+    {
+        return -1;
+    }
 
     /* Loop through all SDSs in swath */
     /* ------------------------------ */
@@ -4982,7 +5105,7 @@ SWwrrdfield(int32 swathID, const char *fieldname, const char *code,
 		    fldsize = VSsizeof(vdataID, (char *)fieldname);
 		    fillbuf = (uint8 *) calloc(fldsize, 1);
 		    if(fillbuf == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
 			return(-1);
 		    }
@@ -4992,8 +5115,9 @@ SWwrrdfield(int32 swathID, const char *fieldname, const char *code,
 		    VSQueryvsize(vdataID, &recsize);
 		    buf = (uint8 *) calloc(recsize, count[0] * incr[0]);
 		    if(buf == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
+			free(fillbuf);
 			return(-1);
 		    }
 
@@ -5096,7 +5220,7 @@ SWwrrdfield(int32 swathID, const char *fieldname, const char *code,
 		    fldsize = VSsizeof(vdataID, (char *)fieldname);
 		    buf = (uint8 *) calloc(fldsize, count[0] * incr[0]);
 		    if(buf == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
 			return(-1);
 		    }
@@ -5289,7 +5413,7 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
     intn            i;		/* Loop index */
     intn            j = 0;		/* Loop index */
     intn            k;		/* Loop index */
-    
+
     intn            status;	/* routine return status variable */
     intn            statLon;	/* Status from SWfieldinfo for longitude */
     intn            statLat;	/* Status from SWfieldinfo for latitude */
@@ -5300,8 +5424,8 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 
     uint8           found = 0;	/* Found flag */
     uint8          *flag;	/* Pointer to track flag array */
-    intn           validReg = -1; /* -1 is invalid validReg */ 
-    
+    intn           validReg = -1; /* -1 is invalid validReg */
+
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           swVgrpID;	/* Swath Vgroup ID */
@@ -5330,7 +5454,7 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
     char            dimlist[256];	/* Dimension list (geolocation
 					 * fields) */
     char            latName[17];/* Latitude field name */
-    
+
 
     /* Check for valid swath ID */
     /* ------------------------ */
@@ -5371,9 +5495,9 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 				    dimlist);
 	    if (statCoLat != 0)
 	    {
-	      /* Check again for Geodeticlatitude */            
-	      statGeodeticLat = SWfieldinfo(swathID, 
-					    "GeodeticLatitude", &rank, 
+	      /* Check again for Geodeticlatitude */
+	      statGeodeticLat = SWfieldinfo(swathID,
+					    "GeodeticLatitude", &rank,
 					    dims, &nt, dimlist);
 	      if (statGeodeticLat != 0)
 		{
@@ -5464,14 +5588,14 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 	    /* --------------------------------------------------- */
 	    lonArr = (char *) calloc(nElem, sizeof(float64));
 	    if(lonArr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
 		return(-1);
 	    }
 
 	    latArr = (char *) calloc(nElem, sizeof(float64));
 	    if(latArr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
 		free(lonArr);
 		return(-1);
@@ -5482,7 +5606,7 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 	    /* ------------------------------------- */
 	    flag = (uint8 *) calloc(edge[0] + 1, 1);
 	    if(flag == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
 		free(lonArr);
 		free(latArr);
@@ -5515,7 +5639,7 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 		    temp64 = (float64) temp32;
 		    memcpy(latArr + 8 * i, &temp64, 8);
 		}
-	    }   
+	    }
 
 
 	    /* Set boundary flag */
@@ -5536,7 +5660,7 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 	    /* ------------------ */
 
 	    for (i = 0; i < edge[0]; i++)
-	    {   
+	    {
 		/* For each value from Cross Track ... */
 		/* ----------------------------------- */
 		for (j = 0; j < edge[1]; j++)
@@ -5611,16 +5735,18 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 		/* ----------------------------------------------- */
 		lonArr = (char *) calloc(dims[1], sizeof(float64));
 		if(lonArr == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
+		    free(flag);
 		    return(-1);
 		}
 
 		latArr = (char *) calloc(dims[1], sizeof(float64));
 		if(latArr == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
 		    free(lonArr);
+		    free(flag);
 		    return(-1);
 		}
 
@@ -5630,13 +5756,13 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 		anyStart[1] = 0;
 		anyEdge[0] = 1;
 		anyEdge[1] = dims[1];
-	
-               
+
+
 		/* For each track starting from 0 */
 		/* ------------------------------ */
-		for (i = 0; i < edge[0]; i++)    
+		for (i = 0; i < edge[0]; i++)
 		{
-               
+
 		    /* If cross track not in region (with MIDPOINT search ... */
 		    /* ------------------------------------------------------ */
 		    if (flag[i] == 0)
@@ -5755,8 +5881,11 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 			SWXRegion[k] = (struct swathRegion *)
 			    calloc(1, sizeof(struct swathRegion));
 			if(SWXRegion[k] == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
+			    free(lonArr);
+			    free(latArr);
+			    free(flag);
 			    return(-1);
 			}
 
@@ -5786,9 +5915,11 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 		if (k >= NSWATHREGN)
 		  {
 		    HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
-		    HEreport(
-			     "regionID exceeded NSWATHREGN.\n");
-                    return (-1);
+		    HEreport("regionID exceeded NSWATHREGN.\n");
+		    free(lonArr);
+		    free(latArr);
+		    free(flag);
+		    return (-1);
 		  }
 
 		/* Find start and stop of regions */
@@ -5816,10 +5947,10 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 			/* Increment (multiple) region counter */
 			/* ----------------------------------- */
 			j = ++SWXRegion[k]->nRegions;
-			
+
 			/* if SWXRegion[k]->nRegions greater than MAXNREGIONS */
 			/* free allocated memory and return FAIL */
-			
+
 			if ((SWXRegion[k]->nRegions) > MAXNREGIONS)
 			{
 			    HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
@@ -5829,10 +5960,10 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 			    free(flag);
 			    return(-1);
 			}
-			
+
 			SWXRegion[k]->StartRegion[j - 1] = i;
 		    }
-		    
+
 		    /* End of region */
 		    /* ------------- */
 		    if (flag[i] == 255)
@@ -5855,7 +5986,7 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
     {
 	return (-1);
     }
-    
+
 }
 
 
@@ -5920,8 +6051,8 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 
     uint8           found = 0;	/* Found flag */
     uint8          *flag;	/* Pointer to track flag array */
-    intn           validReg = -1; /* -1 is invalid validReg */ 
-    
+    intn           validReg = -1; /* -1 is invalid validReg */
+
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           swVgrpID;	/* Swath Vgroup ID */
@@ -5991,9 +6122,9 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 				    dimlist);
 	    if (statCoLat != 0)
 	    {
-	      /* Check again for Geodeticlatitude */            
-	      statGeodeticLat = SWfieldinfo(swathID, 
-					    "GeodeticLatitude", &rank, 
+	      /* Check again for Geodeticlatitude */
+	      statGeodeticLat = SWfieldinfo(swathID,
+					    "GeodeticLatitude", &rank,
 					    dims, &nt, dimlist);
 	      if (statGeodeticLat != 0)
 	        {
@@ -6089,14 +6220,14 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 	    /* --------------------------------------------------- */
 	    lonArr = (char *) calloc(nElem, sizeof(float64));
 	    if(lonArr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
 		return(-1);
 	    }
-	    
+
 	    latArr = (char *) calloc(nElem, sizeof(float64));
 	    if(latArr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
 		free(lonArr);
 		return(-1);
@@ -6107,7 +6238,7 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 	    /* ------------------------------------- */
 	    flag = (uint8 *) calloc(edge[0] + 1, 1);
 	    if(flag == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
 		free(lonArr);
 		free(latArr);
@@ -6235,13 +6366,13 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 		/* ----------------------------------------------- */
 		lonArr = (char *) calloc(dims[1], sizeof(float64));
 		if(lonArr == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
 		    return(-1);
 		}
 		latArr = (char *) calloc(dims[1], sizeof(float64));
 		if(latArr == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
 		    free(lonArr);
 		    return(-1);
@@ -6382,8 +6513,11 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 			SWXRegion[k] = (struct swathRegion *)
 			    calloc(1, sizeof(struct swathRegion));
 			if(SWXRegion[k] == NULL)
-			{ 
+			{
 			    HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
+			    free(lonArr);
+			    free(latArr);
+			    free(flag);
 			    return(-1);
 			}
 
@@ -6457,7 +6591,7 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 			    /* Increment (multiple) region counter */
 			    /* ----------------------------------- */
 			    j = ++SWXRegion[k]->nRegions;
-			    
+
                             if (mapstatus == 2)
                             {
                                l = i;
@@ -6478,7 +6612,7 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
 			    validReg = 0;
 			}
 		    }
-		    
+
 		}
 
 	    }
@@ -6495,7 +6629,7 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
     {
 	return (-1);
     }
-    
+
 }
 
 
@@ -6614,7 +6748,7 @@ SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
 		/* ---------------------------- */
 		time64 = (float64 *) calloc(edge[0], 8);
 		if(time64 == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdeftimeperiod", __FILE__, __LINE__);
 		    return(-1);
 		}
@@ -6639,7 +6773,7 @@ SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
 		/* ---------------------------- */
 		time64 = (float64 *) calloc(edge[0] * 2, 8);
 		if(time64 == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdeftimeperiod", __FILE__, __LINE__);
 		    return(-1);
 		}
@@ -6691,7 +6825,7 @@ SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
                                     SWXRegion[k] = (struct swathRegion *)
                                         calloc(1, sizeof(struct swathRegion));
                                     if(SWXRegion[k] == NULL)
-                                    { 
+                                    {
                                         HEpush(DFE_NOSPACE,"SWdeftimeperiod", __FILE__, __LINE__);
                                         return(-1);
                                     }
@@ -6743,45 +6877,47 @@ SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
                 }
 
 
-
-                /* Clear found flag */
-                /* ---------------- */
-                found = 0;
+                if (periodID >= 0)
+                {
+                    /* Clear found flag */
+                    /* ---------------- */
+                    found = 0;
 
 
-                /* For each track (from bottom) ... */
-                /* -------------------------------- */
-                for (i = edge[0] - 1; i >= 0; i--)
-                {
-                    /* For each value from Cross Track ... */
-                    /* ----------------------------------- */
-                    for (j = 0; j < edge[1]; j++)
+                    /* For each track (from bottom) ... */
+                    /* -------------------------------- */
+                    for (i = edge[0] - 1; i >= 0; i--)
                     {
+                        /* For each value from Cross Track ... */
+                        /* ----------------------------------- */
+                        for (j = 0; j < edge[1]; j++)
+                        {
 
-                        /* Get time test value */
-                        /* ------------------- */
-                        time64Test = time64[i * edge[1] + j];
+                            /* Get time test value */
+                            /* ------------------- */
+                            time64Test = time64[i * edge[1] + j];
 
 
-                        /* If within time period ... */
-                        /* ------------------------- */
-                        if (time64Test >= starttime &&
-                            time64Test <= stoptime)
-                        {
-                            /* Set found flag */
-                            /* -------------- */
-                            found = 1;
+                            /* If within time period ... */
+                            /* ------------------------- */
+                            if (time64Test >= starttime &&
+                                time64Test <= stoptime)
+                            {
+                                /* Set found flag */
+                                /* -------------- */
+                                found = 1;
 
-                            /* Set start of region to first track found */
-                            /* ---------------------------------------- */
-                            SWXRegion[k]->StopRegion[0] = i;
+                                /* Set start of region to first track found */
+                                /* ---------------------------------------- */
+                                SWXRegion[periodID]->StopRegion[0] = i;
 
-                            break;	/* Break from "j" loop */
+                                break;	/* Break from "j" loop */
+                            }
+                        }
+                        if (found == 1)
+                        {
+                            break;	/* Break from "i" loop */
                         }
-                    }
-                    if (found == 1)
-                    {
-                        break;	/* Break from "i" loop */
                     }
                 }
 
@@ -7059,7 +7195,7 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
 	{
 	    /* If non-vertical subset regions defined ... */
 	    /* ------------------------------------------ */
-	    if (SWXRegion[regionID]->nRegions > 0)    
+	    if (SWXRegion[regionID]->nRegions > 0)
 	    {
 
 		/* Get geolocation dimension name */
@@ -7078,7 +7214,7 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
                    status = SWfieldinfo(SWXRegion[regionID]->swathID,
                                         "Time", &dum,
                                         dumdims, &dum, tgeodim);
-                   
+
                    if (strcmp(geodim, tgeodim) != 0)
                    {
                       strcpy(geodim, tgeodim);
@@ -7183,6 +7319,10 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
 		    /* Get size of geo dim & allocate space of l_index mapping */
 		    /* ----------------------------------------------------- */
 		    dum = SWdiminfo(swathID, geodim);
+            if( dum < 0 )
+            {
+                return -1;
+            }
 
                     /* For Landsat files, the l_index mapping has two values   */
                     /* for each point, a left and right point.  So for a 37  */
@@ -7192,14 +7332,14 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
                     /* dimension.                                            */
                     /* ----------------------------------------------------- */
                     if(land_status == 0)
-                       if(strcmp(fieldname, "Latitude") == 0 || 
+                       if(strcmp(fieldname, "Latitude") == 0 ||
                           strcmp(fieldname, "Longitude") == 0)
                        {
                           dum = dum * 2;
                        }
 		    idxmap = (int32 *) calloc(dum, sizeof(int32));
 		    if(idxmap == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWextractregion", __FILE__, __LINE__);
 			return(-1);
 		    }
@@ -7270,7 +7410,7 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
                            if (SWXRegion[regionID]->scanflag == 1)
                            {
                               start[l_index] = SWXRegion[regionID]->StartRegion[k]/incr;
-                              if(SWXRegion[regionID]->band8flag == 2 || 
+                              if(SWXRegion[regionID]->band8flag == 2 ||
                                  SWXRegion[regionID]->band8flag == 3)
                               {
                                  start[l_index] = (SWXRegion[regionID]->StartRegion[k]+detect_cnt)/incr;
@@ -7452,7 +7592,7 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
                                        if(idxmap[j] == 0  || idxmap[j+1] == 0)
                                           l = scene_cnt;
                                     }
- 
+
                                  }
                            }
 
@@ -7531,11 +7671,11 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
                         }
                         else
                         {
-                           if (SWXRegion[regionID]->scanflag == 1 && 
+                           if (SWXRegion[regionID]->scanflag == 1 &&
                                strcmp(fieldname,dfieldlist) == 0)
                            {
                               start[l_index] = SWXRegion[regionID]->StartRegion[k];
-                              edge[l_index] = SWXRegion[regionID]->StopRegion[k] - 
+                              edge[l_index] = SWXRegion[regionID]->StopRegion[k] -
                                              SWXRegion[regionID]->StartRegion[k] + 1;
                               if(SWXRegion[regionID]->band8flag == 2 ||
 				 SWXRegion[regionID]->band8flag == 3 )
@@ -7562,15 +7702,15 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
 					     buffer);
                         if (SWXRegion[regionID]->scanflag == 1)
                         {
-                           
+
                            if (strcmp(fieldname,"Longitude") == 0)
                            {
-                              status = SWscan2longlat(swathID, fieldname, buffer, start, 
+                              status = SWscan2longlat(swathID, fieldname, buffer, start,
                                               edge, idxmap, startscanline, stopscanline);
                            }
                            if (strcmp(fieldname,"Latitude") == 0)
                            {
-                              status = SWscan2longlat(swathID, fieldname, buffer, start, 
+                              status = SWscan2longlat(swathID, fieldname, buffer, start,
                                               edge, idxmap, startscanline, stopscanline);
                            }
                         }
@@ -7586,11 +7726,11 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
 		{
 		    /* Mapping not found */
 		    /* ----------------- */
-		    status = -1; 
+		    status = -1;
 		    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
 		    HEreport("Mapping Not Defined for \"%s\" Dimension.\n",
 			     geodim);
-		}                                           
+		}
 	    }
 	    else
 	    {
@@ -7652,7 +7792,7 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 static intn
-SWscan2longlat(int32 swathID, const char *fieldname, VOIDP buffer, int32 start[], 
+SWscan2longlat(int32 swathID, const char *fieldname, VOIDP buffer, int32 start[],
 int32 edge[], int32 *idxmap, int32 startscanline, int32 stopscanline)
 {
 
@@ -7863,14 +8003,14 @@ int32 edge[], int32 *idxmap, int32 startscanline, int32 stopscanline)
    y_p1 = (float)(RADOE * sin((p1_long*deg2rad)) * sin((p1_lat*deg2rad)));
    z_p1 = (float)(RADOE * cos((p1_lat*deg2rad)));
 
-   
+
    x_p2 = (float)(RADOE * cos((p2_long*deg2rad)) * sin((p2_lat*deg2rad)));
    y_p2 = (float)(RADOE * sin((p2_long*deg2rad)) * sin((p2_lat*deg2rad)));
    z_p2 = (float)(RADOE * cos((p2_lat*deg2rad)));
 
    x_pi = x_p1 + (x_p2 - x_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1);
    y_pi = y_p1 + (y_p2 - y_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1);
-   z_pi = z_p1 + (z_p2 - z_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1); 
+   z_pi = z_p1 + (z_p2 - z_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1);
 
    if (fieldflag == 1)
    {
@@ -8071,7 +8211,7 @@ SWdupregion(int32 oldregionID)
 	    SWXRegion[i] = (struct swathRegion *)
 		calloc(1, sizeof(struct swathRegion));
 	    if(SWXRegion[i] == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdupregion", __FILE__, __LINE__);
 		return(-1);
 	    }
@@ -8143,7 +8283,7 @@ SWregioninfo(int32 swathID, int32 regionID, const char *fieldname,
     intn            long_status = 3;	/* routine return status variable for longitude */
     intn            land_status = 3;    /* Used for L7 float scene sub.      */
     intn            statMap = -1;   /* Status from SWmapinfo  */
-    
+
     uint8           found = 0;	/* Found flag */
     uint8           detect_cnt = 0;	/* Used for L7 float scene sub.      */
 
@@ -8292,7 +8432,7 @@ SWregioninfo(int32 swathID, int32 regionID, const char *fieldname,
                status = SWfieldinfo(SWXRegion[regionID]->swathID,
                                     "Time", &dum,
                                     dumdims, &dum, tgeodim);
-               
+
                if (strcmp(geodim, tgeodim) != 0)
                {
                   strcpy(geodim, tgeodim);
@@ -8381,9 +8521,11 @@ SWregioninfo(int32 swathID, int32 regionID, const char *fieldname,
 		/* Get size of geo dim & allocate space of l_index mapping */
 		/* ----------------------------------------------------- */
 		dum = SWdiminfo(swathID, geodim);
+		if (dum < 0)
+            return -1;
 		idxmap = (int32 *) calloc(dum, sizeof(int32));
 		if(idxmap == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWregioninfo", __FILE__, __LINE__);
 		    return(-1);
 		}
@@ -8667,7 +8809,7 @@ SWregioninfo(int32 swathID, int32 regionID, const char *fieldname,
 	    {
 		/* Mapping not found */
 		/* ----------------- */
-	        status = -1;  
+	        status = -1;
 		HEpush(DFE_GENAPP, "SWregioninfo",
 		       __FILE__, __LINE__);
 		HEreport(
@@ -8858,6 +9000,7 @@ SWperiodinfo(int32 swathID, int32 periodID, const char *fieldname,
 
 #define SETSWTHREG \
 \
+regionID = 0; \
 for (k = 0; k < NSWATHREGN; k++) \
 { \
     if (SWXRegion[k] == 0) \
@@ -8985,7 +9128,7 @@ SWdefvrtregion(int32 swathID, int32 regionID, const char *vertObj, float64 range
 		    SWXRegion[regionID]->DimNamePtr[j] =
 			(char *) malloc(slen + 1);
 		    if(SWXRegion[regionID]->DimNamePtr[j] == NULL)
-		    { 
+		    {
 			HEpush(DFE_NOSPACE,"SWdefvrtregion", __FILE__, __LINE__);
 			return(-1);
 		    }
@@ -9062,7 +9205,7 @@ SWdefvrtregion(int32 swathID, int32 regionID, const char *vertObj, float64 range
 		/* --------------------------------- */
 		vertArr = (char *) calloc(dims[0], size);
 		if(vertArr == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdefvrtregion", __FILE__, __LINE__);
 		    return(-1);
 		}
@@ -9909,6 +10052,10 @@ SWdetach(int32 swathID)
 	/* Subtract off swath ID offset and get swath name */
 	/* ----------------------------------------------- */
 	sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
 	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 
@@ -9933,7 +10080,7 @@ SWdetach(int32 swathID)
 		/* ---------------------------- */
 		nambuf = (char *) calloc(VSNAMELENMAX + 1, 1);
 		if(nambuf == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		    return(-1);
 		}
@@ -9948,7 +10095,7 @@ SWdetach(int32 swathID)
 		/* --------------------- */
 		buf = (uint8 *) calloc(VSsizeof(vdataID, nambuf), dims[0]);
 		if(buf == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		    free(nambuf);
 		    return(-1);
@@ -9976,20 +10123,20 @@ SWdetach(int32 swathID)
 	    /* ---------------------------------------------------- */
 	    nameptr = (char **) calloc(1, sizeof(char *));
 	    if(nameptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		return(-1);
 	    }
 	    namelen = (int32 *) calloc(1, sizeof(int32));
 	    if(namelen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		return(-1);
 	    }
 	    nameptr0 = (char **) calloc(1, sizeof(char *));
 	    if(nameptr0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -9997,7 +10144,7 @@ SWdetach(int32 swathID)
 	    }
 	    namelen0 = (int32 *) calloc(1, sizeof(int32));
 	    if(namelen0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10006,7 +10153,7 @@ SWdetach(int32 swathID)
 	    }
 	    dimptr = (char **) calloc(1, sizeof(char *));
 	    if(dimptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10016,7 +10163,7 @@ SWdetach(int32 swathID)
 	    }
 	    dimlen = (int32 *) calloc(1, sizeof(int32));
 	    if(dimlen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10027,7 +10174,7 @@ SWdetach(int32 swathID)
 	    }
 	    offset = (int32 *) calloc(1, sizeof(int32));
 	    if(offset == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10039,7 +10186,7 @@ SWdetach(int32 swathID)
 	    }
 	    indvdims = (int32 *) calloc(1, sizeof(int32));
 	    if(indvdims == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10048,7 +10195,7 @@ SWdetach(int32 swathID)
 		free(dimptr);
 		free(dimlen);
 		free(offset);
-		return(-1);		    
+		return(-1);
 	    }
 	}
 	else
@@ -10070,20 +10217,20 @@ SWdetach(int32 swathID)
 	    /* ----------------------------------------- */
 	    nameptr = (char **) calloc(nflds, sizeof(char *));
 	    if(nameptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		return(-1);
 	    }
 	    namelen = (int32 *) calloc(nflds, sizeof(int32));
 	    if(namelen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		return(-1);
 	    }
 	    nameptr0 = (char **) calloc(nflds, sizeof(char *));
 	    if(nameptr0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10091,7 +10238,7 @@ SWdetach(int32 swathID)
 	    }
 	    namelen0 = (int32 *) calloc(nflds, sizeof(int32));
 	    if(namelen0 == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10100,7 +10247,7 @@ SWdetach(int32 swathID)
 	    }
 	    dimptr = (char **) calloc(nflds, sizeof(char *));
 	    if(dimptr == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10110,7 +10257,7 @@ SWdetach(int32 swathID)
 	    }
 	    dimlen = (int32 *) calloc(nflds, sizeof(int32));
 	    if(dimlen == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10121,7 +10268,7 @@ SWdetach(int32 swathID)
 	    }
 	    offset = (int32 *) calloc(nflds, sizeof(int32));
 	    if(offset == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10133,7 +10280,7 @@ SWdetach(int32 swathID)
 	    }
 	    indvdims = (int32 *) calloc(nflds, sizeof(int32));
 	    if(indvdims == NULL)
-	    { 
+	    {
 		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		free(nameptr);
 		free(namelen);
@@ -10142,7 +10289,7 @@ SWdetach(int32 swathID)
 		free(dimptr);
 		free(dimlen);
 		free(offset);
-		return(-1);		    
+		return(-1);
 	    }
 
 
@@ -10164,15 +10311,31 @@ SWdetach(int32 swathID)
 	    {
 		nambuf = (char *) calloc(strlen(SWXSDname) + 1, 1);
 		if(nambuf == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
+		    free(nameptr);
+		    free(namelen);
+		    free(nameptr0);
+		    free(namelen0);
+		    free(dimptr);
+		    free(dimlen);
+		    free(offset);
+		    free(indvdims);
 		    return(-1);
 		}
 		utlbuf = (char *) calloc(2 * strlen(SWXSDname) + 7, 1);
 		if(utlbuf == NULL)
-		{ 
+		{
 		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
 		    free(nambuf);
+		    free(nameptr);
+		    free(namelen);
+		    free(nameptr0);
+		    free(namelen0);
+		    free(dimptr);
+		    free(dimlen);
+		    free(offset);
+		    free(indvdims);
 		    return(-1);
 		}
 		/* Zero out dimbuf1 */
@@ -10637,16 +10800,16 @@ SWupdatescene(int32 swathID, int32 regionID)
 {
     intn            k;          /* Loop index */
     int32           status;     /* routine return status variable */
- 
+
     int32           fid;        /* HDF-EOS file ID */
     int32           sdInterfaceID;      /* HDF SDS interface ID */
     int32           swVgrpID;   /* Swath Vgroup ID */
- 
+
     int32           startReg;   /* Indexed start region */
     int32           stopReg;    /* Indexed stop region */
-    int32           l_index[MAXNREGIONS]; /* to store indices when stop and 
+    int32           l_index[MAXNREGIONS]; /* to store indices when stop and
 					   start are different */
-					   
+
     int32           ind;        /* l_index */
     int32           tempnRegions; /* temp number of regions */
 
@@ -10656,8 +10819,8 @@ SWupdatescene(int32 swathID, int32 regionID)
     /* ------------------------ */
     status = SWchkswid(swathID, "SWupdatescene", &fid, &sdInterfaceID,
                        &swVgrpID);
- 
- 
+
+
     /* Check for valid region ID */
     /* ------------------------- */
     if (status == 0)
@@ -10669,7 +10832,7 @@ SWupdatescene(int32 swathID, int32 regionID)
             HEreport("Invalid Region id: %d.\n", regionID);
         }
     }
- 
+
     /* Check for active region ID */
     /* -------------------------- */
     if (status == 0)
@@ -10681,12 +10844,12 @@ SWupdatescene(int32 swathID, int32 regionID)
             HEreport("Inactive Region ID: %d.\n", regionID);
         }
     }
-  
+
     if (status == 0)
     {
 	tempnRegions = SWXRegion[regionID]->nRegions;
 	ind =0;
-	
+
 	for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
         {
            startReg = SWXRegion[regionID]->StartRegion[k];
@@ -10696,10 +10859,10 @@ SWupdatescene(int32 swathID, int32 regionID)
 	       /* reduce number of regions by 1, if tempnRegions is 0 issue
 		  error and break from loop*/
 	       tempnRegions -= 1;
-	       
+
 	       if(tempnRegions == 0)
 	       {
-		   /* first free allocated memory for SWXRegion[regionID] 
+		   /* first free allocated memory for SWXRegion[regionID]
 		      in the function SWdefboxregion and make regionID
 		      inactive */
 		   free(SWXRegion[regionID]);
@@ -10726,7 +10889,7 @@ SWupdatescene(int32 swathID, int32 regionID)
 	{
 	    SWXRegion[regionID]->nRegions = tempnRegions;
 	}
-	/* keep starts and stops that are different in the structure  */   
+	/* keep starts and stops that are different in the structure  */
 	for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
 	{
 	    SWXRegion[regionID]->StartRegion[k] =
@@ -10734,36 +10897,36 @@ SWupdatescene(int32 swathID, int32 regionID)
 	    SWXRegion[regionID]->StopRegion[k] =
 	      SWXRegion[regionID]->StopRegion[l_index[k]];
 	}
-	
+
     }
 
-    
+
     if (status == 0)
     {
- 
+
         for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
         {
- 
+
            startReg = SWXRegion[regionID]->StartRegion[k];
            stopReg = SWXRegion[regionID]->StopRegion[k];
- 
+
            if(startReg % 2 == 1) {
- 
+
               SWXRegion[regionID]->StartRegion[k] = ++startReg;
- 
+
            }
            if(stopReg % 2 == 0) {
- 
+
               SWXRegion[regionID]->StopRegion[k] = --stopReg;
- 
+
            }
- 
+
         }
- 
+
     }
-    
+
     return(status);
- 
+
 }
 
 /*----------------------------------------------------------------------------|
@@ -10807,14 +10970,14 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
     intn            k;          /* Loop index */
     int32           status;     /* routine return status variable */
     int32           land_status = 3;     /* routine return status variable */
- 
+
     int32           fid;        /* HDF-EOS file ID */
     int32           sdInterfaceID;      /* HDF SDS interface ID */
     int32           swVgrpID;   /* Swath Vgroup ID */
 
     int32           numtype = 0; /* Used for L7 float scene sub. */
     int32           count = 0;   /* Used for L7 float scene sub. */
- 
+
     int32           startReg = 0;   /* Indexed start region */
     int32           stopReg = 0;    /* Indexed stop region */
     int32           nout=-1;       /* Number of elements in output l_index array */
@@ -10825,13 +10988,13 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
     intn	    ngtflag = 0;
     int32           *buffer1 = (int32 *)NULL;
     int32           *buffer2 = (int32 *)NULL;
- 
+
     /* Check for valid swath ID */
     /* ------------------------ */
     status = SWchkswid(swathID, "SWupdateidxmap", &fid, &sdInterfaceID,
                        &swVgrpID);
- 
- 
+
+
     /* Check for valid region ID */
     /* ------------------------- */
     if (status == 0)
@@ -10843,7 +11006,7 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
             HEreport("Invalid Region id: %d.\n", regionID);
         }
     }
- 
+
     /* Check for active region ID */
     /* -------------------------- */
     if (status == 0)
@@ -10855,20 +11018,20 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
             HEreport("Inactive Region ID: %d.\n", regionID);
         }
     }
- 
+
     if (status == 0)
     {
 	/* Loop through all regions */
 	/* ------------------------ */
 	for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
 	{
-	    
+
 	    /* fix overlap l_index mapping problem for Landsat 7 */
-	    
+
 	    startReg = SWXRegion[regionID]->StartRegion[k];
 	    stopReg = SWXRegion[regionID]->StopRegion[k];
-	    
-	    
+
+
             if(SWXRegion[regionID]->scanflag == 1)
             {
                indicies[0] = -1;
@@ -10885,16 +11048,16 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                   land_status = SWreadattr(swathID, "detector_count", &detect_cnt);
                }
 
-	      
+
 	      /* calculate the offsets first */
 	      buffer1 = (int32 *)calloc(74, sizeof(int32));
 	      buffer2 = (int32 *)calloc(74, sizeof(int32));
-	      
+
 	      status = SWidxmapinfo(swathID,"GeoTrack",
 				    "ScanLineTrack", (int32*)buffer1);
 	      status = SWidxmapinfo(swathID,"UpperTrack",
 				    "ScanLineTrack", (int32*)buffer2);
-	      
+
 	      indexoffset = buffer2[0] - buffer1[0];
 	      free(buffer1);
 	      free(buffer2);
@@ -10973,11 +11136,11 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                   {
                      for(i=0; i<scene_cnt; i++)
                      {
-		      if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) && 
+		      if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
 			  startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
                            if(indicies[0] == -1)
                               indicies[0] = j;
-		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) && 
+		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
 			  stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
                            indicies[1] = j + 1;
                         j = j + 2;
@@ -10993,7 +11156,7 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                      if(SWXRegion[regionID]->band8flag == 2 ||
                         SWXRegion[regionID]->band8flag == 3)
                      {
-		       
+
                         if(startReg >= (l_indexin[j - 1] + indexoffset - detect_cnt))
                         {
                            indicies[0] = -1;
@@ -11008,11 +11171,11 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                            j = 0;
                            for(i=0; i<scene_cnt; i++)
                            {
-			     if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) && 
+			     if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
 				 startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
 			       if(indicies[0] == -1)
 				 indicies[0] = j;
-			     if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) && 
+			     if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
 				 stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
 			       indicies[1] = j + 1;
                               j = j + 2;
@@ -11026,11 +11189,11 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                            j = 0;
                            for(i=0; i<scene_cnt; i++)
                            {
-			     if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) && 
+			     if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
 				 startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
 			       if(indicies[0] == -1)
 				 indicies[0] = j;
-		      
+
 			     j = j + 2;
 			     if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
 			       i = scene_cnt;
@@ -11045,7 +11208,7 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                         j = 0;
                         for(i=0; i<scene_cnt; i++)
                         {
-			  if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) && 
+			  if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
 			      stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
 			    indicies[1] = j;
 			  j = j + 2;
@@ -11146,14 +11309,14 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                            j = 0;
                            for(i=0;i<scene_cnt;i++)
                            {
-		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) && 
+		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
 			  stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
 			         indicies[1] = j;
 			      j = j + 2;
                               if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
                                  i = scene_cnt;
                            }
-                        }	
+                        }
                      }
 
                      if(startReg > (l_indexin[j - 1] + indexoffset - detect_cnt ))
@@ -11170,11 +11333,11 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                         j = 0;
                         for(i=0; i<scene_cnt; i++)
                         {
-		      if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) && 
+		      if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
 			  startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
                               if(indicies[0] == -1)
                                  indicies[0] = j;
-		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) && 
+		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
 			  stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
                               indicies[1] = j + 1;
                            j = j + 2;
@@ -11199,7 +11362,7 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
 	       {
 		  startReg++;
 	       }
-	    
+
 	       /* If end of region is even then decrement */
 	       /* --------------------------------------- */
 	       if (stopReg % 2 == 0)
@@ -11211,9 +11374,9 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
                indicies[1]=stopReg;
 	   }
         }
-	
+
 	if (l_indexout != NULL)
-	{ 
+	{
            if(SWXRegion[regionID]->scanflag == 1)
            {
               nout = (indicies[1] - indicies[0] + 1);
@@ -11241,17 +11404,17 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
            nout = indicies[1] - indicies[0] + 1;
 	}
      }
-   
-    
+
+
     if(status == -1)
-    {  
+    {
 	return(status);
     }
     else
     {
         return(nout);
     }
-    
+
 }
 
 
@@ -11293,7 +11456,7 @@ SWgeomapinfo(int32 swathID, const char *geodim)
 
 {
     intn            status;	/* routine return status variable */
-    
+
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           swVgrpID;	/* Swath root Vgroup ID */
@@ -11306,19 +11469,19 @@ SWgeomapinfo(int32 swathID, const char *geodim)
     char            swathname[80];	/* Swath Name */
     char           *utlstrr;	 /* Utility string */
     char           *utlstri;	 /* Utility string */
-   
-    
+
+
     /* Allocate space for utility string */
     /* --------------------------------- */
     utlstrr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstrr == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWgeomapinfo", __FILE__, __LINE__);
 	return(-1);
     }
     utlstri = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstri == NULL)
-    { 
+    {
 	HEpush(DFE_NOSPACE,"SWgeomapinfo", __FILE__, __LINE__);
 	free(utlstrr);
 	return(-1);
@@ -11330,7 +11493,14 @@ SWgeomapinfo(int32 swathID, const char *geodim)
     if (status == 0)
     {
 	/* Get swath name */
-	Vgetname(SWXSwath[swathID % idOffset].IDTable, swathname);
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    free(utlstrr);
+	    free(utlstri);
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 	/* Get pointers to "DimensionMap" section within SM */
 	metabufr = EHmetagroup(sdInterfaceID, swathname, "s",
@@ -11346,7 +11516,7 @@ SWgeomapinfo(int32 swathID, const char *geodim)
 	snprintf(utlstrr, UTLSTR_MAX_SIZE, "%s%s%s", "\t\t\t\tGeoDimension=\"", geodim,
 		"\"\n\t\t\t\tDataDimension=");
 	metaptrsr[0] = strstr(metaptrsr[0], utlstrr);
-	
+
 	/* Get pointers to "IndexDimensionMap" section within SM */
 	metabufi = EHmetagroup(sdInterfaceID, swathname, "s",
 				       "IndexDimensionMap", metaptrsi);
@@ -11367,12 +11537,12 @@ SWgeomapinfo(int32 swathID, const char *geodim)
         */
 	if (metaptrsr[0] < metaptrsr[1] && metaptrsr[0] != NULL)
 	{
-	    status = status + 1;	    
+	    status = status + 1;
         }
 
         if (metaptrsi[0] < metaptrsi[1] && metaptrsi[0] != NULL)
         {
-           status = status + 2;	    
+           status = status + 2;
         }
 
 	free(metabufr);

From 46870fb121544dea6b81ed13d592d5d6f6091332 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 25 Nov 2024 02:44:23 +0100
Subject: [PATCH 19/21] frmts/hdf4/hdf-eos: disable lots of code unused by GDAL

---
 frmts/hdf4/hdf-eos/EHapi.c     |  23 ++++---
 frmts/hdf4/hdf-eos/GDapi.c     | 107 +++++++++++++++++++++++----------
 frmts/hdf4/hdf-eos/HdfEosDef.h |  69 ++++++++++++++++++---
 frmts/hdf4/hdf-eos/SWapi.c     | 104 ++++++++++++++++++++++----------
 4 files changed, 221 insertions(+), 82 deletions(-)

diff --git a/frmts/hdf4/hdf-eos/EHapi.c b/frmts/hdf4/hdf-eos/EHapi.c
index 3da68c6a9e75..8a6b6af3877d 100644
--- a/frmts/hdf4/hdf-eos/EHapi.c
+++ b/frmts/hdf4/hdf-eos/EHapi.c
@@ -46,7 +46,9 @@ static int32 *EHXsdTable = NULL;
 #define MAX_RETRIES 10
 
 /* Function Prototypes */
+#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 static intn EHmetalist(const char *, char *);
+#endif
 static intn EHreset_maxopenfiles(intn);
 static intn EHget_maxopenfiles(intn *, intn *);
 static intn EHget_numfiles(void);
@@ -580,7 +582,7 @@ EHidinfo(int32 fid, int32 * HDFfid, int32 * sdInterfaceID)
 }
 
 
-
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -623,7 +625,7 @@ EHfilename(int32 fid, char *filename)
 
     return (status);
 }
-
+#endif
 
 
 
@@ -1396,6 +1398,7 @@ EHrevflds(const char *dimlist, char *revdimlist)
 }
 
 
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -1511,10 +1514,11 @@ EHcntGROUP(char *metabuf[])
 
     return (count);
 }
+#endif
 
 
 
-
+#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -1632,11 +1636,11 @@ EHmetalist(const char *instring, char *outstring)
 
     return (status);
 }
+#endif
 
 
 
-
-
+#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -2391,6 +2395,7 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 
     return (status);
 }
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -2681,7 +2686,7 @@ EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
 
 
 
-
+#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -2909,12 +2914,12 @@ EHfillfld(int32 sdid, int32 rank, CPL_UNUSED int32 truerank, int32 size, int32 o
 
     return (status);
 }
+#endif
 
 
 
 
-
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -3058,7 +3063,7 @@ EHbisect(float64(*func) (float64[]), float64 funcParms[], int32 nParms,
 
     return (status);
 }
-
+#endif
 
 
 
diff --git a/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c
index 6ff94e30836c..cc09d9379983 100644
--- a/frmts/hdf4/hdf-eos/GDapi.c
+++ b/frmts/hdf4/hdf-eos/GDapi.c
@@ -102,9 +102,11 @@ extern  void inv_init(int32, int32, float64 *, int32, const char *, const char *
 #define	GDIDOFFSET 4194304
 #define SQUARE(x)       ((x) * (x))   /* x**2 */
 
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
 static int32 GDXSDcomb[512*5];
-static char  GDXSDname[HDFE_NAMBUFSIZE];
 static char  GDXSDdims[HDFE_DIMBUFSIZE];
+static char  GDXSDname[HDFE_NAMBUFSIZE];
+#endif
 
 
 #define NGRID 200
@@ -231,16 +233,21 @@ static intn GDll2ij(int32, int32, float64 [], int32, int32, int32, float64[],
                     float64[], float64[]);
 static intn  GDgetdefaults(int32, int32, float64[], int32,
                            float64[], float64[]);
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 static intn GDtangentpnts(int32, float64[], float64[], float64[], float64[],
                           float64 [], int32 *);
+#endif
 static intn GDwrrdtile(int32, const char *, const char *, int32 [], VOIDP);
+#ifdef UNUSED_BY_GDAL
 static intn GDll2mm_cea(int32,int32, int32, float64[], int32, int32,
                         float64[], float64[], int32, float64[],float64[],
                         float64[], float64[], float64 *, float64 *);
-
+#endif
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 static intn GDmm2ll_cea(int32, int32, int32, float64[],	int32, int32,
                         float64[], float64[], int32, float64[], float64[],
                         float64[], float64[]);
+#endif
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -287,7 +294,7 @@ GDopen(const char *filename, intn l_access)
 }
 
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -550,7 +557,7 @@ GDcreate(int32 fid, const char *gridname, int32 xdimsize, int32 ydimsize,
     }
     return (gridID);
 }
-
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -909,7 +916,7 @@ GDchkgdid(int32 gridID, const char *routname,
 
 }
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -1558,7 +1565,7 @@ GDdefpixreg(int32 gridID, int32 pixregcode)
     return (status);
 
 }
-
+#endif
 
 
 
@@ -2771,7 +2778,7 @@ GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
 
 
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -3571,7 +3578,7 @@ GDwritefieldmeta(int32 gridID, const char *fieldname, const char *dimlist,
     }
     return (status);
 }
-
+#endif
 
 
 
@@ -4078,7 +4085,7 @@ GDwrrdfield(int32 gridID, const char *fieldname, const char *code,
     return (status);
 }
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -4122,7 +4129,7 @@ GDwritefield(int32 gridID, const char *fieldname,
 			 data);
     return (status);
 }
-
+#endif
 
 
 
@@ -4241,7 +4248,7 @@ GDwrrdattr(int32 gridID, const char *attrname, int32 numbertype, int32 count,
 }
 
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -4285,7 +4292,7 @@ GDwriteattr(int32 gridID, const char *attrname, int32 numbertype, int32 count,
 
     return (status);
 }
-
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -5068,6 +5075,7 @@ GDinqgrid(const char *filename, char *gridlist, int32 * strbufsize)
 }
 
 
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -5153,7 +5161,7 @@ GDsetfillvalue(int32 gridID, const char *fieldname, VOIDP fillval)
     }
     return (status);
 }
-
+#endif
 
 
 
@@ -5272,13 +5280,18 @@ GDdetach(int32 gridID)
 
 {
     intn            i;		/* Loop index */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     intn            j;		/* Loop index */
+#endif
     intn            k;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     intn            statusFill = 0;	/* return status from GDgetfillvalue */
+#endif
 
-    int32          *namelen;	/* Pointer to name string length array */
-    int32          *dimlen;	/* Pointer to dim string length array */
+    int32          *namelen = NULL;	/* Pointer to name string length array */
+    int32          *dimlen = NULL;	/* Pointer to dim string length array */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     int32           slen1[3];	/* String length array 1 */
     int32           slen2[3];	/* String length array 2 */
     int32           nflds;	/* Number of fields */
@@ -5287,29 +5300,39 @@ GDdetach(int32 gridID)
     int32           sdid;	/* SDS ID */
     int32           vgid;	/* Vgroup ID */
     int32           dims[3];	/* Dimension array */
-    int32          *offset;	/* Pointer to merged field offset array */
-    int32          *indvdims;	/* Pointer to merged field size array */
+#endif
+    int32          *offset = NULL;	/* Pointer to merged field offset array */
+    int32          *indvdims = NULL;	/* Pointer to merged field size array */
     int32           sdInterfaceID;	/* SDS interface ID */
     int32           gID;	/* Grid ID - offset */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     int32           nflds0;	/* Number of fields */
-    int32          *namelen0;	/* Pointer to name string length array */
+#endif
+    int32          *namelen0 = NULL;	/* Pointer to name string length array */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     int32           rank;	/* Rank of merged field */
     int32           truerank;	/* True rank of merged field */
+#endif
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
     int32           dum;	/* Dummy variable */
 
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     char           *nambuf;	/* Pointer to name buffer */
-    char          **nameptr;	/* Pointer to name string pointer array */
-    char          **dimptr;	/* Pointer to dim string pointer array */
-    char          **nameptr0;	/* Pointer to name string pointer array */
+#endif
+    char          **nameptr = NULL;	/* Pointer to name string pointer array */
+    char          **dimptr = NULL;	/* Pointer to dim string pointer array */
+    char          **nameptr0 = NULL;	/* Pointer to name string pointer array */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     char           *ptr1[3];	/* String pointer array */
     char           *ptr2[3];	/* String pointer array */
     char            dimbuf1[128];	/* Dimension buffer 1 */
     char            dimbuf2[128];	/* Dimension buffer 2 */
+#endif
     char            gridname[VGNAMELENMAX + 1];	/* Grid name */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
     char           *utlbuf;	/* Utility buffer */
     char            fillval[32];/* Fill value buffer */
-
+#endif
 
 
     status = GDchkgdid(gridID, "GDdetach", &dum, &sdInterfaceID, &dum);
@@ -5325,9 +5348,13 @@ GDdetach(int32 gridID)
 
 	/* SDS combined fields */
 	/* ------------------- */
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
 	if (strlen(GDXSDname) == 0)
+#endif
 	{
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
 	    nflds = 0;
+#endif
 
 	    /* Allocate "dummy" arrays so free() doesn't bomb later */
 	    /* ---------------------------------------------------- */
@@ -5408,6 +5435,7 @@ GDdetach(int32 gridID)
 		return(-1);
 	    }
 	}
+#if defined(HDFEOS_GD_WRITE_SUPPORT)
 	else
 	{
 	    /*
@@ -5507,7 +5535,6 @@ GDdetach(int32 gridID)
 	    nflds = EHparsestr(GDXSDdims, ';', dimptr, dimlen);
 	}
 
-
 	for (i = 0; i < nflds; i++)
 	{
 	    if (GDXSDcomb[5 * i] != 0 &&
@@ -5764,7 +5791,7 @@ GDdetach(int32 gridID)
 	    strcat(GDXSDname, ",");
 	    strcat(GDXSDdims, ";");
 	}
-
+#endif
 
 
 	/* Free up a bunch of dynamically allocated arrays */
@@ -6676,7 +6703,7 @@ GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
 
 
 
-
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -6934,9 +6961,10 @@ GDrs2ll(int32 projcode, float64 projparm[],
 
     return (status);
 }
+#endif
 
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -7124,7 +7152,6 @@ homDyDtheta(float64 parms[])
 
 
 
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -8332,11 +8359,11 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
     free(gridname);
     return (regionID);
 }
+#endif
 
 
 
-
-
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -8966,6 +8993,7 @@ GDdupregion(int32 oldregionID)
     }
     return (newregionID);
 }
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -9046,7 +9074,7 @@ for (j=0; j<8; j++) \
 } \
 
 
-
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 int32
 GDdefvrtregion(int32 gridID, int32 regionID, const char *vertObj, float64 range[])
 {
@@ -9374,7 +9402,7 @@ GDdeftimeperiod(int32 gridID, int32 periodID, float64 starttime,
 
     return (periodID);
 }
-
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -9844,6 +9872,7 @@ GDgetpixvalues(int32 gridID, int32 nPixels, int32 pixRow[], int32 pixCol[],
 }
 
 
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -10271,6 +10300,8 @@ GDinterpolate(int32 gridID, int32 nValues, float64 lonVal[], float64 latVal[],
     }
 
 }
+#endif
+
 /***********************************************
 GDwrrdtile --
      This function is the underlying function below GDwritetile and
@@ -10393,7 +10424,6 @@ GDwrrdtile(int32 gridID, const char *fieldname, const char *code, int32 start[],
     return (status);
 }
 
-
 /***********************************************
 GDtileinfo --
      This function queries the field to determine if it is tiled.  If it is
@@ -10496,6 +10526,7 @@ Alexis Zubrow
 
 ********************************************************/
 
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 intn
 GDwritetile(int32 gridID, const char *fieldname, int32 tilecoords[],
 	    VOIDP tileData)
@@ -10507,6 +10538,8 @@ GDwritetile(int32 gridID, const char *fieldname, int32 tilecoords[],
 
     return (status);
 }
+#endif
+
 /***********************************************
 GDreadtile --
      This function reads one tile from a particular field.
@@ -10528,6 +10561,8 @@ GDreadtile(int32 gridID, const char *fieldname, int32 tilecoords[],
 
     return (status);
 }
+
+#ifdef UNUSED_BY_GDAL
 /***********************************************
 GDsettilecache --
      This function sets the cache size for a tiled field.
@@ -10600,7 +10635,10 @@ GDsettilecache(int32 gridID, const char *fieldname, int32 maxcache, CPL_UNUSED i
 
     return (status);
 }
+#endif
+
 
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -10753,7 +10791,9 @@ GDsettilecomp(int32 gridID, const char *fieldname, int32 tilerank, int32*
     }
     return (status);
 }
+#endif
 
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -10884,8 +10924,10 @@ static intn GDll2mm_cea(int32 projcode,int32 zonecode, int32 spherecode,
       }
     return (0);
 }
+#endif
 
 
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -10975,6 +11017,7 @@ static intn GDmm2ll_cea(int32 projcode,int32 zonecode, int32 spherecode,
       }
     return(status);
 }
+#endif
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
diff --git a/frmts/hdf4/hdf-eos/HdfEosDef.h b/frmts/hdf4/hdf-eos/HdfEosDef.h
index 88f65dddbd2d..66fe1632d48b 100644
--- a/frmts/hdf4/hdf-eos/HdfEosDef.h
+++ b/frmts/hdf4/hdf-eos/HdfEosDef.h
@@ -10,9 +10,9 @@
 /*
 Copyright (C) 1996 Hughes and Applied Research Corporation
 
-Permission to use, modify, and distribute this software and its documentation 
-for any purpose without fee is hereby granted, provided that the above 
-copyright notice appear in all copies and that both that copyright notice and 
+Permission to use, modify, and distribute this software and its documentation
+for any purpose without fee is hereby granted, provided that the above
+copyright notice appear in all copies and that both that copyright notice and
 this permission notice appear in supporting documentation.
 */
 
@@ -81,9 +81,9 @@ this permission notice appear in supporting documentation.
 
 /* Compression Modes */
 #define HDFE_COMP_NONE     0
-#define HDFE_COMP_RLE      1    
+#define HDFE_COMP_RLE      1
 #define HDFE_COMP_NBIT     2
-#define HDFE_COMP_SKPHUFF  3    
+#define HDFE_COMP_SKPHUFF  3
 #define HDFE_COMP_DEFLATE  4
 
 
@@ -130,15 +130,20 @@ extern "C" {
 
 /* Swath Prototype */
 int32 SWopen(const char *, intn);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 int32 SWcreate(int32, const char *);
+#endif
 int32 SWattach(int32, const char *);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 intn SWdefdim(int32, char *, int32);
 intn SWdefcomp(int32, int32, intn []);
+#endif
 int32 SWdiminfo(int32, const char *);
 intn SWmapinfo(int32, const char *, const char *, int32 *, int32 *);
 int32 SWidxmapinfo(int32, const char *, const char *, int32 []);
 intn SWfieldinfo(int32, const char *, int32 *, int32 [], int32 *, char *);
 intn SWcompinfo(int32, const char *, int32 *, intn []);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 intn SWdefdimmap(int32, const char *, const char *, int32, int32);
 intn SWdefidxmap(int32, const char *, const char *, int32 []);
 intn SWdefgeofield(int32, const char *, const char *, int32, int32);
@@ -146,6 +151,7 @@ intn SWdefdatafield(int32, const char *, const char *, int32, int32);
 intn SWwritegeometa(int32, const char *, const char *, int32);
 intn SWwritedatameta(int32, const char *, const char *, int32);
 intn SWwriteattr(int32, const char *, int32, int32, VOIDP);
+#endif
 intn SWreadattr(int32, const char *, VOIDP);
 intn SWattrinfo(int32, const char *, int32 *, int32 *);
 int32 SWinqdims(int32, char *, int32 []);
@@ -156,31 +162,50 @@ int32 SWinqdatafields(int32, char *, int32 [],int32 []);
 int32 SWinqattrs(int32, char *, int32 *);
 int32 SWnentries(int32, int32, int32 *);
 int32 SWinqswath(const char *, char *, int32 *);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 intn SWwritefield(int32, const char *, int32 [], int32 [], int32 [], VOIDP);
+#endif
 intn SWreadfield(int32, const char *, int32 [], int32 [], int32 [], VOIDP);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 int32 SWdefboxregion(int32, float64 [], float64 [], int32);
 int32 SWdefscanregion(int32, const char *, float64 [], int32);
+#endif
+#ifdef UNUSED_BY_GDAL
 int32 SWregionindex(int32, float64 [], float64 [], int32, char *, int32 []);
 intn SWextractregion(int32, int32, const char *, int32, VOIDP);
 intn SWregioninfo(int32, int32, const char *, int32 *, int32 *, int32 [], int32 *);
 int32 SWdupregion(int32);
+#endif
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 int32 SWdeftimeperiod(int32, float64, float64, int32);
+#endif
+#ifdef UNUSED_BY_GDAL
 intn SWextractperiod(int32, int32, const char *, int32, VOIDP);
 intn SWperiodinfo(int32, int32, const char *, int32 *, int32 *, int32 [], int32 *);
 int32 SWdefvrtregion(int32, int32, const char *, float64 []);
+#endif
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 intn SWsetfillvalue(int32, const char *, VOIDP);
+#endif
 intn SWgetfillvalue(int32, const char *, VOIDP);
 intn SWdetach(int32);
 intn SWclose(int32);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 int32 SWupdateidxmap(int32, int32, int32 [], int32 [], int32 []);
+#endif
 intn SWgeomapinfo(int32, const char *);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 intn SWupdatescene(int32, int32);
+#endif
 intn SWsdid(int32, const char *, int32 *);
 
 /* Grid Prototypes */
 int32 GDopen(const char *, intn);
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 int32 GDcreate(int32, const char *, int32, int32, float64 [], float64 []);
+#endif
 int32 GDattach(int32, const char *);
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 intn GDdefdim(int32, const char *, int32);
 intn GDdefproj(int32, int32, int32, int32, float64 []);
 intn GDblkSOMoffset(int32, float32 [], int32, const char *);
@@ -189,6 +214,7 @@ intn GDdeftile(int32, int32, int32, int32 []);
 intn GDsettilecomp(int32, const char *, int32, int32 *, int32, intn *);
 intn GDdeforigin(int32, int32);
 intn GDdefpixreg(int32, int32);
+#endif
 int32 GDdiminfo(int32, const char *);
 intn GDgridinfo(int32, int32 *, int32 *, float64 [], float64 []);
 intn GDprojinfo(int32, int32 *, int32 *, int32 *, float64 []);
@@ -197,15 +223,23 @@ intn GDpixreginfo(int32, int32 *);
 intn GDcompinfo(int32, const char *, int32 *, intn []);
 intn GDfieldinfo(int32, const char *, int32 *, int32 [], int32 *, char *);
 intn GDtileinfo(int32, const char *, int32 *, int32 *, int32 []);
+#ifdef UNUSED_BY_GDAL
 intn GDsettilecache(int32, const char *, int32, int32);
+#endif
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 intn GDwritetile(int32, const char *, int32 [], VOIDP);
+#endif
 intn GDreadtile(int32, const char *, int32 [],  VOIDP);
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 intn GDdeffield(int32, const char *, const char *, int32, int32);
 intn GDwritefieldmeta(int32, const char *, const char *, int32);
 intn GDwritefield(int32, const char *,
 	     int32 [], int32 [], int32 [], VOIDP);
+#endif
 intn GDreadfield(int32, const char *, int32 [], int32 [], int32 [], VOIDP);
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 intn GDwriteattr(int32, const char *, int32 , int32, VOIDP);
+#endif
 intn GDreadattr(int32, const char *, VOIDP);
 intn GDattrinfo(int32, const char *, int32 *, int32 *);
 int32 GDinqdims(int32, char *, int32 []);
@@ -213,26 +247,37 @@ int32 GDinqfields(int32, char *, int32 [], int32 []);
 int32 GDinqattrs(int32, char *, int32 *);
 int32 GDnentries(int32, int32, int32 *);
 int32 GDinqgrid(const char *, char *, int32 *);
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 int32 GDdefboxregion(int32, float64 [], float64 []);
 int32 GDdefvrtregion(int32, int32, const char *, float64 []);
 int32 GDdeftimeperiod(int32, int32, float64, float64);
+#endif
+#ifdef UNUSED_BY_GDAL
 intn GDextractregion(int32, int32, const char *, VOIDP);
 intn GDregioninfo(int32, int32, const char *, int32 *, int32 *, int32 [], int32 *,
                    float64 [], float64 []);
 int32 GDdupregion(int32);
+#endif
 intn GDgetpixels(int32, int32, float64 [], float64 [], int32 [], int32 []);
 int32 GDgetpixvalues(int32, int32, int32 [], int32 [], const char *, VOIDP);
+#ifdef UNUSED_BY_GDAL
 int32 GDinterpolate(int32, int32, float64 [], float64 [], const char *, float64 []);
+#endif
+#ifdef HDFEOS_GD_WRITE_SUPPORT
 intn GDsetfillvalue(int32, const char *, VOIDP);
+#endif
 intn GDgetfillvalue(int32, const char *, VOIDP);
 intn GDdetach(int32);
 intn GDclose(int32);
+#ifdef UNUSED_BY_GDAL
 intn GDrs2ll(int32, float64 [], int32, int32,
 	     float64 [], float64 [],
 	     int32, float64 [], float64 [],
 	     float64 [], float64 [], int32, int32);
+#endif
 intn GDsdid(int32, const char *, int32 *);
 
+#ifdef UNUSED_BY_GDAL
 /* Point Prototypes */
 int32 PTopen(const char *, intn);
 int32 PTcreate(int32, const char *);
@@ -268,7 +313,7 @@ intn PTextractregion(int32, int32 regionID, int32, const char *, VOIDP);
 intn PTextractperiod(int32, int32 periodID, int32, const char *, VOIDP);
 intn PTdetach(int32);
 intn PTclose(int32);
-
+#endif
 
 
 /* EH Utility Prototypes */
@@ -284,21 +329,29 @@ intn EHchkfid(int32, const char *, int32 *, int32 *, uint8 *);
 intn EHidinfo(int32, int32 *, int32 *);
 int32 EHgetid(int32, int32, const char *, intn, const char *);
 intn EHrevflds(const char *, char *);
+#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 intn EHinsertmeta(int32, const char *, const char *, int32, char *, int32 []);
+#endif
 intn EHgetmetavalue(char *[], const char *, char *);
 char * EHmetagroup(int32, const char *, const char *, const char *, char *[]);
+#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 intn EHfillfld(int32, int32, int32, int32, int32, int32 [], VOIDP);
+#endif
 intn EHattr(int32, int32, const char *, int32, int32, const char *, VOIDP);
 intn EHattrinfo(int32, int32, const char *, int32 *, int32 *);
 int32 EHattrcat(int32, int32, char *, int32 *);
+#ifdef UNUSED_BY_GDAL
 intn EHfilename(int32, char *);
 int32 EHcntOBJECT(char *[]);
 int32 EHcntGROUP(char *[]);
-/* 9/3/97 Abe changed the first argument from 
+#endif
+/* 9/3/97 Abe changed the first argument from
    float64 (float64 []) to float64 (*) (float64 [])  for SunOS
    float64 () (float64 []) to float64 (*) (float64 [])  for all other OSs */
-intn EHbisect(float64 (*) (float64 []), float64 [], int32, float64, float64, 
+#ifdef HDFEOS_GD_WRITE_SUPPORT
+intn EHbisect(float64 (*) (float64 []), float64 [], int32, float64, float64,
 	      float64, float64 *);
+#endif
 int32 EHinquire(const char *, const char *, char *, int32 *);
 intn EHclose(int32);
 
diff --git a/frmts/hdf4/hdf-eos/SWapi.c b/frmts/hdf4/hdf-eos/SWapi.c
index 4e51d32666bc..27c11e3340a9 100644
--- a/frmts/hdf4/hdf-eos/SWapi.c
+++ b/frmts/hdf4/hdf-eos/SWapi.c
@@ -88,15 +88,21 @@ June 05, 2003 Abe Taaheri / Bruce Beaumont
 
 
 static int32 SWX1dcomb[512*3];
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 static int32 SWXSDcomb[512*5];
+#endif
 static char  SWXSDname[HDFE_NAMBUFSIZE];
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 static char  SWXSDdims[HDFE_DIMBUFSIZE];
+#endif
 
+#ifdef UNUSED_BY_GDAL
 /* This flag was added to allow the Time field to have different Dimensions
 ** than Longitude and Latitude and still be used for subsetting
 ** 23 June,1997  DaW
 */
 static intn  timeflag = 0;
+#endif
 
 
 /* Added for routine that converts scanline to Lat/long
@@ -158,7 +164,9 @@ static struct swathRegion *SWXRegion[NSWATHREGN];
 static intn SWchkswid(int32, const char *, int32 *, int32 *, int32 *);
 static int32 SWfinfo(int32, const char *, const char *, int32 *,
                      int32 [], int32 *, char *);
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 static intn SWdefinefield(int32, const char *, const char *, const char *, int32, int32);
+#endif
 static intn SWwrrdattr(int32, const char *, int32, int32, const char *, VOIDP);
 static intn SW1dfldsrch(int32, int32, const char *, const char *, int32 *,
                         int32 *, int32 *);
@@ -167,9 +175,10 @@ static intn SWSDfldsrch(int32, int32, const char *, int32 *, int32 *,
 static intn SWwrrdfield(int32, const char *, const char *,
                         int32 [], int32 [], int32 [], VOIDP);
 static int32 SWinqfields(int32, const char *, char *, int32 [], int32 []);
+#ifdef UNUSED_BY_GDAL
 static intn SWscan2longlat(int32, const char *, VOIDP, int32 [], int32 [],
                            int32 *, int32, int32);
-
+#endif
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -213,6 +222,7 @@ SWopen(const char *filename, intn i_access)
     return (fid);
 }
 
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -455,7 +465,7 @@ SWcreate(int32 fid, const char *swathname)
     }
     return (swathID);
 }
-
+#endif
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -874,7 +884,7 @@ SWchkswid(int32 swathID, const char *routname,
 
 
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -951,7 +961,7 @@ SWdefdim(int32 swathID, char *dimname, int32 dim)
     }
     return (status);
 }
-
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -1840,7 +1850,7 @@ SWfieldinfo(int32 swathID, const char *fieldname, int32 * rank, int32 dims[],
 
 
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -2842,7 +2852,6 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 
 
 
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -3077,6 +3086,7 @@ SWwritedatameta(int32 swathID, const char *fieldname, const char *dimlist,
     }
     return (status);
 }
+#endif
 
 
 
@@ -3145,7 +3155,7 @@ SWwrrdattr(int32 swathID, const char *attrname, int32 numbertype, int32 count,
 }
 
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -3189,7 +3199,7 @@ SWwriteattr(int32 swathID, const char *attrname, int32 numbertype, int32 count,
 
     return (status);
 }
-
+#endif
 
 
 /*----------------------------------------------------------------------------|
@@ -5262,7 +5272,7 @@ SWwrrdfield(int32 swathID, const char *fieldname, const char *code,
 }
 
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -5306,7 +5316,7 @@ SWwritefield(int32 swathID, const char *fieldname,
 			 data);
     return (status);
 }
-
+#endif
 
 
 
@@ -5358,7 +5368,7 @@ SWreadfield(int32 swathID, const char *fieldname,
 
 
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -5988,10 +5998,11 @@ SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
     }
 
 }
+#endif
 
 
 
-
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -6631,9 +6642,9 @@ SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
     }
 
 }
+#endif
 
-
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -6928,7 +6939,9 @@ SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
 
     return (periodID);
 }
+#endif
 
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -7756,6 +7769,7 @@ SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
 }
 
 
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -8109,6 +8123,7 @@ int32 edge[], int32 *idxmap, int32 startscanline, int32 stopscanline)
 }
 
 
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -8158,13 +8173,13 @@ SWextractperiod(int32 swathID, int32 periodID, const char *fieldname,
     if (status != 0) timeflag = 0; /*clear timeflag if SWextractregion failed*/
     return (status);
 }
+#endif
 
 
 
 
 
-
-
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -8231,8 +8246,10 @@ SWdupregion(int32 oldregionID)
 
     return (newregionID);
 }
+#endif
 
 
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -8898,9 +8915,9 @@ SWregioninfo(int32 swathID, int32 regionID, const char *fieldname,
 
     return (status);
 }
+#endif
 
-
-
+#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -9518,9 +9535,10 @@ SWdefvrtregion(int32 swathID, int32 regionID, const char *vertObj, float64 range
 
     return (regionID);
 }
+#endif
 
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -9894,7 +9912,7 @@ SWsetfillvalue(int32 swathID, const char *fieldname, VOIDP fillval)
     }
     return (status);
 }
-
+#endif
 
 
 
@@ -10002,16 +10020,21 @@ SWdetach(int32 swathID)
 
 {
     intn            i;		/* Loop index */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     intn            j;		/* Loop index */
+#endif
     intn            k;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     intn            statusFill = 0;	/* return status from SWgetfillvalue */
+#endif
 
     uint8          *buf;	/* Buffer for blank (initial) 1D records */
 
     int32           vdataID;	/* Vdata ID */
-    int32          *namelen;	/* Pointer to name string length array */
-    int32          *dimlen;	/* Pointer to dim string length array */
+    int32          *namelen = NULL;	/* Pointer to name string length array */
+    int32          *dimlen = NULL;	/* Pointer to dim string length array */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     int32           slen1[3];	/* String length array 1 */
     int32           slen2[3];	/* String length array 2 */
     int32           nflds;	/* Number of fields */
@@ -10019,29 +10042,38 @@ SWdetach(int32 swathID)
     int32           cmbfldcnt;	/* Number of fields combined */
     int32           sdid;	/* SDS ID */
     int32           vgid;	/* Vgroup ID */
+#endif
     int32           dims[3];	/* Dimension array */
-    int32          *offset;	/* Pointer to merged field offset array */
-    int32          *indvdims;	/* Pointer to merged field size array */
+    int32          *offset = NULL;	/* Pointer to merged field offset array */
+    int32          *indvdims = NULL;	/* Pointer to merged field size array */
     int32           sdInterfaceID;	/* SDS interface ID */
     int32           sID;	/* Swath ID - offset */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     int32           nflds0;	/* Number of fields */
-    int32          *namelen0;	/* Pointer to name string length array */
+#endif
+    int32          *namelen0 = NULL;	/* Pointer to name string length array */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     int32           rank;	/* Rank of merged field */
     int32           truerank;	/* True rank of merged field */
+#endif
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
     int32           dum;	/* Dummy variable */
 
-    char           *nambuf;	/* Pointer to name buffer */
-    char          **nameptr;	/* Pointer to name string pointer array */
-    char          **dimptr;	/* Pointer to dim string pointer array */
-    char          **nameptr0;	/* Pointer to name string pointer array */
+    char           *nambuf = NULL;	/* Pointer to name buffer */
+    char          **nameptr = NULL;	/* Pointer to name string pointer array */
+    char          **dimptr = NULL;	/* Pointer to dim string pointer array */
+    char          **nameptr0 = NULL;	/* Pointer to name string pointer array */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     char           *ptr1[3];	/* String pointer array */
     char           *ptr2[3];	/* String pointer array */
     char            dimbuf1[128];	/* Dimension buffer 1 */
     char            dimbuf2[128];	/* Dimension buffer 2 */
+#endif
     char            swathname[VGNAMELENMAX + 1];	/* Swath name */
+#ifdef HDFEOS_SW_WRITE_SUPPORT
     char           *utlbuf;	/* Utility buffer */
     char            fillval[32];/* Fill value buffer */
+#endif
 
     /* Check for proper swath ID and get SD interface ID */
     /* ------------------------------------------------- */
@@ -10117,7 +10149,9 @@ SWdetach(int32 swathID)
 	/* ------------------- */
 	if (strlen(SWXSDname) == 0)
 	{
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 	    nflds = 0;
+#endif
 
 	    /* Allocate "dummy" arrays so free() doesn't bomb later */
 	    /* ---------------------------------------------------- */
@@ -10198,6 +10232,7 @@ SWdetach(int32 swathID)
 		return(-1);
 	    }
 	}
+#if defined(HDFEOS_SW_WRITE_SUPPORT)
 	else
 	{
 	    /*
@@ -10299,7 +10334,6 @@ SWdetach(int32 swathID)
 	    nflds = EHparsestr(SWXSDdims, ';', dimptr, dimlen);
 	}
 
-
 	/* Loop through all the fields */
 	/* --------------------------- */
 	for (i = 0; i < nflds; i++)
@@ -10598,6 +10632,7 @@ SWdetach(int32 swathID)
 		free(utlbuf);
 	    }
 	}
+#endif
 
 
 
@@ -10616,7 +10651,7 @@ SWdetach(int32 swathID)
 		i++;
 	}
 
-
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 	/* "Contract" SDcomb array */
 	/* ----------------------- */
 	for (i = 0; i < nflds; i++)
@@ -10658,7 +10693,7 @@ SWdetach(int32 swathID)
 	    strcat(SWXSDname, ",");
 	    strcat(SWXSDdims, ";");
 	}
-
+#endif
 
 
 	/* Free up a bunch of dynamically allocated arrays */
@@ -10768,6 +10803,7 @@ SWclose(int32 fid)
     return (status);
 }
 
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -10928,7 +10964,9 @@ SWupdatescene(int32 swathID, int32 regionID)
     return(status);
 
 }
+#endif
 
+#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -11416,7 +11454,7 @@ SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexou
     }
 
 }
-
+#endif
 
 
 /*----------------------------------------------------------------------------|

From 63821c3ceafd34656b695b19a6ff243aa79056d4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 25 Nov 2024 02:54:56 +0100
Subject: [PATCH 20/21] frmts/hdf4/hdf-eos: remove code unused by GDAL

---
 frmts/hdf4/hdf-eos/EHapi.c     |  1582 +----
 frmts/hdf4/hdf-eos/GDapi.c     | 10900 +++++++------------------------
 frmts/hdf4/hdf-eos/HdfEosDef.h |   150 -
 frmts/hdf4/hdf-eos/SWapi.c     | 10428 +++++------------------------
 4 files changed, 3969 insertions(+), 19091 deletions(-)

diff --git a/frmts/hdf4/hdf-eos/EHapi.c b/frmts/hdf4/hdf-eos/EHapi.c
index 8a6b6af3877d..565cd1a364ec 100644
--- a/frmts/hdf4/hdf-eos/EHapi.c
+++ b/frmts/hdf4/hdf-eos/EHapi.c
@@ -46,9 +46,6 @@ static int32 *EHXsdTable = NULL;
 #define MAX_RETRIES 10
 
 /* Function Prototypes */
-#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
-static intn EHmetalist(const char *, char *);
-#endif
 static intn EHreset_maxopenfiles(intn);
 static intn EHget_maxopenfiles(intn *, intn *);
 static intn EHget_numfiles(void);
@@ -582,53 +579,6 @@ EHidinfo(int32 fid, int32 * HDFfid, int32 * sdInterfaceID)
 }
 
 
-#ifdef UNUSED_BY_GDAL
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHfilename                                                       |
-|                                                                             |
-|  DESCRIPTION: Returns HDF filename                                          |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  fid            int32               HDF-EOS file id                         |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  filename       char                HDF-EOS file name                       |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Sep 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-EHfilename(int32 fid, char *filename)
-{
-    intn            status = 0;	/* routine return status variable */
-    intn            dum;	/* Dummy variable */
-
-    char           *fname;	/* Pointer to filename */
-
-    /* Get point to filename from Hfidinquire */
-    /* -------------------------------------- */
-    Hfidinquire(EHXfidTable[fid % EHIDOFFSET], &fname, &dum, &dum);
-    strcpy(filename, fname);
-
-    return (status);
-}
-#endif
-
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -1397,134 +1347,12 @@ EHrevflds(const char *dimlist, char *revdimlist)
     return (status);
 }
 
-
-#ifdef UNUSED_BY_GDAL
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHcntOBJECT                                                      |
-|                                                                             |
-|  DESCRIPTION: Determines number of OBJECTs in metadata GROUP                |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  count          int32               Number of OBJECTs in GROUP              |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  metabuf        char                Begin & end metadata pointer array      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Sep 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-EHcntOBJECT(char *metabuf[])
-{
-    int32           count = 0;	/* Counter */
-
-    char           *metaptr;	/* Beginning of metadata section */
-    char           *endptr;	/* End of metadata section */
-    char           *tempptr;	/* Pointer within metadata section */
-
-
-    /* Get Pointers to beginning and ending of metadata section */
-    /* -------------------------------------------------------- */
-    metaptr = metabuf[0];
-    endptr = metabuf[1];
-
-
-    /* Find number of "END_OBJECT" strings within section */
-    /* -------------------------------------------------- */
-    tempptr = metaptr;
-    while (tempptr < endptr && tempptr != NULL)
-    {
-	tempptr = strstr(tempptr + 1, "END_OBJECT");
-	count++;
-    }
-    count--;
-
-    return (count);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHcntGROUP                                                       |
-|                                                                             |
-|  DESCRIPTION: Determines number of GROUPs in metadata GROUP                 |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  count          int32               Number of GROUPs in GROUP               |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  metabuf        char                Begin & end metadata pointer array      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Sep 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-EHcntGROUP(char *metabuf[])
-{
-    int32           count = 0;	/* Counter */
-
-    char           *metaptr;	/* Beginning of metadata section */
-    char           *endptr;	/* End of metadata section */
-    char           *tempptr;	/* Pointer within metadata section */
-
-
-    /* Get Pointers to beginning and ending of metadata section */
-    /* -------------------------------------------------------- */
-    metaptr = metabuf[0];
-    endptr = metabuf[1];
-
-
-    /* Find number of "END_GROUP" strings within section */
-    /* ------------------------------------------------- */
-    tempptr = metaptr;
-    while (tempptr < endptr && tempptr != NULL)
-    {
-	tempptr = strstr(tempptr + 1, "END_GROUP");
-	count++;
-    }
-    count--;
-
-    return (count);
-}
-#endif
-
-
-
-#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: EHmetalist                                                       |
+|  FUNCTION: EHgetmetavalue                                                   |
 |                                                                             |
-|  DESCRIPTION: Converts string list to metadata list                         |
+|  DESCRIPTION: Returns metadata value                                        |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1532,10 +1360,12 @@ EHcntGROUP(char *metabuf[])
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  instring       char                Input string list                       |
+|  metaptrs        char               Begin and end of metadata section       |
+|  parameter      char                parameter to access                     |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  outstring      char                Output metadata string                  |
+|  metaptr        char                Ptr to (updated) beginning of metadata  |
+|  retstr         char                return string containing value          |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -1543,126 +1373,96 @@ EHcntGROUP(char *metabuf[])
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
+|  Jan 97   Joel Gales    Check string pointer against end of meta section    |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-EHmetalist(const char *instring, char *outstring)
+EHgetmetavalue(char *metaptrs[], const char *parameter, char *retstr)
 {
-    intn            i;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
 
-    int32           nentries;	/* Number of entries in search string */
-    int32           listlen = 1;/* String list length */
-    int32          *slen;	/* Pointer to string length array */
-
-    char          **ptr;	/* Pointer to string pointer array */
-
-
-    /* Count number of entries in search string list */
-    /* --------------------------------------------- */
-    nentries = EHparsestr(instring, ',', NULL, NULL);
+    int32           slen;	/* String length */
+    char           *newline;	/* Position of new line character */
+    char           *sptr;	/* string pointer within metadata */
 
 
-    /* Allocate string pointer and length arrays */
+    /* Get string length of parameter string + 1 */
     /* ----------------------------------------- */
-    ptr = (char **) calloc(nentries, sizeof(char *));
-    if(ptr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"EHmetalist", __FILE__, __LINE__);
-	return(-1);
-    }
-    slen = (int32 *) calloc(nentries, sizeof(int32));
-    if(slen == NULL)
-    {
-	HEpush(DFE_NOSPACE,"EHmetalist", __FILE__, __LINE__);
-	free(ptr);
-	return(-1);
-    }
+    slen = (int)strlen(parameter) + 1;
 
 
-    /* Parse input string */
-    /* ------------------ */
-    nentries = EHparsestr(instring, ',', ptr, slen);
+    /* Build search string (parameter string + "=") */
+    /* -------------------------------------------- */
+    strcpy(retstr, parameter);
+    strcat(retstr, "=");
 
 
-    /* Start output string with leading "(" */
-    /* ------------------------------------ */
-    strcpy(outstring, "(");
+    /* Search for string within metadata (beginning at metaptrs[0]) */
+    /* ------------------------------------------------------------ */
+    sptr = strstr(metaptrs[0], retstr);
 
 
-    /* Loop through all entries */
-    /* ------------------------ */
-    for (i = 0; i < nentries; i++)
+    /* If string found within desired section ... */
+    /* ------------------------------------------ */
+    if (sptr != NULL && sptr < metaptrs[1])
     {
-	/* Add double quote (") to output string */
-	/* ------------------------------------- */
-	strcat(outstring, "\"");
-	listlen++;
-
-	/* Add input string entry to output string */
-	/* --------------------------------------- */
-	memcpy(outstring + listlen, ptr[i], slen[i]);
-	listlen += slen[i];
-	outstring[listlen] = 0;
-
-
-	/* Add closing double quote (") to output string */
-	/* --------------------------------------------- */
-	strcat(outstring, "\"");
-	listlen++;
-	outstring[listlen] = 0;
-
+	/* Store position of string within metadata */
+	/* ---------------------------------------- */
+	metaptrs[0] = sptr;
 
-	/* Add comma delimiter to output string */
-	/* ------------------------------------ */
-	if (i != (nentries - 1))
+	/* Find newline "\n" character */
+	/* --------------------------- */
+	newline = strchr(metaptrs[0], '\n');
+	if (newline == NULL)
 	{
-	    strcat(outstring, ",");
-	    listlen++;
+		retstr[0] = 0;
+		return -1;
 	}
-	/* Place null terminator in output string */
-	/* -------------------------------------- */
-	outstring[listlen] = 0;
-    }
-
 
-    /* End output string with trailing ")" */
-    /* ----------------------------------- */
-    strcat(outstring, ")");
+	/* Copy from "=" to "\n" (exclusive) into return string */
+	/* ---------------------------------------------------- */
+	memcpy(retstr, metaptrs[0] + slen, newline - metaptrs[0] - slen);
 
-    free(ptr);
-    free(slen);
+	/* Terminate return string with null */
+	/* --------------------------------- */
+	retstr[newline - metaptrs[0] - slen] = 0;
+    } else
+    {
+	/*
+	 * if parameter string not found within section, null return string
+	 * and set status to -1.
+	 */
+	retstr[0] = 0;
+	status = -1;
+    }
 
     return (status);
 }
-#endif
 
 
 
-#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: EHinsertmeta                                                     |
+|  FUNCTION: EHmetagroup                                                      |
 |                                                                             |
-|  DESCRIPTION: Writes metadata                                               |
+|  DESCRIPTION: Returns pointers to beginning and end of metadata group       |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  metabuf        char                Pointer to HDF-EOS object in metadata   |
 |                                                                             |
 |  INPUTS:                                                                    |
 |  sdInterfaceID  int32               SDS interface ID                        |
 |  structname     char                HDF-EOS structure name                  |
 |  structcode     char                Structure code ("s/g/p")                |
-|  metacode       int32               Metadata code type                      |
-|  metastr        char                Metadata input string                   |
-|  metadata       int32               Metadata utility array                  |
+|  groupname      char                Metadata group name                     |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  metaptrs       char                pointers to begin and end of metadata   |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -1671,61 +1471,36 @@ EHmetalist(const char *instring, char *outstring)
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
 |  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Sep 96   Joel Gales    Allow new metadata object to be written in          |
-|                         old metadata.                                       |
-|  Dec 96   Joel Gales    Fix Point metadata problem                          |
-|  Oct 98   David Wynne   Change utlstr/utlstr2 to dynamic allocation from    |
-|                         static                                              |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode,
-	     int32 metacode, char *metastr, int32 metadata[])
+char           *
+EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
+	    const char *groupname, char *metaptrs[])
 {
     intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
 
     int32           attrIndex;	/* Structural metadata attribute index */
-    int32           slen[8];	/* String length array (for dim map parsing) */
     int32           nmeta;	/* Number of 32000 byte metadata sections */
     int32           metalen;	/* Length of structural metadata */
-    int32           seglen;	/* Length of metadata string to insert */
-    int32           count;	/* Objects/Groups counter */
-    int32           offset;	/* Offset insertion position of new metadata
-				 * section within existing metadata */
 
     char           *metabuf;	/* Pointer (handle) to structural metadata */
-    char           *begptr;	/* Pointer to beginning of metadata section */
+    char           *endptr;	/* Pointer to end of metadata section */
     char           *metaptr;	/* Metadata pointer */
     char           *prevmetaptr;/* Previous position of metadata pointer */
-    char           *ptr[8];	/* String pointer array (for dim map parsing) */
-    char            type[32] = {0};	/* Number type descriptor string */
-    char           *metaArr[2];	/* Array of metadata positions */
-    char           *colon;	/* Colon position */
-    char           *colon2;	/* 2nd colon position */
-    char           *slash;	/* Slash position */
-    char           *utlstr;	/* Utility string */
-    char           *utlstr2;	/* Utility string 2 */
-
-
-    /* Allocate space for utility strings */
-    /* ---------------------------------- */
-    utlstr = (char *) calloc(UTLSTRSIZE, sizeof(char));
+    char           *utlstr;     /* Utility string */
+
+
+
+     /* Allocate memory for utility string */
+     /* ---------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE,sizeof(char));
     if(utlstr == NULL)
     {
-	HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
-	return(-1);
-    }
+        HEpush(DFE_NOSPACE,"EHEHmetagroup", __FILE__, __LINE__);
 
-    utlstr2 = (char *) calloc(UTLSTRSIZE, sizeof(char));
-    if(utlstr2 == NULL)
-    {
-	HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
-	free(utlstr);
-	return(-1);
+        return( NULL);
     }
-
     /* Determine number of structural metadata "sections" */
     /* -------------------------------------------------- */
     nmeta = 0;
@@ -1733,7 +1508,7 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
     {
 	/* Search for "StructMetadata.x" attribute */
 	/* --------------------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d", "StructMetadata.", (int)nmeta);
+	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%d", "StructMetadata.", (int)nmeta);
 	attrIndex = SDfindattr(sdInterfaceID, utlstr);
 
 
@@ -1752,12 +1527,12 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
     /* Allocate space for metadata (in units of 32000 bytes) */
     /* ----------------------------------------------------- */
     metabuf = (char *) calloc(32000 * nmeta, 1);
+
     if(metabuf == NULL)
     {
-	HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
+	HEpush(DFE_NOSPACE,"EHmetagroup", __FILE__, __LINE__);
 	free(utlstr);
-	free(utlstr2);
-	return(-1);
+	return(metabuf);
     }
 
 
@@ -1765,7 +1540,7 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
     /* ------------------------ */
     for (i = 0; i < nmeta; i++)
     {
-	snprintf(utlstr, UTLSTRSIZE, "%s%d", "StructMetadata.", i);
+	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%d", "StructMetadata.", i);
 	attrIndex = SDfindattr(sdInterfaceID, utlstr);
 	metalen = (int)strlen(metabuf);
 	SDreadattr(sdInterfaceID, attrIndex, metabuf + metalen);
@@ -1798,835 +1573,9 @@ EHinsertmeta(int32 sdInterfaceID, const char *structname, const char *structcode
 
 
 
-    /* Find specific (named) structure */
-    /* ------------------------------- */
-    if (metacode < 1000)
-    {
-	/* Save current metadata pointer */
-	/* ----------------------------- */
-	prevmetaptr = metaptr;
-
-
-	/* First loop for "old-style" (non-ODL) metadata string */
-	/* ---------------------------------------------------- */
-	if (strcmp(structcode, "s") == 0)
-	{
-	    snprintf(utlstr, UTLSTRSIZE, "%s%s", "SwathName=\"", structname);
-	} else if (strcmp(structcode, "g") == 0)
-	{
-	    snprintf(utlstr, UTLSTRSIZE, "%s%s", "GridName=\"", structname);
-	} else if (strcmp(structcode, "p") == 0)
-	{
-	    snprintf(utlstr, UTLSTRSIZE, "%s%s", "PointName=\"", structname);
-	}
-	/* Do string search */
-	/* ---------------- */
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/*
-	 * If not found then return to previous position in metadata and look
-	 * for "new-style" (ODL) metadata string
-	 */
-	if (metaptr == NULL)
-	{
-	    snprintf(utlstr, UTLSTRSIZE, "%s%s", "GROUP=\"", structname);
-	    metaptr = strstr(prevmetaptr, utlstr);
-	}
-    }
-    /*
-     * If searching for geo fields (3), data fields (4), or point fields (11)
-     * convert type code to string designator.
-     */
-    if (metacode == 3 || metacode == 4 || metacode == 11)
-    {
-	switch (metadata[0])
-	{
-	case 3:
-	    strcpy(type, "DFNT_UCHAR8");
-	    break;
-	case 4:
-	    strcpy(type, "DFNT_CHAR8");
-	    break;
-	case 5:
-	    strcpy(type, "DFNT_FLOAT32");
-	    break;
-	case 6:
-	    strcpy(type, "DFNT_FLOAT64");
-	    break;
-	case 20:
-	    strcpy(type, "DFNT_INT8");
-	    break;
-	case 21:
-	    strcpy(type, "DFNT_UINT8");
-	    break;
-	case 22:
-	    strcpy(type, "DFNT_INT16");
-	    break;
-	case 23:
-	    strcpy(type, "DFNT_UINT16");
-	    break;
-	case 24:
-	    strcpy(type, "DFNT_INT32");
-	    break;
-	case 25:
-	    strcpy(type, "DFNT_UINT32");
-	    break;
-	}
-    }
-    /* Metadata Section Switch */
-    /* ----------------------- */
-    switch (abs(metacode))
-    {
-
-    case 0:
-	/* Dimension Section */
-	/* ----------------- */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=Dimension");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=Dimension");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%d%s%d%s",
-                "\t\t\tOBJECT=Dimension_", (int)count,
-		"\n\t\t\t\tDimensionName=\"", &metastr[0],
-		"\"\n\t\t\t\tSize=", (int)metadata[0],
-		"\n\t\t\tEND_OBJECT=Dimension_", (int)count, "\n");
-	break;
-
-
-    case 1:
-	/* Dimension Map Section */
-	/* --------------------- */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=DimensionMap");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=DimensionMap");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Find slash within input mapping string and replace with NULL */
-	/* ------------------------------------------------------------ */
-	EHparsestr(metastr, '/', ptr, slen);
-	metastr[slen[0]] = 0;
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%d%s%d%s%d%s",
-		"\t\t\tOBJECT=DimensionMap_", (int)count,
-		"\n\t\t\t\tGeoDimension=\"", &metastr[0],
-		"\"\n\t\t\t\tDataDimension=\"", &metastr[slen[0] + 1],
-		"\"\n\t\t\t\tOffset=", (int)metadata[0],
-		"\n\t\t\t\tIncrement=", (int)metadata[1],
-		"\n\t\t\tEND_OBJECT=DimensionMap_", (int)count, "\n");
-	break;
-
-
-    case 2:
-	/* Index Dimension Map Section */
-	/* --------------------------- */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=IndexDimensionMap");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=IndexDimensionMap");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Find slash within input mapping string and replace with NULL */
-	/* ------------------------------------------------------------ */
-	EHparsestr(metastr, '/', ptr, slen);
-	metastr[slen[0]] = 0;
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%d%s",
-		"\t\t\tOBJECT=IndexDimensionMap_", (int)count,
-		"\n\t\t\t\tGeoDimension=\"", &metastr[0],
-		"\"\n\t\t\t\tDataDimension=\"", &metastr[slen[0] + 1],
-		"\"\n\t\t\tEND_OBJECT=IndexDimensionMap_", (int)count, "\n");
-	break;
-
-
-    case 3:
-	/* Geolocation Field Section */
-	/* ------------------------- */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=GeoField");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=GeoField");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Find colon (parse off field name) */
-	/* --------------------------------- */
-	colon = strchr(metastr, ':');
-	if (colon == NULL)
-	{
-		free(utlstr);
-		free(utlstr2);
-		return -1;
-	}
-	*colon = 0;
-
-	/* Search for next colon (compression and/or tiling parameters) */
-	/* ------------------------------------------------------------ */
-	colon2 = strchr(colon + 1, ':');
-	if (colon2 != NULL)
-	{
-	    *colon2 = 0;
-	}
-	/* Make metadata string list for dimension list */
-	/* -------------------------------------------- */
-	EHmetalist(colon + 1, utlstr2);
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%s",
-		"\t\t\tOBJECT=GeoField_", (int)count,
-		"\n\t\t\t\tGeoFieldName=\"", metastr,
-		"\"\n\t\t\t\tDataType=", type,
-		"\n\t\t\t\tDimList=", utlstr2);
-
-
-	/* If compression and/or tiling parameters add to string */
-	/* ----------------------------------------------------- */
-	if (colon2 != NULL)
-	{
-	    strcat(utlstr, colon2 + 1);
-	}
-	/* Add END_OBJECT terminator to metadata string */
-	/* -------------------------------------------- */
-	snprintf(utlstr2, UTLSTRSIZE, "%s%d%s",
-		"\n\t\t\tEND_OBJECT=GeoField_", (int)count, "\n");
-	strcat(utlstr, utlstr2);
-
-	break;
-
-
-    case 4:
-	/* Data Field Section */
-	/* ------------------ */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=DataField");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=DataField");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Find colon (parse off field name) */
-	/* --------------------------------- */
-	colon = strchr(metastr, ':');
-	if (colon == NULL)
-	{
-		free(utlstr);
-		free(utlstr2);
-		return -1;
-	}
-	*colon = 0;
-
-	/* Search for next colon (compression and/or tiling parameters) */
-	/* ------------------------------------------------------------ */
-	colon2 = strchr(colon + 1, ':');
-	if (colon2 != NULL)
-	{
-	    *colon2 = 0;
-	}
-	/* Make metadata string list from dimension list */
-	/* --------------------------------------------- */
-	EHmetalist(colon + 1, utlstr2);
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%s",
-		"\t\t\tOBJECT=DataField_", (int)count,
-		"\n\t\t\t\tDataFieldName=\"", metastr,
-		"\"\n\t\t\t\tDataType=", type,
-		"\n\t\t\t\tDimList=", utlstr2);
-
-
-	/* If compression and/or tiling parameters add to string */
-	/* ----------------------------------------------------- */
-	if (colon2 != NULL)
-	{
-	    strcat(utlstr, colon2 + 1);
-	}
-	/* Add END_OBJECT terminator to metadata string */
-	/* -------------------------------------------- */
-	snprintf(utlstr2, UTLSTRSIZE, "%s%d%s",
-		"\n\t\t\tEND_OBJECT=DataField_", (int)count, "\n");
-	strcat(utlstr, utlstr2);
-
-	break;
-
-
-    case 6:
-	/* Merged Field Section */
-	/* -------------------- */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=MergedFields");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=MergedFields");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Find colon (parse off merged fieldname) */
-	/* --------------------------------------- */
-	colon = strchr(metastr, ':');
-	if (colon == NULL)
-	{
-		free(utlstr);
-		free(utlstr2);
-		return -1;
-	}
-	*colon = 0;
-
-	/* Make metadata string list from field list */
-	/* ----------------------------------------- */
-	EHmetalist(colon + 1, utlstr2);
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%s%d%s",
-		"\t\t\tOBJECT=MergedFields_", (int)count,
-		"\n\t\t\t\tMergedFieldName=\"", metastr, "\"",
-		"\n\t\t\t\tFieldList=", utlstr2,
-		"\n\t\t\tEND_OBJECT=MergedFields_", (int)count, "\n");
-	break;
-
-
-    case 10:
-	/* Point Level Section */
-	/* ------------------- */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=Level");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\n\t\tEND_GROUP=Level");
-	metaptr = strstr(metaptr, utlstr) + 1;
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntGROUP(metaArr);
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%d%s",
-		"\t\t\tGROUP=Level_", (int)count,
-		"\n\t\t\t\tLevelName=\"", metastr,
-		"\"\n\t\t\tEND_GROUP=Level_", (int)count, "\n");
-	break;
-
-
-    case 11:
-	/* Point Field Section */
-	/* ------------------- */
-
-	/* Find colon (parse off point field name) */
-	/* --------------------------------------- */
-	colon = strchr(metastr, ':');
-	if (colon == NULL)
-	{
-		free(utlstr);
-		free(utlstr2);
-		return -1;
-	}
-	*colon = 0;
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\t\t\tLevelName=\"");
-	strcat(utlstr, colon + 1);
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\t\tEND_GROUP=Level_");
-	metaptr = strstr(begptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%d%s%d%s",
-		"\t\t\t\tOBJECT=PointField_", (int)count,
-		"\n\t\t\t\t\tPointFieldName=\"", metastr,
-		"\"\n\t\t\t\t\tDataType=", type,
-		"\n\t\t\t\t\tOrder=", (int)metadata[1],
-		"\n\t\t\t\tEND_OBJECT=PointField_", (int)count, "\n");
-	break;
-
-
-
-    case 12:
-	/* Level Link Section */
-	/* ------------------ */
-
-	/* Find beginning and ending of metadata section */
-	/* --------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=LevelLink");
-	begptr = strstr(metaptr, utlstr);
-
-	strcpy(utlstr, "\t\tEND_GROUP=LevelLink");
-	metaptr = strstr(metaptr, utlstr);
-
-
-	/* Count number of existing entries and increment */
-	/* ---------------------------------------------- */
-	metaArr[0] = begptr;
-	metaArr[1] = metaptr;
-	count = EHcntOBJECT(metaArr) + 1;
-
-
-	/* Find colon (parse off parent/child level names from link field) */
-	/* --------------------------------------------------------------- */
-	colon = strchr(metastr, ':');
-	if (colon == NULL)
-	{
-		free(utlstr);
-		free(utlstr2);
-		return -1;
-	}
-	*colon = 0;
-
-	/* Find slash (divide parent and child levels) */
-	/* ------------------------------------------- */
-	slash = strchr(metastr, '/');
-	if (slash == NULL)
-	{
-		free(utlstr);
-		free(utlstr2);
-		return -1;
-	}
-	*slash = 0;
-
-	/* Build metadata entry string */
-	/* --------------------------- */
-	snprintf(utlstr, UTLSTRSIZE, "%s%d%s%s%s%s%s%s%s%d%s",
-		"\t\t\tOBJECT=LevelLink_", (int)count,
-		"\n\t\t\t\tParent=\"", metastr,
-		"\"\n\t\t\t\tChild=\"", slash + 1,
-		"\"\n\t\t\t\tLinkField=\"", colon + 1,
-		"\"\n\t\t\tEND_OBJECT=LevelLink_", (int)count, "\n");
-
-	break;
-
-
-    case 101:
-	/* Position metadata pointer for Grid proj parms, pix reg, origin */
-	/* -------------------------------------------------------------- */
-	strcpy(utlstr, "\t\tGROUP=Dimension");
-	metaptr = strstr(metaptr, utlstr);
-	strcpy(utlstr, metastr);
-
-	break;
-
-
-    case 1001:
-	/* Position metadata pointer for new swath structure (SWcreate) */
-	/* ------------------------------------------------------------ */
-	strcpy(utlstr, "END_GROUP=SwathStructure");
-	metaptr = strstr(metaptr, utlstr);
-	strcpy(utlstr, metastr);
-	break;
-
-
-    case 1002:
-	/* Position metadata pointer for new grid structure (GDcreate) */
-	/* ----------------------------------------------------------- */
-	strcpy(utlstr, "END_GROUP=GridStructure");
-	metaptr = strstr(metaptr, utlstr);
-	strcpy(utlstr, metastr);
-	break;
-
-
-    case 1003:
-	/* Position metadata pointer for new point structure (PTcreate) */
-	/* ------------------------------------------------------------ */
-	strcpy(utlstr, "END_GROUP=PointStructure");
-	metaptr = strstr(metaptr, utlstr);
-	strcpy(utlstr, metastr);
-	break;
-    }
-
-
-
-    /* Get length of metadata string to insert */
-    /* --------------------------------------- */
-    seglen = (int)strlen(utlstr);
-
-    /* Get offset of entry position within existing metadata */
-    /* ----------------------------------------------------- */
-    offset = (int)(metaptr - metabuf);
-
-
-    /* If end of new metadata string outside of current metadata buffer ... */
-    /* -------------------------------------------------------------------- */
-    if (metalen + seglen > 32000 * nmeta - 1)
-    {
-	/* Reallocate metadata buffer with additional 32000 bytes */
-	/* ------------------------------------------------------ */
-	metabuf = (char *) realloc((void *) metabuf, 32000 * (nmeta + 1));
-	if(metabuf == NULL)
-	{
-	    HEpush(DFE_NOSPACE,"EHinsertmeta", __FILE__, __LINE__);
-	    free(utlstr);
-	    free(utlstr2);
-	    return(-1);
-	}
-
-	/* Increment metadata section counter */
-	/* ---------------------------------- */
-	nmeta++;
-
-	/* Reposition metadata pointer (entry position) */
-	/* -------------------------------------------- */
-	metaptr = metabuf + offset;
-    }
-    /* Move metadata following entry point to its new position */
-    /* ------------------------------------------------------- */
-    for (i = metalen - 1; i > offset - 1; i--)
-    {
-	*(metabuf + seglen + i) = *(metabuf + i);
-    }
-
-    /* Copy new metadata string (utlstr) into metadata */
-    /* ---------------------------------------------- */
-    memcpy(metaptr, utlstr, seglen);
-
-    /* set to null character remaining of the metabuf */
-
-    memset((metabuf + metalen + seglen), '\0', (nmeta*32000 -1 - (metalen +
-								  seglen)));
-    /* Add new null string terminator */
-    /* ------------------------------ */
-    metabuf[metalen + seglen] = 0;
-
-
-    /* Write Back to Global Attribute(s) */
-    /* --------------------------------- */
-    for (i = 0; i < nmeta; i++)
-    {
-	snprintf(utlstr, UTLSTRSIZE, "%s%d", "StructMetadata.", i);
-	SDsetattr(sdInterfaceID, utlstr, DFNT_CHAR8,
-		  32000, metabuf + i * 32000);
-    }
-
-    free(metabuf);
-    free(utlstr);
-    free(utlstr2);
-
-    return (status);
-}
-#endif
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHgetmetavalue                                                   |
-|                                                                             |
-|  DESCRIPTION: Returns metadata value                                        |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  metaptrs        char               Begin and end of metadata section       |
-|  parameter      char                parameter to access                     |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  metaptr        char                Ptr to (updated) beginning of metadata  |
-|  retstr         char                return string containing value          |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Jan 97   Joel Gales    Check string pointer against end of meta section    |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-EHgetmetavalue(char *metaptrs[], const char *parameter, char *retstr)
-{
-    intn            status = 0;	/* routine return status variable */
-
-    int32           slen;	/* String length */
-    char           *newline;	/* Position of new line character */
-    char           *sptr;	/* string pointer within metadata */
-
-
-    /* Get string length of parameter string + 1 */
-    /* ----------------------------------------- */
-    slen = (int)strlen(parameter) + 1;
-
-
-    /* Build search string (parameter string + "=") */
-    /* -------------------------------------------- */
-    strcpy(retstr, parameter);
-    strcat(retstr, "=");
-
-
-    /* Search for string within metadata (beginning at metaptrs[0]) */
-    /* ------------------------------------------------------------ */
-    sptr = strstr(metaptrs[0], retstr);
-
-
-    /* If string found within desired section ... */
-    /* ------------------------------------------ */
-    if (sptr != NULL && sptr < metaptrs[1])
-    {
-	/* Store position of string within metadata */
-	/* ---------------------------------------- */
-	metaptrs[0] = sptr;
-
-	/* Find newline "\n" character */
-	/* --------------------------- */
-	newline = strchr(metaptrs[0], '\n');
-	if (newline == NULL)
-	{
-		retstr[0] = 0;
-		return -1;
-	}
-
-	/* Copy from "=" to "\n" (exclusive) into return string */
-	/* ---------------------------------------------------- */
-	memcpy(retstr, metaptrs[0] + slen, newline - metaptrs[0] - slen);
-
-	/* Terminate return string with null */
-	/* --------------------------------- */
-	retstr[newline - metaptrs[0] - slen] = 0;
-    } else
-    {
-	/*
-	 * if parameter string not found within section, null return string
-	 * and set status to -1.
-	 */
-	retstr[0] = 0;
-	status = -1;
-    }
-
-    return (status);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHmetagroup                                                      |
-|                                                                             |
-|  DESCRIPTION: Returns pointers to beginning and end of metadata group       |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  metabuf        char                Pointer to HDF-EOS object in metadata   |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  sdInterfaceID  int32               SDS interface ID                        |
-|  structname     char                HDF-EOS structure name                  |
-|  structcode     char                Structure code ("s/g/p")                |
-|  groupname      char                Metadata group name                     |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  metaptrs       char                pointers to begin and end of metadata   |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-char           *
-EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
-	    const char *groupname, char *metaptrs[])
-{
-    intn            i;		/* Loop index */
-
-    int32           attrIndex;	/* Structural metadata attribute index */
-    int32           nmeta;	/* Number of 32000 byte metadata sections */
-    int32           metalen;	/* Length of structural metadata */
-
-    char           *metabuf;	/* Pointer (handle) to structural metadata */
-    char           *endptr;	/* Pointer to end of metadata section */
-    char           *metaptr;	/* Metadata pointer */
-    char           *prevmetaptr;/* Previous position of metadata pointer */
-    char           *utlstr;     /* Utility string */
-
-
-
-     /* Allocate memory for utility string */
-     /* ---------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE,sizeof(char));
-    if(utlstr == NULL)
-    {
-        HEpush(DFE_NOSPACE,"EHEHmetagroup", __FILE__, __LINE__);
-
-        return( NULL);
-    }
-    /* Determine number of structural metadata "sections" */
-    /* -------------------------------------------------- */
-    nmeta = 0;
-    while (1)
-    {
-	/* Search for "StructMetadata.x" attribute */
-	/* --------------------------------------- */
-	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%d", "StructMetadata.", (int)nmeta);
-	attrIndex = SDfindattr(sdInterfaceID, utlstr);
-
-
-	/* If found then increment metadata section counter else exit loop */
-	/* --------------------------------------------------------------- */
-	if (attrIndex != -1)
-	{
-	    nmeta++;
-	} else
-	{
-	    break;
-	}
-    }
-
-
-    /* Allocate space for metadata (in units of 32000 bytes) */
-    /* ----------------------------------------------------- */
-    metabuf = (char *) calloc(32000 * nmeta, 1);
-
-    if(metabuf == NULL)
-    {
-	HEpush(DFE_NOSPACE,"EHmetagroup", __FILE__, __LINE__);
-	free(utlstr);
-	return(metabuf);
-    }
-
-
-    /* Read structural metadata */
-    /* ------------------------ */
-    for (i = 0; i < nmeta; i++)
-    {
-	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%d", "StructMetadata.", i);
-	attrIndex = SDfindattr(sdInterfaceID, utlstr);
-	metalen = (int)strlen(metabuf);
-	SDreadattr(sdInterfaceID, attrIndex, metabuf + metalen);
-    }
-
-    /* Determine length (# of characters) of metadata */
-    /* ---------------------------------------------- */
-    metalen = (int)strlen(metabuf);
-
-
-
-    /* Find HDF-EOS structure "root" group in metadata */
-    /* ----------------------------------------------- */
-
-    /* Setup proper search string */
-    /* -------------------------- */
-    if (strcmp(structcode, "s") == 0)
-    {
-	strcpy(utlstr, "GROUP=SwathStructure");
-    } else if (strcmp(structcode, "g") == 0)
-    {
-	strcpy(utlstr, "GROUP=GridStructure");
-    } else if (strcmp(structcode, "p") == 0)
-    {
-	strcpy(utlstr, "GROUP=PointStructure");
-    }
-    /* Use string search routine (strstr) to move through metadata */
-    /* ----------------------------------------------------------- */
-    metaptr = strstr(metabuf, utlstr);
-
-
-
-    /* Save current metadata pointer */
-    /* ----------------------------- */
-    prevmetaptr = metaptr;
+    /* Save current metadata pointer */
+    /* ----------------------------- */
+    prevmetaptr = metaptr;
 
 
     /* First loop for "old-style" (non-ODL) metadata string */
@@ -2684,389 +1633,6 @@ EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
 }
 
 
-
-
-#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHfillfld                                                        |
-|                                                                             |
-|  DESCRIPTION: Fills field with fill value                                   |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  sdid           int32               SD element ID                           |
-|  rank           int32               Rank of field                           |
-|  truerank       int32               True rank of field (merging)            |
-|  size           int32               size of fill element                    |
-|  off            int32               Offset of field within merged field     |
-|  dims           int32               Dimensions of field                     |
-|  fillval        void                fill value                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-EHfillfld(int32 sdid, int32 rank, CPL_UNUSED int32 truerank, int32 size, int32 off,
-	  int32 dims[], VOIDP fillval)
-{
-    intn            i;		/* Loop index */
-    intn            j;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-
-    int32           n;		/* Max number of planes or rows in fill
-				 * buffer */
-    int32           start[3] = {0, 0, 0};	/* Start array (SDwritedata) */
-    int32           edge[3];	/* Edge (count) array (SDwritedata) */
-    int32           totN;	/* Total number of elements in field */
-    int32           planeN;	/* Number of elements in plane */
-
-    char           *fillbuf;	/* Fill buffer */
-
-
-    /* Get total number of elements in field */
-    /* ------------------------------------- */
-    totN = dims[0];
-    for (i = 1; i < rank; i++)
-    {
-	totN *= dims[i];
-    }
-
-
-    /* Get number of elements in a plane of the field */
-    /* ---------------------------------------------- */
-    planeN = dims[1] * dims[2];
-
-
-
-    /* Allocate & Write Fill buffer */
-    /* ---------------------------- */
-    if (totN * size < HDFE_MAXMEMBUF)
-    {
-	/* Entire field size (in bytes) smaller than max fill buffer */
-	/* --------------------------------------------------------- */
-
-
-	/* Allocate fill buffer */
-	/* -------------------- */
-	fillbuf = (char *) malloc(totN * size);
-	if(fillbuf == NULL)
-	{
-	    HEpush(DFE_NOSPACE,"EHfillfld", __FILE__, __LINE__);
-	    return(-1);
-	}
-
-
-	/* Fill buffer with fill value */
-	/* --------------------------- */
-	for (i = 0; i < totN; i++)
-	{
-	    memcpy(fillbuf + i * size, fillval, size);
-	}
-
-
-	/* Write fill buffer to field */
-	/* -------------------------- */
-	start[0] = off;
-	edge[0] = dims[0];
-	edge[1] = dims[1];
-	edge[2] = dims[2];
-	status = SDwritedata(sdid, start, NULL, edge,
-			     (VOIDP) fillbuf);
-
-	free(fillbuf);
-
-    } else if (planeN * size < HDFE_MAXMEMBUF)
-    {
-	/* Single plane size (in bytes) smaller than max fill buffer */
-	/* --------------------------------------------------------- */
-
-
-	/* Compute number of planes that can be written at one time */
-	/* -------------------------------------------------------- */
-	n = HDFE_MAXMEMBUF / (planeN * size);
-
-
-	/* Allocate fill buffer */
-	/* -------------------- */
-	fillbuf = (char *) malloc(planeN * size * n);
-	if(fillbuf == NULL)
-	{
-	    HEpush(DFE_NOSPACE,"EHfillfld", __FILE__, __LINE__);
-	    return(-1);
-	}
-
-
-	/* Fill buffer with fill value */
-	/* --------------------------- */
-	for (i = 0; i < planeN * n; i++)
-	{
-	    memcpy(fillbuf + i * size, fillval, size);
-	}
-
-
-	/* Write (full) fill buffer to field */
-	/* --------------------------------- */
-	for (i = 0; i < (dims[0] / n); i++)
-	{
-	    start[0] = off + i * n;
-	    edge[0] = n;
-	    edge[1] = dims[1];
-	    edge[2] = dims[2];
-	    status = SDwritedata(sdid, start, NULL, edge,
-				 (VOIDP) fillbuf);
-	}
-
-
-	/* Write (partial) last fill buffer to field (if necessary) */
-	/* -------------------------------------------------------- */
-	if (i * n != dims[0])
-	{
-	    start[0] = off + i * n;
-	    edge[0] = dims[0] - i * n;
-	    edge[1] = dims[1];
-	    edge[2] = dims[2];
-	    status = SDwritedata(sdid, start, NULL, edge,
-				 (VOIDP) fillbuf);
-	}
-	free(fillbuf);
-
-    } else
-    {
-	/* Single plane size (in bytes) greater than max fill buffer */
-	/* --------------------------------------------------------- */
-
-
-	/* Compute number of "rows" than can be written at one time */
-	/* -------------------------------------------------------- */
-	n = HDFE_MAXMEMBUF / (dims[rank - 1] * size);
-
-
-	/* Allocate fill buffer */
-	/* -------------------- */
-	fillbuf = (char *) malloc(dims[rank - 1] * size * n);
-	if(fillbuf == NULL)
-	{
-	    HEpush(DFE_NOSPACE,"EHfillfld", __FILE__, __LINE__);
-	    return(-1);
-	}
-
-
-	/* Fill buffer with fill value */
-	/* --------------------------- */
-	for (i = 0; i < dims[rank - 1] * n; i++)
-	{
-	    memcpy(fillbuf + i * size, fillval, size);
-	}
-
-
-	/* For every plane in field ... */
-	/* ---------------------------- */
-	for (j = 0; j < dims[0]; j++)
-	{
-
-	    /* Write (full) fill buffer to field */
-	    /* --------------------------------- */
-	    for (i = 0; i < (dims[1] / n); i++)
-	    {
-		start[0] = off + j;
-		start[1] = i * n;
-		edge[0] = 1;
-		edge[1] = n;
-		edge[2] = dims[2];
-		status = SDwritedata(sdid, start, NULL, edge,
-				     (VOIDP) fillbuf);
-	    }
-
-
-	    /* Write (partial) last fill buffer to field (if necessary) */
-	    /* -------------------------------------------------------- */
-	    if (i * n != dims[1])
-	    {
-		start[0] = off + j;
-		start[1] = i * n;
-		edge[0] = 1;
-		edge[1] = dims[1] - i * n;
-		edge[2] = dims[2];
-		status = SDwritedata(sdid, start, NULL, edge,
-				     (VOIDP) fillbuf);
-	    }
-	}
-
-	free(fillbuf);
-
-    }
-
-    return (status);
-}
-#endif
-
-
-
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: EHbisect                                                         |
-|                                                                             |
-|  DESCRIPTION: Finds root of function using bisection                        |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  func()         float64             Function to bisect                      |
-|  funcParms      float64             Function parameters (fixed)             |
-|  nParms         int32               Number of function parameters           |
-|  limLft         float64             Lower limit of function argument       |
-|  limRgt         float64             Upper limit of function argument       |
-|  convCrit       float64             Convergence criterion                   |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  root           float64             Function root                           |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Nov 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-EHbisect(float64(*func) (float64[]), float64 funcParms[], int32 nParms,
-	 float64 limLft, float64 limRgt, float64 convCrit, float64 * root)
-{
-    intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-
-    float64         midPnt;	/* Mid-point value */
-    float64         newmidPnt;	/* New mid-point value */
-    float64         funcLft;	/* Function value at left-hand limit */
-    float64         funcMid;	/* Function value at mid-point */
-    float64         funcRgt;	/* Function value at right-hand limit */
-    float64        *parms;	/* Function parameters */
-
-
-    /* Allocate space for function parameters */
-    /* -------------------------------------- */
-    parms = (float64 *) calloc(nParms + 1, sizeof(float64));
-    if(parms == NULL)
-    {
-	HEpush(DFE_NOSPACE, "EHbisect", __FILE__, __LINE__);
-	return(-1);
-    }
-
-
-    /* Copy (fixed) function parameters */
-    /* -------------------------------- */
-    for (i = 0; i < nParms; i++)
-    {
-	parms[i + 1] = funcParms[i];
-    }
-
-
-    /* Copy left-hand limit to "floating" parameter */
-    /* -------------------------------------------- */
-    parms[0] = limLft;
-
-
-    /* Determine function value */
-    /* ------------------------ */
-    funcLft = (*func) (parms);
-
-
-    /* Copy right-hand limit to "floating" parameter */
-    /* --------------------------------------------- */
-    parms[0] = limRgt;
-
-
-    /* Determine function value */
-    /* ------------------------ */
-    funcRgt = (*func) (parms);
-
-
-    /* If left and right limits function values of same sign then no root */
-    /* ------------------------------------------------------------------ */
-    if (funcLft * funcRgt > 0)
-    {
-	free(parms);
-	return (-1);
-    }
-    /* Compute (initial) mid-point */
-    /* --------------------------- */
-    newmidPnt = 0.5 * (limLft + limRgt);
-
-
-    /* Bisection Loop */
-    /* -------------- */
-    while (1)
-    {
-	/* Compute function at new mid-point */
-	/* --------------------------------- */
-	midPnt = newmidPnt;
-	parms[0] = midPnt;
-	funcMid = (*func) (parms);
-
-
-	/* If left limit same sign as mid-point move it to mid-point */
-	/* --------------------------------------------------------- */
-	if (funcLft * funcMid > 0.0)
-	{
-	    limLft = midPnt;
-	} else
-	{
-	    /* Otherwise move over right-hand limit */
-	    /* ------------------------------------ */
-	    limRgt = midPnt;
-	}
-
-
-	/* Compute new mid-point */
-	/* --------------------- */
-	newmidPnt = 0.5 * (limLft + limRgt);
-
-
-	/* If relative change in midpoint < convergence crit then exit loop */
-	/* ---------------------------------------------------------------- */
-	if (fabs((newmidPnt - midPnt) / midPnt) < convCrit)
-	{
-	    break;
-	}
-    }
-
-    /* Save root */
-    /* --------- */
-    *root = newmidPnt;
-
-
-    free(parms);
-
-    return (status);
-}
-#endif
-
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
diff --git a/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c
index cc09d9379983..712ad047c7a1 100644
--- a/frmts/hdf4/hdf-eos/GDapi.c
+++ b/frmts/hdf4/hdf-eos/GDapi.c
@@ -102,12 +102,6 @@ extern  void inv_init(int32, int32, float64 *, int32, const char *, const char *
 #define	GDIDOFFSET 4194304
 #define SQUARE(x)       ((x) * (x))   /* x**2 */
 
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-static int32 GDXSDcomb[512*5];
-static char  GDXSDdims[HDFE_DIMBUFSIZE];
-static char  GDXSDname[HDFE_NAMBUFSIZE];
-#endif
-
 
 #define NGRID 200
 /* Grid Structure External Arrays */
@@ -233,21 +227,7 @@ static intn GDll2ij(int32, int32, float64 [], int32, int32, int32, float64[],
                     float64[], float64[]);
 static intn  GDgetdefaults(int32, int32, float64[], int32,
                            float64[], float64[]);
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-static intn GDtangentpnts(int32, float64[], float64[], float64[], float64[],
-                          float64 [], int32 *);
-#endif
 static intn GDwrrdtile(int32, const char *, const char *, int32 [], VOIDP);
-#ifdef UNUSED_BY_GDAL
-static intn GDll2mm_cea(int32,int32, int32, float64[], int32, int32,
-                        float64[], float64[], int32, float64[],float64[],
-                        float64[], float64[], float64 *, float64 *);
-#endif
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-static intn GDmm2ll_cea(int32, int32, int32, float64[],	int32, int32,
-                        float64[], float64[], int32, float64[], float64[],
-                        float64[], float64[]);
-#endif
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -294,272 +274,6 @@ GDopen(const char *filename, intn l_access)
 }
 
 
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDcreate                                                         |
-|                                                                             |
-|  DESCRIPTION: Creates a grid within the file.                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  gridID         int32               Grid structure ID                       |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  fid            int32               File ID                                 |
-|  gridname       char                Grid structure name                     |
-|  xdimsize       int32               Number of columns in grid               |
-|  ydimsize       int32               Number of rows in grid                  |
-|  upleftpt       float64             Location (m/deg) of upper left corner   |
-|  lowrightpt     float64             Location (m/deg) of lower right corner  |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Aug 96   Joel Gales    Check grid name for ODL compliance                  |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDcreate(int32 fid, const char *gridname, int32 xdimsize, int32 ydimsize,
-	 float64 upleftpt[], float64 lowrightpt[])
-{
-    intn            i;		/* Loop index */
-    intn            ngridopen = 0;	/* # of grid structures open */
-    intn            status = 0;	/* routine return status variable */
-
-    uint8           l_access;	/* Read/Write file l_access code */
-
-    int32           HDFfid;	/* HDF file id */
-    int32           vgRef;	/* Vgroup reference number */
-    int32           vgid[3];	/* Vgroup ID array */
-    int32           gridID = -1;/* HDF-EOS grid ID */
-
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           nGrid = 0;	/* Grid counter */
-
-    char            name[80];	/* Vgroup name */
-    char            class[80];	/* Vgroup class */
-    char            errbuf[256];/* Buffer for error message */
-    char            utlbuf[1024];	/* Utility buffer */
-    char            header[128];/* Structural metadata header string */
-    char            footer[256];/* Structural metadata footer string */
-    char            refstr1[128];	/* Upper left ref string (metadata) */
-    char            refstr2[128];	/* Lower right ref string (metadata) */
-
-
-    /*
-     * Check HDF-EOS file ID, get back HDF file ID, SD interface ID  and
-     * l_access code
-     */
-    status = EHchkfid(fid, gridname, &HDFfid, &sdInterfaceID, &l_access);
-
-
-    /* Check gridname for length */
-    /* ------------------------- */
-    if ((intn) strlen(gridname) > VGNAMELENMAX)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "GDcreate", __FILE__, __LINE__);
-	HEreport("Gridname \"%s\" must be less than %d characters.\n",
-		 gridname, VGNAMELENMAX);
-    }
-
-
-
-    if (status == 0)
-    {
-	/* Determine number of grids currently opened */
-	/* ------------------------------------------- */
-	for (i = 0; i < NGRID; i++)
-	{
-	    ngridopen += GDXGrid[i].active;
-	}
-
-
-	/* Setup file interface */
-	/* -------------------- */
-	if (ngridopen < NGRID)
-	{
-
-	    /* Check that grid has not been previously opened */
-	    /* ----------------------------------------------- */
-	    vgRef = -1;
-
-	    while (1)
-	    {
-		vgRef = Vgetid(HDFfid, vgRef);
-
-		/* If no more Vgroups then exist while loop */
-		/* ---------------------------------------- */
-		if (vgRef == -1)
-		{
-		    break;
-		}
-
-		/* Get name and class of Vgroup */
-		/* ---------------------------- */
-		vgid[0] = Vattach(HDFfid, vgRef, "r");
-		Vgetname(vgid[0], name);
-		Vgetclass(vgid[0], class);
-		Vdetach(vgid[0]);
-
-
-		/* If GRID then increment # grid counter */
-		/* ------------------------------------- */
-		if (strcmp(class, "GRID") == 0)
-		{
-		    nGrid++;
-		}
-
-
-		/* If grid already exist, return error */
-		/* ------------------------------------ */
-		if (strcmp(name, gridname) == 0 &&
-		    strcmp(class, "GRID") == 0)
-		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "GDcreate", __FILE__, __LINE__);
-		    HEreport("\"%s\" already exists.\n", gridname);
-		    break;
-		}
-	    }
-
-
-	    if (status == 0)
-	    {
-		/* Create Root Vgroup for Grid */
-		/* ---------------------------- */
-		vgid[0] = Vattach(HDFfid, -1, "w");
-
-
-		/* Set Name and Class (GRID) */
-		/* -------------------------- */
-		Vsetname(vgid[0], gridname);
-		Vsetclass(vgid[0], "GRID");
-
-
-
-		/* Create Data Fields Vgroup */
-		/* ------------------------- */
-		vgid[1] = Vattach(HDFfid, -1, "w");
-		Vsetname(vgid[1], "Data Fields");
-		Vsetclass(vgid[1], "GRID Vgroup");
-		Vinsert(vgid[0], vgid[1]);
-
-
-
-		/* Create Attributes Vgroup */
-		/* ------------------------ */
-		vgid[2] = Vattach(HDFfid, -1, "w");
-		Vsetname(vgid[2], "Grid Attributes");
-		Vsetclass(vgid[2], "GRID Vgroup");
-		Vinsert(vgid[0], vgid[2]);
-
-
-
-		/* Establish Grid in Structural MetaData Block */
-		/* -------------------------------------------- */
-		snprintf(header, sizeof(header), "%s%d%s%s%s%s%d%s%s%d%s",
-			"\tGROUP=GRID_", (int)(nGrid + 1),
-			"\n\t\tGridName=\"", gridname, "\"\n",
-			"\t\tXDim=", (int)xdimsize, "\n",
-			"\t\tYDim=", (int)ydimsize, "\n");
-
-
-		snprintf(footer, sizeof(footer),
-			"%s%s%s%s%s%s%s%d%s",
-			"\t\tGROUP=Dimension\n",
-			"\t\tEND_GROUP=Dimension\n",
-			"\t\tGROUP=DataField\n",
-			"\t\tEND_GROUP=DataField\n",
-			"\t\tGROUP=MergedFields\n",
-			"\t\tEND_GROUP=MergedFields\n",
-			"\tEND_GROUP=GRID_", (int)(nGrid + 1), "\n");
-
-
-
-		/* Build Ref point Col-Row strings */
-		/* ------------------------------- */
-		if (upleftpt == NULL ||
-		    (upleftpt[0] == 0 && upleftpt[1] == 0 &&
-		     lowrightpt[0] == 0 && lowrightpt[1] == 0))
-		{
-		    strcpy(refstr1, "DEFAULT");
-		    strcpy(refstr2, "DEFAULT");
-		}
-		else
-		{
-		    CPLsnprintf(refstr1, sizeof(refstr1), "%s%f%s%f%s",
-			    "(", upleftpt[0], ",", upleftpt[1], ")");
-
-		    CPLsnprintf(refstr2, sizeof(refstr2), "%s%f%s%f%s",
-			    "(", lowrightpt[0], ",", lowrightpt[1], ")");
-		}
-
-		snprintf(utlbuf, sizeof(utlbuf),
-			"%s%s%s%s%s%s%s%s",
-			header,
-			"\t\tUpperLeftPointMtrs=", refstr1, "\n",
-			"\t\tLowerRightMtrs=", refstr2, "\n",
-			footer);
-
-		status = EHinsertmeta(sdInterfaceID, "", "g", 1002L,
-				      utlbuf, NULL);
-
-	    }
-	}
-	else
-	{
-	    /* Too many files opened */
-	    /* --------------------- */
-	    status = -1;
-	    strcpy(errbuf,
-		   "No more than %d grids may be open simultaneously");
-	    strcat(errbuf, " (%s)");
-	    HEpush(DFE_DENIED, "GDcreate", __FILE__, __LINE__);
-	    HEreport(errbuf, NGRID, gridname);
-	}
-
-
-	/* Assign gridID # & Load grid and GDXGrid.fid table entries */
-	/* --------------------------------------------------------- */
-	if (status == 0)
-	{
-
-	    for (i = 0; i < NGRID; i++)
-	    {
-		if (GDXGrid[i].active == 0)
-		{
-		    gridID = i + idOffset;
-		    GDXGrid[i].active = 1;
-		    GDXGrid[i].IDTable = vgid[0];
-		    GDXGrid[i].VIDTable[0] = vgid[1];
-		    GDXGrid[i].VIDTable[1] = vgid[2];
-		    GDXGrid[i].fid = fid;
-		    status = 0;
-		    break;
-		}
-	    }
-
-	}
-    }
-    return (gridID);
-}
-#endif
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -916,23 +630,22 @@ GDchkgdid(int32 gridID, const char *routname,
 
 }
 
-#ifdef HDFEOS_GD_WRITE_SUPPORT
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdefdim                                                         |
+|  FUNCTION: GDdiminfo                                                        |
 |                                                                             |
-|  DESCRIPTION: Defines a new dimension within the grid.                      |
+|  DESCRIPTION: Retrieve size of specified dimension.                         |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  size           int32               Size of dimension                       |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  dimname        char                Dimension name to define                |
-|  dim            int32               Dimension value                         |
+|  gridID         int32               grid structure id                       |
+|  dimname        char                Dimension name                          |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
@@ -944,216 +657,120 @@ GDchkgdid(int32 gridID, const char *routname,
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-GDdefdim(int32 gridID, const char *dimname, int32 dim)
+int32
+GDdiminfo(int32 gridID, const char *dimname)
 
 {
     intn            status;	/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file id */
+    int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           gdVgrpID;	/* Grid root Vgroup ID */
+    int32           size;	/* Dimension size */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
 
-    char            gridname[80] /* Grid name */ ;
-
-
-    /* Check for valid grid id */
-    status = GDchkgdid(gridID, "GDdefinedim",
-		       &fid, &sdInterfaceID, &gdVgrpID);
 
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;	/* Utility string */
 
-    /* Make sure dimension >= 0 */
-    /* ------------------------ */
-    if (dim < 0)
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
     {
-	status = -1;
-	HEpush(DFE_GENAPP, "GDdefdim", __FILE__, __LINE__);
-	HEreport("Dimension value for \"%s\" less than zero: %d.\n",
-		 dimname, dim);
+	HEpush(DFE_NOSPACE,"GDdiminfo", __FILE__, __LINE__);
+	return(-1);
     }
+    /* Initialize return value */
+    /* ----------------------- */
+    size = -1;
+
+
+    /* Check Grid ID */
+    /* ------------- */
+    status = GDchkgdid(gridID, "GDdiminfo", &fid, &sdInterfaceID, &gdVgrpID);
 
 
-    /* Write Dimension to Structural MetaData */
-    /* -------------------------------------- */
     if (status == 0)
     {
+	/* Get grid name */
+	/* ------------- */
 	int gID = gridID % idOffset;
 	if (gID >= NGRID)
 	{
-		return -1;
+	   free(utlstr);
+	   return -1;
 	}
 	Vgetname(GDXGrid[gID].IDTable, gridname);
-        /* The cast to char* is somehow nasty since EHinsertmeta can modify */
-        /* dimname, but not in this case since we call with metacode = 0 */
-	int32 dimArray[1] = { dim };
-	status = EHinsertmeta(sdInterfaceID, gridname, "g", 0L,
-			      (char*) dimname, dimArray);
-    }
-    return (status);
-
-}
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDdefproj                                                        |
-|                                                                             |
-|  DESCRIPTION: Defines projection of grid.                                   |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  projcode       int32               GCTP projection code                    |
-|  zonecode       int32               UTM zone code                           |
-|  spherecode     int32               GCTP spheriod code                      |
-|  projparm       float64             Projection parameters                   |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDdefproj(int32 gridID, int32 projcode, int32 zonecode, int32 spherecode,
-	  float64 projparm[])
-{
-    intn            i;		/* Loop index */
-    intn	    projx;	/* Projection table l_index */
-    intn            status = 0;	/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           slen;	/* String length */
-    char            utlbuf[1024];	/* Utility Buffer */
-    char            projparmbuf[512];	/* Projection parameter metadata
-					 * string */
-    char            gridname[80];	/* Grid Name */
+	/* Get pointers to "Dimension" section within SM */
+	/* --------------------------------------------- */
+	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+				       "Dimension", metaptrs);
 
+	if(metabuf == NULL)
+	{
+	    free(utlstr);
+	    return(-1);
+	}
 
-    /* Check for valid grid id */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDdefproj", &fid, &sdInterfaceID, &gdVgrpID);
+	/* Search for dimension name (surrounded by quotes) */
+	/* ------------------------------------------------ */
+	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", dimname, "\"\n");
+	metaptrs[0] = strstr(metaptrs[0], utlstr);
 
-    if (status == 0)
-    {
 	/*
-	 * If projection not GEO, UTM, or State Code build projection
-	 * parameter string
+	 * If dimension found within grid structure then get dimension value
 	 */
-	if (projcode != GCTP_GEO &&
-	    projcode != GCTP_UTM &&
-	    projcode != GCTP_SPCS)
+	if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 	{
+	    /* Set endptr at end of dimension definition entry */
+	    /* ----------------------------------------------- */
+	    metaptrs[1] = strstr(metaptrs[0], "\t\t\tEND_OBJECT");
 
-	    /* Begin projection parameter list with "(" */
-	    strcpy(projparmbuf, "(");
+	    status = EHgetmetavalue(metaptrs, "Size", utlstr);
 
-	    for (i = 0; i < 13; i++)
+	    if (status == 0)
 	    {
-        char utlbufSmall[32];
-		/* If projparm[i] = 0 ... */
-		if (projparm[i] == 0.0)
-		{
-		    strcpy(utlbufSmall, "0,");
-		}
-		else
-		{
-		    /* if projparm[i] is integer ... */
-		    if ((int32) projparm[i] == projparm[i])
-		    {
-			snprintf(utlbufSmall, sizeof(utlbufSmall), "%d%s",
-				(int) projparm[i], ",");
-		    }
-		    /* else projparm[i] is non-zero floating point ... */
-		    else
-		    {
-			CPLsnprintf(utlbufSmall, sizeof(utlbufSmall), "%f%s",	projparm[i], ",");
-		    }
-		}
-		strcat(projparmbuf, utlbufSmall);
+		size = atoi(utlstr);
+	    }
+	    else
+	    {
+		HEpush(DFE_GENAPP, "GDdiminfo", __FILE__, __LINE__);
+		HEreport("\"Size\" string not found in metadata.\n");
 	    }
-	    slen = (int)strlen(projparmbuf);
-
-	    /* Add trailing ")" */
-	    projparmbuf[slen - 1] = ')';
-	}
-
-	for (projx = 0; Projections[projx].projcode != -1; projx++)
-	  {
-	    if (projcode == Projections[projx].projcode)
-	      {
-		break;
-	      }
-	  }
-
-
-	/* Build metadata string */
-	/* --------------------- */
-	if (projcode == GCTP_GEO)
-	{
-	    snprintf(utlbuf, sizeof(utlbuf),
-		    "%s%s%s",
-		    "\t\tProjection=", Projections[projx].projname, "\n");
-	}
-	else if (projcode == GCTP_UTM || projcode == GCTP_SPCS)
-	{
-	    snprintf(utlbuf, sizeof(utlbuf),
-		    "%s%s%s%s%d%s%s%d%s",
-		    "\t\tProjection=", Projections[projx].projname, "\n",
-		    "\t\tZoneCode=", (int)zonecode, "\n",
-		    "\t\tSphereCode=", (int)spherecode, "\n");
 	}
 	else
 	{
-	    snprintf(utlbuf, sizeof(utlbuf),
-		    "%s%s%s%s%s%s%s%d%s",
-		    "\t\tProjection=", Projections[projx].projname, "\n",
-		    "\t\tProjParams=", projparmbuf, "\n",
-		    "\t\tSphereCode=", (int)spherecode, "\n");
+	    HEpush(DFE_GENAPP, "GDdiminfo", __FILE__, __LINE__);
+	    HEreport("Dimension \"%s\" not found.\n", dimname);
 	}
 
-
-	/* Insert in structural metadata */
-	/* ----------------------------- */
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	    return -1;
-	}
-	Vgetname(GDXGrid[gID].IDTable, gridname);
-	status = EHinsertmeta(sdInterfaceID, gridname, "g", 101L,
-			      utlbuf, NULL);
+	free(metabuf);
     }
-
-    return (status);
+    free(utlstr);
+    return (size);
 }
 
 
 
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDblkSOMoffset                                                   |
+|  FUNCTION: GDgridinfo                                                       |
 |                                                                             |
-|  DESCRIPTION: Writes Block SOM offset values                                |
+|  DESCRIPTION: Returns xdim, ydim and location of upper left and lower       |
+|                right corners, in meters.                                    |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1161,84 +778,194 @@ GDdefproj(int32 gridID, int32 projcode, int32 zonecode, int32 spherecode,
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  offset         float32             Offset values                           |
-|  count          int32               Number of offset values                 |
-|  code           char                w/r code (w/r)                          |
+|  fid            int32               File ID                                 |
+|  gridname       char                Grid structure name                     |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  xdimsize       int32               Number of columns in grid               |
+|  ydimsize       int32               Number of rows in grid                  |
+|  upleftpt       float64             Location (m/deg) of upper left corner   |
+|  lowrightpt     float64             Location (m/deg) of lower right corner  |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Sep 96   Joel Gales    Original Programmer                                 |
-|  Mar 99   David Wynne   Changed data type of offset array from int32 to     |
-|                         float32, NCR 21197                                  |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDblkSOMoffset(int32 gridID, float32 offset[], int32 count, const char *code)
+GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
+	   float64 upleftpt[], float64 lowrightpt[])
+
 {
     intn            status = 0;	/* routine return status variable */
+    intn            statmeta = 0;	/* EHgetmetavalue return status */
 
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           gdVgrpID;	/* Grid root Vgroup ID */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           projcode;	/* GCTP projection code */
 
-    float64         projparm[13];	/* Projection parameters */
 
-    char            utlbuf[128];/* Utility Buffer */
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
     char            gridname[80];	/* Grid Name */
+    char           *utlstr;	/* Utility string */
 
-    /* Check for valid grid id */
-    status = GDchkgdid(gridID, "GDblkSOMoffset",
-		       &fid, &sdInterfaceID, &gdVgrpID);
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"GDgridinfo", __FILE__, __LINE__);
+	return(-1);
+    }
+    /* Check Grid ID */
+    /* ------------- */
+    status = GDchkgdid(gridID, "GDgridinfo", &fid, &sdInterfaceID, &gdVgrpID);
 
     if (status == 0)
     {
-	/* Get projection parameters */
-	status = GDprojinfo(gridID, &projcode, NULL, NULL, projparm);
+	/* Get grid name */
+	/* ------------- */
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
+
+
+	/* Get pointers to grid structure section within SM */
+	/* ------------------------------------------------ */
+	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+				       NULL, metaptrs);
+
+	if(metabuf == NULL)
+	{
+	    free(utlstr);
+	    return(-1);
+	}
+
+
+	/* Get xdimsize if requested */
+	/* ------------------------- */
+	if (xdimsize != NULL)
+	{
+	    statmeta = EHgetmetavalue(metaptrs, "XDim", utlstr);
+	    if (statmeta == 0)
+	    {
+		*xdimsize = atoi(utlstr);
+	    }
+	    else
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
+		HEreport("\"XDim\" string not found in metadata.\n");
+	    }
+	}
+
+
+	/* Get ydimsize if requested */
+	/* ------------------------- */
+	if (ydimsize != NULL)
+	{
+	    statmeta = EHgetmetavalue(metaptrs, "YDim", utlstr);
+	    if (statmeta == 0)
+	    {
+		*ydimsize = atoi(utlstr);
+	    }
+	    else
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
+		HEreport("\"YDim\" string not found in metadata.\n");
+	    }
+	}
+
 
-	/* If SOM projection with projparm[11] non-zero ... */
-	if (projcode == GCTP_SOM && projparm[11] != 0)
+	/* Get upleftpt if requested */
+	/* ------------------------- */
+	if (upleftpt != NULL)
 	{
-		int gID = gridID % idOffset;
-		if (gID >= NGRID)
+	    statmeta = EHgetmetavalue(metaptrs, "UpperLeftPointMtrs", utlstr);
+	    if (statmeta == 0)
+	    {
+		/* If value is "DEFAULT" then return zeros */
+		/* --------------------------------------- */
+		if (strcmp(utlstr, "DEFAULT") == 0)
 		{
-			return -1;
+		    upleftpt[0] = 0;
+		    upleftpt[1] = 0;
 		}
-	    Vgetname(GDXGrid[gID].IDTable, gridname);
-	    snprintf(utlbuf, sizeof(utlbuf),"%s%s", "_BLKSOM:", gridname);
+		else
+		{
+		    sscanf(utlstr, "(%lf,%lf)",
+			   &upleftpt[0], &upleftpt[1]);
+		}
+	    }
+	    else
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
+		HEreport(
+		  "\"UpperLeftPointMtrs\" string not found in metadata.\n");
+	    }
 
-	    /* Write offset values as attribute */
-	    if (strcmp(code, "w") == 0)
+	}
+
+	/* Get lowrightpt if requested */
+	/* --------------------------- */
+	if (lowrightpt != NULL)
+	{
+	    statmeta = EHgetmetavalue(metaptrs, "LowerRightMtrs", utlstr);
+	    if (statmeta == 0)
 	    {
-		status = GDwriteattr(gridID, utlbuf, DFNT_FLOAT32,
-				     count, offset);
+		/* If value is "DEFAULT" then return zeros */
+		if (strcmp(utlstr, "DEFAULT") == 0)
+		{
+		    lowrightpt[0] = 0;
+		    lowrightpt[1] = 0;
+		}
+		else
+		{
+		    sscanf(utlstr, "(%lf,%lf)",
+			   &lowrightpt[0], &lowrightpt[1]);
+		}
 	    }
-	    /* Read offset values from attribute */
-	    else if (strcmp(code, "r") == 0)
+	    else
 	    {
-		status = GDreadattr(gridID, utlbuf, offset);
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
+		HEreport(
+		      "\"LowerRightMtrs\" string not found in metadata.\n");
 	    }
 	}
+
+	free(metabuf);
     }
+    free(utlstr);
     return (status);
 }
 
 
+
+
+
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdefcomp                                                        |
+|  FUNCTION: GDprojinfo                                                       |
 |                                                                             |
-|  DESCRIPTION: Defines compression type and parameters                       |
+|  DESCRIPTION: Returns GCTP projection code, zone code, spheroid code        |
+|                and projection parameters.                                   |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1246,174 +973,237 @@ GDblkSOMoffset(int32 gridID, float32 offset[], int32 count, const char *code)
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  compcode       int32               compression code                        |
-|  compparm       intn                compression parameters                  |
+|  gridID         int32               Grid structure ID                       |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  projcode       int32               GCTP projection code                    |
+|  zonecode       int32               UTM zone code                           |
+|  spherecode     int32               GCTP spheriod code                      |
+|  projparm       float64             Projection parameters                   |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Sep 96   Joel Gales    Original Programmer                                 |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Oct 96   Joel Gales    Add check for no projection code                    |
+|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
+|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDdefcomp(int32 gridID, int32 compcode, intn compparm[])
+GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
+	   int32 * spherecode, float64 projparm[])
+
 {
+    intn            i;		/* Loop index */
+    intn            projx;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
+    intn            statmeta = 0;	/* EHgetmetavalue return status */
 
-    int32           fid;	/* HDF-EOS file id */
+    int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           gdVgrpID;	/* Grid root Vgroup ID */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           gID;	/* gridID - offset */
-
-    /* Check for valid grid id */
-    status = GDchkgdid(gridID, "GDdefcomp", &fid, &sdInterfaceID, &gdVgrpID);
 
-    if (status == 0)
-    {
-	gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-		return -1;
-	}
-	/* Set compression code in compression external array */
-	GDXGrid[gID].compcode = compcode;
 
-	switch (compcode)
-	{
-	    /* Set NBIT compression parameters in compression external array */
-	case HDFE_COMP_NBIT:
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;	/* Utility string */
+    char            fmt[96];	/* Format String */
 
-	    GDXGrid[gID].compparm[0] = compparm[0];
-	    GDXGrid[gID].compparm[1] = compparm[1];
-	    GDXGrid[gID].compparm[2] = compparm[2];
-	    GDXGrid[gID].compparm[3] = compparm[3];
-
-	    break;
-
-	    /* Set GZIP compression parameter in compression external array */
-	case HDFE_COMP_DEFLATE:
-
-	    GDXGrid[gID].compparm[0] = compparm[0];
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"GDprojinfo", __FILE__, __LINE__);
+	return(-1);
+    }
 
-	    break;
+    /* Check Grid ID */
+    /* ------------- */
+    status = GDchkgdid(gridID, "GDprojinfo", &fid, &sdInterfaceID, &gdVgrpID);
 
+    if (status == 0)
+    {
+	/* Get grid name */
+	/* ------------- */
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   free(utlstr);
+	   return -1;
 	}
-    }
 
-    return (status);
-}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
+	/* Get pointers to grid structure section within SM */
+	/* ------------------------------------------------ */
+	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+				       NULL, metaptrs);
 
+	if(metabuf == NULL)
+	{
+	    free(utlstr);
+	    return(-1);
+	}
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDdeftile                                                        |
-|                                                                             |
-|  DESCRIPTION: Defines tiling parameters                                     |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  tilecode       int32               tile code                               |
-|  tilerank       int32               number of tiling dimensions             |
-|  tiledims       int32               tiling dimensions                       |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jan 97   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDdeftile(int32 gridID, int32 tilecode, int32 tilerank, int32 tiledims[])
-{
-    intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file id */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           gID;	/* gridID - offset */
+	/* Get projcode if requested */
+	/* ------------------------- */
+	if (projcode != NULL)
+	{
+	    *projcode = -1;
 
-    /* Check for valid grid id */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDdeftile", &fid, &sdInterfaceID, &gdVgrpID);
+	    statmeta = EHgetmetavalue(metaptrs, "Projection", utlstr);
+	    if (statmeta == 0)
+	    {
+		/* Loop through projection codes until found */
+		/* ----------------------------------------- */
+		for (projx = 0; Projections[projx].projcode != -1; projx++)
+		    if (strcmp(utlstr, Projections[projx].projname) == 0)
+			break;
+		if (Projections[projx].projname != NULL)
+		    *projcode = Projections[projx].projcode;
+	    }
+	    else
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDprojinfo", __FILE__, __LINE__);
+		HEreport("Projection Code not defined for \"%s\".\n",
+			 gridname);
 
+		if (projparm != NULL)
+		{
+		    for (i = 0; i < 13; i++)
+		    {
+			projparm[i] = -1;
+		    }
+		}
+	    }
+	}
 
-    if (status == 0)
-    {
-	gID = gridID % idOffset;
-	if (gID >= NGRID)
-		return -1;
 
-	for (i = 0; i < 8; i++)
+	/* Get zonecode if requested */
+	/* ------------------------- */
+	if (projcode && zonecode != NULL)
 	{
-	    GDXGrid[gID].tiledims[i] = 0;
+	    *zonecode = -1;
+
+
+	    /* Zone code only relevant for UTM and State Code projections */
+	    /* ---------------------------------------------------------- */
+	    if (*projcode == GCTP_UTM || *projcode == GCTP_SPCS)
+	    {
+		statmeta = EHgetmetavalue(metaptrs, "ZoneCode", utlstr);
+		if (statmeta == 0)
+		{
+		    *zonecode = atoi(utlstr);
+		}
+		else
+		{
+		    status = -1;
+		    HEpush(DFE_GENAPP, "GDprojinfo", __FILE__, __LINE__);
+		    HEreport("Zone Code not defined for \"%s\".\n",
+			     gridname);
+		}
+	    }
 	}
 
-	GDXGrid[gID].tilecode = tilecode;
 
-	switch (tilecode)
+	/* Get projection parameters if requested */
+	/* -------------------------------------- */
+	if (projcode && projparm != NULL)
 	{
-	case HDFE_NOTILE:
-
-	    GDXGrid[gID].tilerank = 0;
 
-	    break;
+	    /*
+	     * Note: No projection parameters for GEO, UTM, and State Code
+	     * projections
+	     */
+	    if (*projcode == GCTP_GEO || *projcode == GCTP_UTM ||
+		*projcode == GCTP_SPCS)
+	    {
+		for (i = 0; i < 13; i++)
+		{
+		    projparm[i] = 0.0;
+		}
 
+	    }
+	    else
+	    {
+		statmeta = EHgetmetavalue(metaptrs, "ProjParams", utlstr);
 
-	case HDFE_TILE:
+		if (statmeta == 0)
+		{
 
-	    GDXGrid[gID].tilerank = tilerank;
+		    /* Build format string to read projection parameters */
+		    /* ------------------------------------------------- */
+		    strcpy(fmt, "%lf,");
+		    for (i = 1; i <= 11; i++)
+			strcat(fmt, "%lf,");
+		    strcat(fmt, "%lf");
 
-	    for (i = 0; i < tilerank; i++)
-	    {
-		GDXGrid[gID].tiledims[i] = tiledims[i];
 
-		if (GDXGrid[gID].tiledims[i] == 0)
+		    /* Read parameters from numeric list */
+		    /* --------------------------------- */
+		    sscanf(&utlstr[1], fmt,
+			   &projparm[0], &projparm[1],
+			   &projparm[2], &projparm[3],
+			   &projparm[4], &projparm[5],
+			   &projparm[6], &projparm[7],
+			   &projparm[8], &projparm[9],
+			   &projparm[10], &projparm[11],
+			   &projparm[12]);
+		}
+		else
 		{
-		    GDXGrid[gID].tiledims[i] = 1;
+		    status = -1;
+		    HEpush(DFE_GENAPP, "GDprojinfo", __FILE__, __LINE__);
+		    HEreport("Projection parameters not defined for \"%s\".\n",
+			     gridname);
+
 		}
 	    }
+	}
 
-	    break;
 
+	/* Get spherecode if requested */
+	/* --------------------------- */
+	if (projcode && spherecode != NULL)
+	{
+	    *spherecode = 0;
+
+	    /* Note: Spherecode not defined for GEO projection */
+	    /* ----------------------------------------------- */
+	    if ((*projcode != GCTP_GEO))
+	    {
+		EHgetmetavalue(metaptrs, "SphereCode", utlstr);
+		if (statmeta == 0)
+		{
+		    *spherecode = atoi(utlstr);
+		}
+	    }
 	}
-    }
+	free(metabuf);
 
+    }
+    free(utlstr);
     return (status);
 }
 
 
 
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdeforigin                                                      |
+|  FUNCTION: GDorigininfo                                                     |
 |                                                                             |
-|  DESCRIPTION: Defines the origin of the grid data.                          |
+|  DESCRIPTION: Returns origin code                                           |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1421,16 +1211,11 @@ GDdeftile(int32 gridID, int32 tilecode, int32 tilerank, int32 tiledims[])
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  origincode     int32               origin code                             |
-|                                     HDFE_GD_UL (0)                          |
-|                                     HDFE_GD_UR (1)                          |
-|			              HDFE_GD_LL (2)                          |
-|                                     HDFE_GD_LR (3)                          |
+|  gridID         int32               Grid structure ID                       |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  origincode     int32               grid origin code                        |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -1438,134 +1223,102 @@ GDdeftile(int32 gridID, int32 tilecode, int32 tilerank, int32 tiledims[])
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
+|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDdeforigin(int32 gridID, int32 origincode)
+GDorigininfo(int32 gridID, int32 * origincode)
 {
+    intn            i;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
+    intn            statmeta = 0;	/* EHgetmetavalue return status */
 
     int32           fid;	/* HDF-EOS file ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
+    int32           gdVgrpID;	/* Grid root Vgroup ID */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
 
-    char            utlbuf[64];	/* Utility buffer */
-    char            gridname[80];	/* Grid name */
 
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;	/* Utility string */
 
-    /* Check for valid grid id */
-    status = GDchkgdid(gridID, "GDdeforigin",
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"GDorigininfo", __FILE__, __LINE__);
+	return(-1);
+    }
+    /* Check Grid ID */
+    /* ------------- */
+    status = GDchkgdid(gridID, "GDorigininfo",
 		       &fid, &sdInterfaceID, &gdVgrpID);
 
+
+    /* Initialize pixreg code to -1 (in case of error) */
+    /* ----------------------------------------------- */
+    *origincode = -1;
+
     if (status == 0)
     {
-	/* If proper origin code then write to structural metadata */
-	/* ------------------------------------------------------- */
-	if (origincode >= 0 && origincode < (int32)(sizeof(originNames) / sizeof(originNames[0])))
-	{
-	    int gID = gridID % idOffset;
-	    if (gID >= NGRID)
-	    {
-	        return -1;
-	    }
-	    snprintf(utlbuf, sizeof(utlbuf),"%s%s%s",
-		    "\t\tGridOrigin=", originNames[origincode], "\n");
+	/* Set default origin code */
+	/* ----------------------- */
+	*origincode = 0;
 
-	    Vgetname(GDXGrid[gID].IDTable, gridname);
-	    status = EHinsertmeta(sdInterfaceID, gridname, "g", 101L,
-				  utlbuf, NULL);
-	}
-	else
+
+	/* Get grid name */
+	/* ------------- */
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
 	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDdeforigin", __FILE__, __LINE__);
-	    HEreport("Improper Grid Origin code: %d\n", origincode);
+	   free(utlstr);
+	   return -1;
 	}
-    }
 
-    return (status);
-}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDdefpixreg                                                      |
-|                                                                             |
-|  DESCRIPTION: Defines pixel registration within grid cell.                  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  pixregcode     int32               Pixel registration code                 |
-|                                     HDFE_CENTER (0)                         |
-|                                     HDFE_CORNER (1)                         |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDdefpixreg(int32 gridID, int32 pixregcode)
-{
-    intn            status = 0;	/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+	/* Get pointers to grid structure section within SM */
+	/* ------------------------------------------------ */
+	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+				       NULL, metaptrs);
 
-    char            utlbuf[64];	/* Utility buffer */
-    char            gridname[80];	/* Grid name */
+	if(metabuf == NULL)
+	{
+	    free(utlstr);
+	    return(-1);
+	}
 
-    /* Check for valid grid id */
-    status = GDchkgdid(gridID, "GDdefpixreg",
-		       &fid, &sdInterfaceID, &gdVgrpID);
 
-    if (status == 0)
-    {
-	/* If proper pix reg code then write to structural metadata */
-	/* -------------------------------------------------------- */
-	if (pixregcode >= 0 && pixregcode < (int32)(sizeof(pixregNames) / sizeof(pixregNames[0])))
+	statmeta = EHgetmetavalue(metaptrs, "GridOrigin", utlstr);
+
+	if (statmeta == 0)
 	{
-		int gID = gridID % idOffset;
-		if (gID >= NGRID)
+	    /*
+	     * If "GridOrigin" string found in metadata then convert to
+	     * numeric origin code (fixed added: Jan 97)
+	     */
+	    for (i = 0; i < (intn)(sizeof(originNames) / sizeof(originNames[0])); i++)
+	    {
+		if (strcmp(utlstr, originNames[i]) == 0)
 		{
-			return -1;
+		    *origincode = i;
+		    break;
 		}
-	    snprintf(utlbuf, sizeof(utlbuf),"%s%s%s",
-		    "\t\tPixelRegistration=", pixregNames[pixregcode], "\n");
-
-	    Vgetname(GDXGrid[gID].IDTable, gridname);
-	    status = EHinsertmeta(sdInterfaceID, gridname, "g", 101L,
-				  utlbuf, NULL);
-	}
-	else
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDdefpixreg", __FILE__, __LINE__);
-	    HEreport("Improper Pixel Registration code: %d\n", pixregcode);
+	    }
 	}
-    }
 
+	free(metabuf);
+    }
+    free(utlstr);
     return (status);
-
 }
-#endif
+
+
 
 
 
@@ -1573,18 +1326,21 @@ GDdefpixreg(int32 gridID, int32 pixregcode)
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdiminfo                                                        |
+|  FUNCTION: GDpixreginfo                                                     |
 |                                                                             |
-|  DESCRIPTION: Retrieve size of specified dimension.                         |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  size           int32               Size of dimension                       |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               grid structure id                       |
-|  dimname        char                Dimension name                          |
+|  gridID         int32               Grid structure ID                       |
+|                                                                             |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  pixregcode     int32               Pixel registration code                 |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
@@ -1596,21 +1352,20 @@ GDdefpixreg(int32 gridID, int32 pixregcode)
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
 |  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-int32
-GDdiminfo(int32 gridID, const char *dimname)
-
+intn
+GDpixreginfo(int32 gridID, int32 * pixregcode)
 {
-    intn            status;	/* routine return status variable */
+    intn            i;		/* Loop index */
+    intn            status = 0;	/* routine return status variable */
+    intn            statmeta = 0;	/* EHgetmetavalue return status */
 
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           size;	/* Dimension size */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
 
 
@@ -1624,36 +1379,34 @@ GDdiminfo(int32 gridID, const char *dimname)
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
     {
-	HEpush(DFE_NOSPACE,"GDdiminfo", __FILE__, __LINE__);
+	HEpush(DFE_NOSPACE,"GDpixreginfo", __FILE__, __LINE__);
 	return(-1);
     }
-    /* Initialize return value */
-    /* ----------------------- */
-    size = -1;
-
-
     /* Check Grid ID */
-    /* ------------- */
-    status = GDchkgdid(gridID, "GDdiminfo", &fid, &sdInterfaceID, &gdVgrpID);
+    status = GDchkgdid(gridID, "GDpixreginfo",
+		       &fid, &sdInterfaceID, &gdVgrpID);
 
+    /* Initialize pixreg code to -1 (in case of error) */
+    *pixregcode = -1;
 
     if (status == 0)
     {
+	/* Set default pixreg code */
+	*pixregcode = 0;
+
 	/* Get grid name */
-	/* ------------- */
 	int gID = gridID % idOffset;
 	if (gID >= NGRID)
 	{
 	   free(utlstr);
 	   return -1;
 	}
-	Vgetname(GDXGrid[gID].IDTable, gridname);
 
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
-	/* Get pointers to "Dimension" section within SM */
-	/* --------------------------------------------- */
+	/* Get pointers to grid structure section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       "Dimension", metaptrs);
+				       NULL, metaptrs);
 
 	if(metabuf == NULL)
 	{
@@ -1661,86 +1414,68 @@ GDdiminfo(int32 gridID, const char *dimname)
 	    return(-1);
 	}
 
-	/* Search for dimension name (surrounded by quotes) */
-	/* ------------------------------------------------ */
-	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", dimname, "\"\n");
-	metaptrs[0] = strstr(metaptrs[0], utlstr);
 
-	/*
-	 * If dimension found within grid structure then get dimension value
-	 */
-	if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-	{
-	    /* Set endptr at end of dimension definition entry */
-	    /* ----------------------------------------------- */
-	    metaptrs[1] = strstr(metaptrs[0], "\t\t\tEND_OBJECT");
+	statmeta = EHgetmetavalue(metaptrs, "PixelRegistration", utlstr);
 
-	    status = EHgetmetavalue(metaptrs, "Size", utlstr);
+	if (statmeta == 0)
+	{
+	    /*
+	     * If "PixelRegistration" string found in metadata then convert
+	     * to numeric origin code (fixed added: Jan 97)
+	     */
 
-	    if (status == 0)
-	    {
-		size = atoi(utlstr);
-	    }
-	    else
+	    for (i = 0; i < (intn)(sizeof(pixregNames) / sizeof(pixregNames[0])); i++)
 	    {
-		HEpush(DFE_GENAPP, "GDdiminfo", __FILE__, __LINE__);
-		HEreport("\"Size\" string not found in metadata.\n");
+		if (strcmp(utlstr, pixregNames[i]) == 0)
+		{
+		    *pixregcode = i;
+		    break;
+		}
 	    }
 	}
-	else
-	{
-	    HEpush(DFE_GENAPP, "GDdiminfo", __FILE__, __LINE__);
-	    HEreport("Dimension \"%s\" not found.\n", dimname);
-	}
-
 	free(metabuf);
     }
     free(utlstr);
-    return (size);
+    return (status);
 }
 
 
 
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDgridinfo                                                       |
+|  FUNCTION: GDcompinfo                                                       |
 |                                                                             |
-|  DESCRIPTION: Returns xdim, ydim and location of upper left and lower       |
-|                right corners, in meters.                                    |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  status         intn                                                        |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  fid            int32               File ID                                 |
-|  gridname       char                Grid structure name                     |
+|  gridID         int32                                                       |
+|  compcode       int32                                                       |
+|  compparm       intn                                                        |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  xdimsize       int32               Number of columns in grid               |
-|  ydimsize       int32               Number of rows in grid                  |
-|  upleftpt       float64             Location (m/deg) of upper left corner   |
-|  lowrightpt     float64             Location (m/deg) of lower right corner  |
+|             None                                                            |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Oct 96   Joel Gales    Original Programmer                                 |
 |  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
-	   float64 upleftpt[], float64 lowrightpt[])
-
+GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[])
 {
+    intn            i;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
     intn            statmeta = 0;	/* EHgetmetavalue return status */
 
@@ -1753,38 +1488,34 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
     char           *metabuf;	/* Pointer to structural metadata (SM) */
     char           *metaptrs[2];/* Pointers to begin and end of SM section */
     char            gridname[80];	/* Grid Name */
-    char           *utlstr;	/* Utility string */
+    char           *utlstr;/* Utility string */
 
     /* Allocate space for utility string */
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
     {
-	HEpush(DFE_NOSPACE,"GDgridinfo", __FILE__, __LINE__);
+	HEpush(DFE_NOSPACE,"GDcompinfo", __FILE__, __LINE__);
 	return(-1);
     }
     /* Check Grid ID */
-    /* ------------- */
-    status = GDchkgdid(gridID, "GDgridinfo", &fid, &sdInterfaceID, &gdVgrpID);
+    status = GDchkgdid(gridID, "GDcompinfo", &fid, &sdInterfaceID, &gdVgrpID);
+
 
     if (status == 0)
     {
 	/* Get grid name */
-	/* ------------- */
 	int gID = gridID % idOffset;
 	if (gID >= NGRID)
 	{
-	   free(utlstr);
-	   return -1;
+		free(utlstr);
+		return -1;
 	}
 	Vgetname(GDXGrid[gID].IDTable, gridname);
 
-
-	/* Get pointers to grid structure section within SM */
-	/* ------------------------------------------------ */
+	/* Get pointers to "DataField" section within SM */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       NULL, metaptrs);
-
+				       "DataField", metaptrs);
 	if(metabuf == NULL)
 	{
 	    free(utlstr);
@@ -1792,101 +1523,99 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
 	}
 
 
-	/* Get xdimsize if requested */
-	/* ------------------------- */
-	if (xdimsize != NULL)
-	{
-	    statmeta = EHgetmetavalue(metaptrs, "XDim", utlstr);
-	    if (statmeta == 0)
-	    {
-		*xdimsize = atoi(utlstr);
-	    }
-	    else
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
-		HEreport("\"XDim\" string not found in metadata.\n");
-	    }
-	}
+	/* Search for field */
+	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"\n");
+	metaptrs[0] = strstr(metaptrs[0], utlstr);
 
 
-	/* Get ydimsize if requested */
-	/* ------------------------- */
-	if (ydimsize != NULL)
+	/* If field found and user wants compression code ... */
+	if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 	{
-	    statmeta = EHgetmetavalue(metaptrs, "YDim", utlstr);
-	    if (statmeta == 0)
-	    {
-		*ydimsize = atoi(utlstr);
-	    }
-	    else
+	    if (compcode != NULL)
 	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
-		HEreport("\"YDim\" string not found in metadata.\n");
-	    }
-	}
+		/* Set endptr at end of field's definition entry */
+		metaptrs[1] = strstr(metaptrs[0], "\t\t\tEND_OBJECT");
 
+		/* Get compression type */
+		statmeta = EHgetmetavalue(metaptrs, "CompressionType", utlstr);
 
-	/* Get upleftpt if requested */
-	/* ------------------------- */
-	if (upleftpt != NULL)
-	{
-	    statmeta = EHgetmetavalue(metaptrs, "UpperLeftPointMtrs", utlstr);
-	    if (statmeta == 0)
-	    {
-		/* If value is "DEFAULT" then return zeros */
-		/* --------------------------------------- */
-		if (strcmp(utlstr, "DEFAULT") == 0)
-		{
-		    upleftpt[0] = 0;
-		    upleftpt[1] = 0;
-		}
-		else
+		/*
+		 * Default is no compression if "CompressionType" string not
+		 * in metadata
+		 */
+		*compcode = HDFE_COMP_NONE;
+
+		/* If compression code is found ... */
+		if (statmeta == 0)
 		{
-		    sscanf(utlstr, "(%lf,%lf)",
-			   &upleftpt[0], &upleftpt[1]);
+		    /* Loop through compression types until match */
+		    for (i = 0; i < (intn)(sizeof(HDFcomp) / sizeof(HDFcomp[0])); i++)
+		    {
+			if (strcmp(utlstr, HDFcomp[i]) == 0)
+			{
+			    *compcode = i;
+			    break;
+			}
+		    }
 		}
 	    }
-	    else
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
-		HEreport(
-		  "\"UpperLeftPointMtrs\" string not found in metadata.\n");
-	    }
-
-	}
 
-	/* Get lowrightpt if requested */
-	/* --------------------------- */
-	if (lowrightpt != NULL)
-	{
-	    statmeta = EHgetmetavalue(metaptrs, "LowerRightMtrs", utlstr);
-	    if (statmeta == 0)
+	    /* If user wants compression parameters ... */
+	    if (compparm != NULL && compcode != NULL)
 	    {
-		/* If value is "DEFAULT" then return zeros */
-		if (strcmp(utlstr, "DEFAULT") == 0)
+		/* Initialize to zero */
+		for (i = 0; i < 4; i++)
 		{
-		    lowrightpt[0] = 0;
-		    lowrightpt[1] = 0;
+		    compparm[i] = 0;
 		}
-		else
+
+		/*
+		 * Get compression parameters if NBIT or DEFLATE compression
+		 */
+		if (*compcode == HDFE_COMP_NBIT)
 		{
-		    sscanf(utlstr, "(%lf,%lf)",
-			   &lowrightpt[0], &lowrightpt[1]);
+		    statmeta =
+			EHgetmetavalue(metaptrs, "CompressionParams", utlstr);
+		    if (statmeta == 0)
+		    {
+			sscanf(utlstr, "(%d,%d,%d,%d)",
+			       &compparm[0], &compparm[1],
+			       &compparm[2], &compparm[3]);
+		    }
+		    else
+		    {
+			status = -1;
+			HEpush(DFE_GENAPP, "GDcompinfo", __FILE__, __LINE__);
+			HEreport(
+				 "\"CompressionParams\" string not found in metadata.\n");
+		    }
+		}
+		else if (*compcode == HDFE_COMP_DEFLATE)
+		{
+		    statmeta =
+			EHgetmetavalue(metaptrs, "DeflateLevel", utlstr);
+		    if (statmeta == 0)
+		    {
+			sscanf(utlstr, "%d", &compparm[0]);
+		    }
+		    else
+		    {
+			status = -1;
+			HEpush(DFE_GENAPP, "GDcompinfo", __FILE__, __LINE__);
+			HEreport(
+			"\"DeflateLevel\" string not found in metadata.\n");
+		    }
 		}
 	    }
-	    else
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgridinfo", __FILE__, __LINE__);
-		HEreport(
-		      "\"LowerRightMtrs\" string not found in metadata.\n");
-	    }
+	}
+	else
+	{
+	    HEpush(DFE_GENAPP, "GDcompinfo", __FILE__, __LINE__);
+	    HEreport("Fieldname \"%s\" not found.\n", fieldname);
 	}
 
 	free(metabuf);
+
     }
     free(utlstr);
     return (status);
@@ -1897,14 +1626,13 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
 
 
 
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDprojinfo                                                       |
+|  FUNCTION: GDfieldinfo                                                      |
 |                                                                             |
-|  DESCRIPTION: Returns GCTP projection code, zone code, spheroid code        |
-|                and projection parameters.                                   |
+|  DESCRIPTION: Retrieve information about a specific geolocation or data     |
+|                field in the grid.                                           |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1912,13 +1640,19 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
+|  gridID         int32               grid structure id                       |
+|  fieldname      char                name of field                           |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  projcode       int32               GCTP projection code                    |
-|  zonecode       int32               UTM zone code                           |
-|  spherecode     int32               GCTP spheriod code                      |
-|  projparm       float64             Projection parameters                   |
+|  rank           int32               rank of field (# of dims)               |
+|  dims           int32               field dimensions                        |
+|  numbertype     int32               field number type                       |
+|  dimlist        char                field dimension list                    |
+|                                                                             |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|             None                                                            |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -1926,66 +1660,65 @@ GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Add check for no projection code                    |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
 |  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
-|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
+|  Feb 99   Abe Taaheri   Changed memcpy to memmove to avoid overlapping      |
+|                         problem when copying strings                        |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
-	   int32 * spherecode, float64 projparm[])
+GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
+	    int32 * numbertype, char *dimlist)
 
 {
-    intn            i;		/* Loop index */
-    intn            projx;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-    intn            statmeta = 0;	/* EHgetmetavalue return status */
+    intn            i;		    /* Loop index */
+    intn            status;	    /* routine return status variable */
+    intn            statmeta = 0;   /* EHgetmetavalue return status */
 
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           fid;	    /* HDF-EOS file ID */
+    int32           sdInterfaceID;  /* HDF SDS interface ID */
+    int32           idOffset = GDIDOFFSET;  /* Grid ID offset */
+    int32           ndims = 0;	    /* Number of dimensions */
+    int32           slen[8];	    /* Length of each entry in parsed string */
+    int32           dum;	    /* Dummy variable */
+    int32           xdim;	    /* X dim size */
+    int32           ydim;	    /* Y dim size */
+    int32           sdid;	    /* SDS id */
 
+    char           *metabuf;	    /* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];    /* Pointers to begin and end of SM section */
+    char            gridname[80];   /* Grid Name */
+    char           *utlstr;	    /* Utility string */
+    char           *ptr[8];	    /* String pointers for parsed string */
+    char            dimstr[64];	    /* Individual dimension entry string */
 
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;	/* Utility string */
-    char            fmt[96];	/* Format String */
 
     /* Allocate space for utility string */
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
     {
-	HEpush(DFE_NOSPACE,"GDprojinfo", __FILE__, __LINE__);
+	HEpush(DFE_NOSPACE,"GDfieldinfo", __FILE__, __LINE__);
 	return(-1);
     }
+    *rank = -1;
+    *numbertype = -1;
 
-    /* Check Grid ID */
-    /* ------------- */
-    status = GDchkgdid(gridID, "GDprojinfo", &fid, &sdInterfaceID, &gdVgrpID);
+    status = GDchkgdid(gridID, "GDfieldinfo", &fid, &sdInterfaceID, &dum);
 
     if (status == 0)
     {
-	/* Get grid name */
-	/* ------------- */
 	int gID = gridID % idOffset;
 	if (gID >= NGRID)
 	{
-	   free(utlstr);
-	   return -1;
-	}
-
+	    free(utlstr);
+	    return -1;
+    }
 	Vgetname(GDXGrid[gID].IDTable, gridname);
 
-
-	/* Get pointers to grid structure section within SM */
-	/* ------------------------------------------------ */
 	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       NULL, metaptrs);
-
+				       "DataField", metaptrs);
 	if(metabuf == NULL)
 	{
 	    free(utlstr);
@@ -1993,143 +1726,110 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 	}
 
 
-	/* Get projcode if requested */
-	/* ------------------------- */
-	if (projcode != NULL)
+	/* Search for field */
+	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"\n");
+	metaptrs[0] = strstr(metaptrs[0], utlstr);
+
+	/* If field found ... */
+	if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 	{
-	    *projcode = -1;
 
-	    statmeta = EHgetmetavalue(metaptrs, "Projection", utlstr);
+	    /* Set endptr at end of dimension definition entry */
+	    metaptrs[1] = strstr(metaptrs[0], "\t\t\tEND_OBJECT");
+
+	    /* Get DataType string */
+	    statmeta = EHgetmetavalue(metaptrs, "DataType", utlstr);
+
+	    /* Convert to numbertype code */
 	    if (statmeta == 0)
+		*numbertype = EHnumstr(utlstr);
+	    else
 	    {
-		/* Loop through projection codes until found */
-		/* ----------------------------------------- */
-		for (projx = 0; Projections[projx].projcode != -1; projx++)
-		    if (strcmp(utlstr, Projections[projx].projname) == 0)
-			break;
-		if (Projections[projx].projname != NULL)
-		    *projcode = Projections[projx].projcode;
+		status = -1;
+		HEpush(DFE_GENAPP, "GDfieldinfo", __FILE__, __LINE__);
+		HEreport("\"DataType\" string not found in metadata.\n");
+	    }
+
+	    /*
+	     * Get DimList string and trim off leading and trailing parens
+	     * "()"
+	     */
+	    statmeta = EHgetmetavalue(metaptrs, "DimList", utlstr);
+
+	    if (statmeta == 0)
+	    {
+		memmove(utlstr, utlstr + 1, strlen(utlstr) - 2);
+		utlstr[strlen(utlstr) - 2] = 0;
+
+		/* Parse trimmed DimList string and get rank */
+		ndims = EHparsestr(utlstr, ',', ptr, slen);
+		*rank = ndims;
 	    }
 	    else
 	    {
 		status = -1;
-		HEpush(DFE_GENAPP, "GDprojinfo", __FILE__, __LINE__);
-		HEreport("Projection Code not defined for \"%s\".\n",
-			 gridname);
+		HEpush(DFE_GENAPP, "GDfieldinfo", __FILE__, __LINE__);
+		HEreport("\"DimList\" string not found in metadata.\n");
+	    }
 
-		if (projparm != NULL)
+
+	    if (status == 0)
+	    {
+		status = GDgridinfo(gridID, &xdim, &ydim, NULL, NULL);
+
+		for (i = 0; i < ndims; i++)
 		{
-		    for (i = 0; i < 13; i++)
+		    memcpy(dimstr, ptr[i] + 1, slen[i] - 2);
+		    dimstr[slen[i] - 2] = 0;
+
+		    if (strcmp(dimstr, "XDim") == 0)
 		    {
-			projparm[i] = -1;
+			dims[i] = xdim;
+		    }
+		    else if (strcmp(dimstr, "YDim") == 0)
+		    {
+			dims[i] = ydim;
+		    }
+		    else
+		    {
+			dims[i] = GDdiminfo(gridID, dimstr);
 		    }
-		}
-	    }
-	}
-
-
-	/* Get zonecode if requested */
-	/* ------------------------- */
-	if (projcode && zonecode != NULL)
-	{
-	    *zonecode = -1;
-
-
-	    /* Zone code only relevant for UTM and State Code projections */
-	    /* ---------------------------------------------------------- */
-	    if (*projcode == GCTP_UTM || *projcode == GCTP_SPCS)
-	    {
-		statmeta = EHgetmetavalue(metaptrs, "ZoneCode", utlstr);
-		if (statmeta == 0)
-		{
-		    *zonecode = atoi(utlstr);
-		}
-		else
-		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "GDprojinfo", __FILE__, __LINE__);
-		    HEreport("Zone Code not defined for \"%s\".\n",
-			     gridname);
-		}
-	    }
-	}
 
 
-	/* Get projection parameters if requested */
-	/* -------------------------------------- */
-	if (projcode && projparm != NULL)
-	{
+		    if (dimlist != NULL)
+		    {
+			if (i == 0)
+			{
+			    dimlist[0] = 0;
+			}
 
-	    /*
-	     * Note: No projection parameters for GEO, UTM, and State Code
-	     * projections
-	     */
-	    if (*projcode == GCTP_GEO || *projcode == GCTP_UTM ||
-		*projcode == GCTP_SPCS)
-	    {
-		for (i = 0; i < 13; i++)
-		{
-		    projparm[i] = 0.0;
+			if (i > 0)
+			{
+			    strcat(dimlist, ",");
+			}
+			strcat(dimlist, dimstr);
+		    }
 		}
 
-	    }
-	    else
-	    {
-		statmeta = EHgetmetavalue(metaptrs, "ProjParams", utlstr);
-
-		if (statmeta == 0)
-		{
-
-		    /* Build format string to read projection parameters */
-		    /* ------------------------------------------------- */
-		    strcpy(fmt, "%lf,");
-		    for (i = 1; i <= 11; i++)
-			strcat(fmt, "%lf,");
-		    strcat(fmt, "%lf");
 
-
-		    /* Read parameters from numeric list */
-		    /* --------------------------------- */
-		    sscanf(&utlstr[1], fmt,
-			   &projparm[0], &projparm[1],
-			   &projparm[2], &projparm[3],
-			   &projparm[4], &projparm[5],
-			   &projparm[6], &projparm[7],
-			   &projparm[8], &projparm[9],
-			   &projparm[10], &projparm[11],
-			   &projparm[12]);
-		}
-		else
+		if (dims[0] == 0)
 		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "GDprojinfo", __FILE__, __LINE__);
-		    HEreport("Projection parameters not defined for \"%s\".\n",
-			     gridname);
-
+		    status = GDSDfldsrch(gridID, sdInterfaceID, fieldname,
+					 &sdid, &dum, &dum, &dum, dims,
+					 &dum);
 		}
 	    }
 	}
 
-
-	/* Get spherecode if requested */
-	/* --------------------------- */
-	if (projcode && spherecode != NULL)
-	{
-	    *spherecode = 0;
-
-	    /* Note: Spherecode not defined for GEO projection */
-	    /* ----------------------------------------------- */
-	    if ((*projcode != GCTP_GEO))
-	    {
-		EHgetmetavalue(metaptrs, "SphereCode", utlstr);
-		if (statmeta == 0)
-		{
-		    *spherecode = atoi(utlstr);
-		}
-	    }
-	}
 	free(metabuf);
+    }
+
+    if (*rank == -1)
+    {
+	status = -1;
 
+	HEpush(DFE_GENAPP, "GDfieldinfo", __FILE__, __LINE__);
+	HEreport("Fieldname \"%s\" not found.\n", fieldname);
     }
     free(utlstr);
     return (status);
@@ -2140,9 +1840,9 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDorigininfo                                                     |
+|  FUNCTION: GDSDfldsrch                                                      |
 |                                                                             |
-|  DESCRIPTION: Returns origin code                                           |
+|  DESCRIPTION: Retrieves information from SDS fields                         |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -2150,11 +1850,18 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
+|  gridID         int32               grid structure ID                       |
+|  sdInterfaceID  int32               SD interface ID                         |
+|  fieldname      char                field name                              |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  origincode     int32               grid origin code                        |
+|  sdid           int32               SD element ID                           |
+|  rankSDS        int32               Rank of SDS                             |
+|  rankFld        int32               True rank of field (merging)            |
+|  offset         int32               Offset of field within merged field     |
+|  dims           int32               Dimensions of field                     |
+|  solo           int32               Solo field flag                         |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -2162,96 +1869,204 @@ GDprojinfo(int32 gridID, int32 * projcode, int32 * zonecode,
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-GDorigininfo(int32 gridID, int32 * origincode)
+static intn
+GDSDfldsrch(int32 gridID, int32 sdInterfaceID, const char *fieldname,
+            int32 * sdid, int32 * rankSDS, int32 * rankFld, int32 * offset,
+            int32 dims[], int32 * solo)
 {
     intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-    intn            statmeta = 0;	/* EHgetmetavalue return status */
+    intn            status = -1;/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
+    int32           gID;	/* GridID - offset */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           dum;	/* Dummy variable */
+    int32           dums[128];	/* Dummy array */
+    int32           attrIndex;	/* Attribute l_index */
 
-
+    char            name[2048];	/* Merged-Field Names */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;/* Utility string */
     char           *metabuf;	/* Pointer to structural metadata (SM) */
     char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;	/* Utility string */
+#ifdef broken_logic
+    char           *oldmetaptr;	/* Pointer within SM section */
+    char           *metaptr;	/* Pointer within SM section */
+#endif
 
     /* Allocate space for utility string */
     /* --------------------------------- */
     utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
     if(utlstr == NULL)
     {
-	HEpush(DFE_NOSPACE,"GDorigininfo", __FILE__, __LINE__);
+	HEpush(DFE_NOSPACE,"GDSDfldsrch", __FILE__, __LINE__);
 	return(-1);
     }
-    /* Check Grid ID */
-    /* ------------- */
-    status = GDchkgdid(gridID, "GDorigininfo",
-		       &fid, &sdInterfaceID, &gdVgrpID);
+    /* Set solo flag to 0 (no) */
+    /* ----------------------- */
+    *solo = 0;
 
 
-    /* Initialize pixreg code to -1 (in case of error) */
-    /* ----------------------------------------------- */
-    *origincode = -1;
+    /* Compute "reduced" grid ID */
+    /* ------------------------- */
+    gID = gridID % idOffset;
+    if (gID >= NGRID)
+    {
+        free(utlstr);
+        return -1;
+    }
 
-    if (status == 0)
+    /* Loop through all SDSs in grid */
+    /* ----------------------------- */
+    for (i = 0; i < GDXGrid[gID].nSDS; i++)
     {
-	/* Set default origin code */
-	/* ----------------------- */
-	*origincode = 0;
+	/* If active SDS ... */
+	/* ----------------- */
+	if (GDXGrid[gID].sdsID[i] != 0)
+	{
+	    /* Get SDS ID, name, rankSDS, and dimensions */
+	    /* ----------------------------------------- */
+	    *sdid = GDXGrid[gID].sdsID[i];
+	    SDgetinfo(*sdid, name, rankSDS, dims, &dum, &dum);
+	    *rankFld = *rankSDS;
 
 
-	/* Get grid name */
-	/* ------------- */
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	   free(utlstr);
-	   return -1;
-	}
+	    /* If merged field ... */
+	    /* ------------------- */
+	    if (strstr(name, "MRGFLD_") == &name[0])
+	    {
+		/* Get grid name */
+		/* ------------- */
+		Vgetname(GDXGrid[gID].IDTable, gridname);
 
-	Vgetname(GDXGrid[gID].IDTable, gridname);
 
+		/* Get pointers to "MergedFields" section within SM */
+		/* ------------------------------------------------ */
+		metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+					       "MergedFields", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
 
-	/* Get pointers to grid structure section within SM */
-	/* ------------------------------------------------ */
-	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       NULL, metaptrs);
+#ifdef broken_logic
+		/* Initialize metaptr to beg. of section */
+		/* ------------------------------------- */
+		metaptr = metaptrs[0];
 
-	if(metabuf == NULL)
-	{
-	    free(utlstr);
-	    return(-1);
-	}
 
+		/* Store metaptr in order to recover */
+		/* --------------------------------- */
+		oldmetaptr = metaptr;
 
-	statmeta = EHgetmetavalue(metaptrs, "GridOrigin", utlstr);
 
-	if (statmeta == 0)
-	{
-	    /*
-	     * If "GridOrigin" string found in metadata then convert to
-	     * numeric origin code (fixed added: Jan 97)
-	     */
-	    for (i = 0; i < (intn)(sizeof(originNames) / sizeof(originNames[0])); i++)
-	    {
-		if (strcmp(utlstr, originNames[i]) == 0)
-		{
-		    *origincode = i;
-		    break;
+		/* Search for Merged field name */
+		/* ---------------------------- */
+		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "MergedFieldName=\"",
+			name, "\"\n");
+		metaptr = strstr(metaptr, utlstr);
+
+
+		/* If not found check for old metadata */
+		/* ----------------------------------- */
+		if (metaptr == NULL)
+		{
+		    snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "OBJECT=\"", name, "\"\n");
+		    metaptr = strstr(oldmetaptr, utlstr);
+		}
+#endif
+
+		/* Get field list and strip off leading and trailing quotes */
+		/* -------------------------------------------------------- */
+		EHgetmetavalue(metaptrs, "FieldList", name);
+		memmove(name, name + 1, strlen(name) - 2);
+		name[strlen(name) - 2] = 0;
+
+
+		/* Search for desired field within merged field list */
+		/* ------------------------------------------------- */
+		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"");
+		dum = EHstrwithin(utlstr, name, ',');
+
+		free(metabuf);
+	    }
+	    else
+	    {
+		/* If solo (unmerged) check if SDS name matches fieldname */
+		/* ------------------------------------------------------ */
+		dum = EHstrwithin(fieldname, name, ',');
+		if (dum != -1)
+		{
+		    *solo = 1;
+		    *offset = 0;
 		}
 	    }
-	}
 
-	free(metabuf);
+
+
+	    /* If field found ... */
+	    /* ------------------ */
+	    if (dum != -1)
+	    {
+		status = 0;
+
+		/* If merged field ... */
+		/* ------------------- */
+		if (*solo == 0)
+		{
+		    /* Get "Field Offsets" SDS attribute l_index */
+		    /* --------------------------------------- */
+		    attrIndex = SDfindattr(*sdid, "Field Offsets");
+
+		    /*
+		     * If attribute exists then get offset of desired field
+		     * within merged field
+		     */
+		    if (attrIndex != -1)
+		    {
+			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
+			*offset = dums[dum];
+		    }
+
+
+		    /* Get "Field Dims" SDS attribute l_index */
+		    /* ------------------------------------ */
+		    attrIndex = SDfindattr(*sdid, "Field Dims");
+
+		    /*
+		     * If attribute exists then get 0th dimension of desired
+		     * field within merged field
+		     */
+		    if (attrIndex != -1)
+		    {
+			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
+			dims[0] = dums[dum];
+
+			/* If this dimension = 1 then field is really 2 dim */
+			/* ------------------------------------------------ */
+			if (dums[dum] == 1)
+			{
+			    *rankFld = 2;
+			}
+		    }
+		}
+
+
+		/* Break out of SDS loop */
+		/* --------------------- */
+		break;
+	    }			/* End of found field section */
+	}
+	else
+	{
+	    /* First non-active SDS signifies no more, break out of SDS loop */
+	    /* ------------------------------------------------------------- */
+	    break;
+	}
     }
     free(utlstr);
     return (status);
@@ -2260,14 +2075,12 @@ GDorigininfo(int32 gridID, int32 * origincode)
 
 
 
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDpixreginfo                                                     |
+|  FUNCTION: GDwrrdfield                                                      |
 |                                                                             |
-|  DESCRIPTION:                                                               |
+|  DESCRIPTION: Writes/Reads fields                                           |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -2275,15 +2088,18 @@ GDorigininfo(int32 gridID, int32 * origincode)
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
+|  gridID         int32               grid structure ID                       |
+|  fieldname      char                fieldname                               |
+|  code           char                Write/Read code (w/r)                   |
+|  start          int32               start array                             |
+|  stride         int32               stride array                            |
+|  edge           int32               edge array                              |
+|  datbuf         void                data buffer for read                    |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  pixregcode     int32               Pixel registration code                 |
-|                                                                             |
+|  datbuf         void                data buffer for write                   |
 |                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -2291,287 +2107,246 @@ GDorigininfo(int32 gridID, int32 * origincode)
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
+|  Feb 97   Joel Gales    Stride = 1 HDF compression workaround               |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-GDpixreginfo(int32 gridID, int32 * pixregcode)
+static intn
+GDwrrdfield(int32 gridID, const char *fieldname, const char *code,
+	    int32 start[], int32 stride[], int32 edge[], VOIDP datbuf)
+
 {
     intn            i;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
-    intn            statmeta = 0;	/* EHgetmetavalue return status */
 
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           sdid;	/* SDS ID */
+    int32           dum;	/* Dummy variable */
+    int32           rankSDS;	/* Rank of SDS */
+    int32           rankFld;	/* Rank of field */
 
+    int32           offset[8];	/* I/O offset (start) */
+    int32           incr[8];	/* I/O increment (stride) */
+    int32           count[8];	/* I/O count (edge) */
+    int32           dims[8];	/* Field/SDS dimensions */
+    int32           mrgOffset;	/* Merged field offset */
+    int32           strideOne;	/* Strides = 1 flag */
 
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;	/* Utility string */
 
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDpixreginfo", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check Grid ID */
-    status = GDchkgdid(gridID, "GDpixreginfo",
-		       &fid, &sdInterfaceID, &gdVgrpID);
+    /* Check for valid grid ID */
+    /* ----------------------- */
+    status = GDchkgdid(gridID, "GDwrrdfield", &fid, &sdInterfaceID, &dum);
 
-    /* Initialize pixreg code to -1 (in case of error) */
-    *pixregcode = -1;
 
     if (status == 0)
     {
-	/* Set default pixreg code */
-	*pixregcode = 0;
+	/* Check that field exists */
+	/* ----------------------- */
+	status = GDfieldinfo(gridID, fieldname, &rankSDS, dims, &dum, NULL);
 
-	/* Get grid name */
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
+
+	if (status != 0)
 	{
-	   free(utlstr);
-	   return -1;
-	}
+	    HEpush(DFE_GENAPP, "GDwrrdfield", __FILE__, __LINE__);
+	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
+	    status = -1;
 
-	Vgetname(GDXGrid[gID].IDTable, gridname);
+	}
 
-	/* Get pointers to grid structure section within SM */
-	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       NULL, metaptrs);
 
-	if(metabuf == NULL)
+	if (status == 0)
 	{
-	    free(utlstr);
-	    return(-1);
-	}
+	    status = GDSDfldsrch(gridID, sdInterfaceID, fieldname, &sdid,
+				 &rankSDS, &rankFld, &mrgOffset, dims, &dum);
 
 
-	statmeta = EHgetmetavalue(metaptrs, "PixelRegistration", utlstr);
+	    /* Set I/O offset Section */
+	    /* ---------------------- */
 
-	if (statmeta == 0)
-	{
 	    /*
-	     * If "PixelRegistration" string found in metadata then convert
-	     * to numeric origin code (fixed added: Jan 97)
+	     * If start == NULL (default) set I/O offset of 0th field to
+	     * offset within merged field (if any) and the rest to 0
 	     */
-
-	    for (i = 0; i < (intn)(sizeof(pixregNames) / sizeof(pixregNames[0])); i++)
+	    if (start == NULL)
 	    {
-		if (strcmp(utlstr, pixregNames[i]) == 0)
+		for (i = 0; i < rankSDS; i++)
 		{
-		    *pixregcode = i;
-		    break;
+		    offset[i] = 0;
+		}
+		offset[0] = mrgOffset;
+	    }
+	    else
+	    {
+		/*
+		 * ... otherwise set I/O offset to user values, adjusting the
+		 * 0th field with the merged field offset (if any)
+		 */
+		if (rankFld == rankSDS)
+		{
+		    for (i = 0; i < rankSDS; i++)
+		    {
+			offset[i] = start[i];
+		    }
+		    offset[0] += mrgOffset;
+		}
+		else
+		{
+		    /*
+		     * If field really 2-dim merged in 3-dim field then set
+		     * 0th field offset to merge offset and then next two to
+		     * the user values
+		     */
+		    for (i = 0; i < rankFld; i++)
+		    {
+			offset[i + 1] = start[i];
+		    }
+		    offset[0] = mrgOffset;
 		}
 	    }
-	}
-	free(metabuf);
-    }
-    free(utlstr);
-    return (status);
-}
 
 
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDcompinfo                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                                                        |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32                                                       |
-|  compcode       int32                                                       |
-|  compparm       intn                                                        |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Oct 96   Joel Gales    Original Programmer                                 |
-|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[])
-{
-    intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-    intn            statmeta = 0;	/* EHgetmetavalue return status */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;/* Utility string */
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDcompinfo", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check Grid ID */
-    status = GDchkgdid(gridID, "GDcompinfo", &fid, &sdInterfaceID, &gdVgrpID);
-
-
-    if (status == 0)
-    {
-	/* Get grid name */
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-		free(utlstr);
-		return -1;
-	}
-	Vgetname(GDXGrid[gID].IDTable, gridname);
-
-	/* Get pointers to "DataField" section within SM */
-	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       "DataField", metaptrs);
-	if(metabuf == NULL)
-	{
-	    free(utlstr);
-	    return(-1);
-	}
-
-
-	/* Search for field */
-	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"\n");
-	metaptrs[0] = strstr(metaptrs[0], utlstr);
-
+	    /* Set I/O stride Section */
+	    /* ---------------------- */
 
-	/* If field found and user wants compression code ... */
-	if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-	{
-	    if (compcode != NULL)
+	    /*
+	     * If stride == NULL (default) set I/O stride to 1
+	     */
+	    if (stride == NULL)
+	    {
+		for (i = 0; i < rankSDS; i++)
+		{
+		    incr[i] = 1;
+		}
+	    }
+	    else
 	    {
-		/* Set endptr at end of field's definition entry */
-		metaptrs[1] = strstr(metaptrs[0], "\t\t\tEND_OBJECT");
-
-		/* Get compression type */
-		statmeta = EHgetmetavalue(metaptrs, "CompressionType", utlstr);
-
 		/*
-		 * Default is no compression if "CompressionType" string not
-		 * in metadata
+		 * ... otherwise set I/O stride to user values
 		 */
-		*compcode = HDFE_COMP_NONE;
-
-		/* If compression code is found ... */
-		if (statmeta == 0)
+		if (rankFld == rankSDS)
 		{
-		    /* Loop through compression types until match */
-		    for (i = 0; i < (intn)(sizeof(HDFcomp) / sizeof(HDFcomp[0])); i++)
+		    for (i = 0; i < rankSDS; i++)
 		    {
-			if (strcmp(utlstr, HDFcomp[i]) == 0)
-			{
-			    *compcode = i;
-			    break;
-			}
+			incr[i] = stride[i];
+		    }
+		}
+		else
+		{
+		    /*
+		     * If field really 2-dim merged in 3-dim field then set
+		     * 0th field stride to 1 and then next two to the user
+		     * values.
+		     */
+		    for (i = 0; i < rankFld; i++)
+		    {
+			incr[i + 1] = stride[i];
 		    }
+		    incr[0] = 1;
 		}
 	    }
 
-	    /* If user wants compression parameters ... */
-	    if (compparm != NULL && compcode != NULL)
+
+
+	    /* Set I/O count Section */
+	    /* --------------------- */
+
+	    /*
+	     * If edge == NULL (default) set I/O count to number of remaining
+	     * entries (dims - start) / increment.  Note that 0th field
+	     * offset corrected for merged field offset (if any).
+	     */
+	    if (edge == NULL)
 	    {
-		/* Initialize to zero */
-		for (i = 0; i < 4; i++)
+		for (i = 1; i < rankSDS; i++)
 		{
-		    compparm[i] = 0;
+		    count[i] = (dims[i] - offset[i]) / incr[i];
 		}
-
+		count[0] = (dims[0] - (offset[0] - mrgOffset)) / incr[0];
+	    }
+	    else
+	    {
 		/*
-		 * Get compression parameters if NBIT or DEFLATE compression
+		 * ... otherwise set I/O count to user values
 		 */
-		if (*compcode == HDFE_COMP_NBIT)
+		if (rankFld == rankSDS)
 		{
-		    statmeta =
-			EHgetmetavalue(metaptrs, "CompressionParams", utlstr);
-		    if (statmeta == 0)
-		    {
-			sscanf(utlstr, "(%d,%d,%d,%d)",
-			       &compparm[0], &compparm[1],
-			       &compparm[2], &compparm[3]);
-		    }
-		    else
+		    for (i = 0; i < rankSDS; i++)
 		    {
-			status = -1;
-			HEpush(DFE_GENAPP, "GDcompinfo", __FILE__, __LINE__);
-			HEreport(
-				 "\"CompressionParams\" string not found in metadata.\n");
+			count[i] = edge[i];
 		    }
 		}
-		else if (*compcode == HDFE_COMP_DEFLATE)
+		else
 		{
-		    statmeta =
-			EHgetmetavalue(metaptrs, "DeflateLevel", utlstr);
-		    if (statmeta == 0)
-		    {
-			sscanf(utlstr, "%d", &compparm[0]);
-		    }
-		    else
+		    /*
+		     * If field really 2-dim merged in 3-dim field then set
+		     * 0th field count to 1 and then next two to the user
+		     * values.
+		     */
+		    for (i = 0; i < rankFld; i++)
 		    {
-			status = -1;
-			HEpush(DFE_GENAPP, "GDcompinfo", __FILE__, __LINE__);
-			HEreport(
-			"\"DeflateLevel\" string not found in metadata.\n");
+			count[i + 1] = edge[i];
 		    }
+		    count[0] = 1;
 		}
 	    }
-	}
-	else
-	{
-	    HEpush(DFE_GENAPP, "GDcompinfo", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" not found.\n", fieldname);
-	}
 
-	free(metabuf);
 
-    }
-    free(utlstr);
-    return (status);
-}
+	    /* Perform I/O with relevant HDF I/O routine */
+	    /* ----------------------------------------- */
+	    if (strcmp(code, "w") == 0)
+	    {
+		/* Set strideOne to true (1) */
+		/* ------------------------- */
+		strideOne = 1;
 
 
+		/* If incr[i] != 1 set strideOne to false (0) */
+		/* ------------------------------------------ */
+		for (i = 0; i < rankSDS; i++)
+		{
+		    if (incr[i] != 1)
+		    {
+			strideOne = 0;
+			break;
+		    }
+		}
 
 
+		/*
+		 * If strideOne is true use NULL parameter for stride. This
+		 * is a work-around to HDF compression problem
+		 */
+		if (strideOne == 1)
+		{
+		    status = SDwritedata(sdid, offset, NULL, count,
+					 (VOIDP) datbuf);
+		}
+		else
+		{
+		    status = SDwritedata(sdid, offset, incr, count,
+					 (VOIDP) datbuf);
+		}
+	    }
+	    else
+	    {
+		status = SDreaddata(sdid, offset, incr, count,
+				    (VOIDP) datbuf);
+	    }
+	}
+    }
+
+    return (status);
+}
 
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDfieldinfo                                                      |
+|  FUNCTION: GDreadfield                                                      |
 |                                                                             |
-|  DESCRIPTION: Retrieve information about a specific geolocation or data     |
-|                field in the grid.                                           |
+|  DESCRIPTION: Reads data from a grid field.                                 |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -2579,19 +2354,16 @@ GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               grid structure id                       |
-|  fieldname      char                name of field                           |
+|  gridID         int32               grid structure ID                       |
+|  fieldname      char                fieldname                               |
+|  start          int32               start array                             |
+|  stride         int32               stride array                            |
+|  edge           int32               edge array                              |
+|  buffer         void                data buffer for read                    |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  rank           int32               rank of field (# of dims)               |
-|  dims           int32               field dimensions                        |
-|  numbertype     int32               field number type                       |
-|  dimlist        char                field dimension list                    |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
+|     None                                                                    |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -2599,192 +2371,30 @@ GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Jan 97   Joel Gales    Check for metadata error status from EHgetmetavalue |
-|  Feb 99   Abe Taaheri   Changed memcpy to memmove to avoid overlapping      |
-|                         problem when copying strings                        |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
-	    int32 * numbertype, char *dimlist)
+GDreadfield(int32 gridID, const char *fieldname,
+	    int32 start[], int32 stride[], int32 edge[], VOIDP buffer)
 
 {
-    intn            i;		    /* Loop index */
-    intn            status;	    /* routine return status variable */
-    intn            statmeta = 0;   /* EHgetmetavalue return status */
-
-    int32           fid;	    /* HDF-EOS file ID */
-    int32           sdInterfaceID;  /* HDF SDS interface ID */
-    int32           idOffset = GDIDOFFSET;  /* Grid ID offset */
-    int32           ndims = 0;	    /* Number of dimensions */
-    int32           slen[8];	    /* Length of each entry in parsed string */
-    int32           dum;	    /* Dummy variable */
-    int32           xdim;	    /* X dim size */
-    int32           ydim;	    /* Y dim size */
-    int32           sdid;	    /* SDS id */
-
-    char           *metabuf;	    /* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];    /* Pointers to begin and end of SM section */
-    char            gridname[80];   /* Grid Name */
-    char           *utlstr;	    /* Utility string */
-    char           *ptr[8];	    /* String pointers for parsed string */
-    char            dimstr[64];	    /* Individual dimension entry string */
-
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDfieldinfo", __FILE__, __LINE__);
-	return(-1);
-    }
-    *rank = -1;
-    *numbertype = -1;
-
-    status = GDchkgdid(gridID, "GDfieldinfo", &fid, &sdInterfaceID, &dum);
-
-    if (status == 0)
-    {
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	    free(utlstr);
-	    return -1;
-    }
-	Vgetname(GDXGrid[gID].IDTable, gridname);
-
-	metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-				       "DataField", metaptrs);
-	if(metabuf == NULL)
-	{
-	    free(utlstr);
-	    return(-1);
-	}
-
-
-	/* Search for field */
-	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"\n");
-	metaptrs[0] = strstr(metaptrs[0], utlstr);
-
-	/* If field found ... */
-	if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-	{
-
-	    /* Set endptr at end of dimension definition entry */
-	    metaptrs[1] = strstr(metaptrs[0], "\t\t\tEND_OBJECT");
-
-	    /* Get DataType string */
-	    statmeta = EHgetmetavalue(metaptrs, "DataType", utlstr);
-
-	    /* Convert to numbertype code */
-	    if (statmeta == 0)
-		*numbertype = EHnumstr(utlstr);
-	    else
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDfieldinfo", __FILE__, __LINE__);
-		HEreport("\"DataType\" string not found in metadata.\n");
-	    }
-
-	    /*
-	     * Get DimList string and trim off leading and trailing parens
-	     * "()"
-	     */
-	    statmeta = EHgetmetavalue(metaptrs, "DimList", utlstr);
-
-	    if (statmeta == 0)
-	    {
-		memmove(utlstr, utlstr + 1, strlen(utlstr) - 2);
-		utlstr[strlen(utlstr) - 2] = 0;
-
-		/* Parse trimmed DimList string and get rank */
-		ndims = EHparsestr(utlstr, ',', ptr, slen);
-		*rank = ndims;
-	    }
-	    else
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDfieldinfo", __FILE__, __LINE__);
-		HEreport("\"DimList\" string not found in metadata.\n");
-	    }
-
-
-	    if (status == 0)
-	    {
-		status = GDgridinfo(gridID, &xdim, &ydim, NULL, NULL);
-
-		for (i = 0; i < ndims; i++)
-		{
-		    memcpy(dimstr, ptr[i] + 1, slen[i] - 2);
-		    dimstr[slen[i] - 2] = 0;
-
-		    if (strcmp(dimstr, "XDim") == 0)
-		    {
-			dims[i] = xdim;
-		    }
-		    else if (strcmp(dimstr, "YDim") == 0)
-		    {
-			dims[i] = ydim;
-		    }
-		    else
-		    {
-			dims[i] = GDdiminfo(gridID, dimstr);
-		    }
-
-
-		    if (dimlist != NULL)
-		    {
-			if (i == 0)
-			{
-			    dimlist[0] = 0;
-			}
-
-			if (i > 0)
-			{
-			    strcat(dimlist, ",");
-			}
-			strcat(dimlist, dimstr);
-		    }
-		}
-
-
-		if (dims[0] == 0)
-		{
-		    status = GDSDfldsrch(gridID, sdInterfaceID, fieldname,
-					 &sdid, &dum, &dum, &dum, dims,
-					 &dum);
-		}
-	    }
-	}
-
-	free(metabuf);
-    }
-
-    if (*rank == -1)
-    {
-	status = -1;
+    intn            status = 0;	/* routine return status variable */
 
-	HEpush(DFE_GENAPP, "GDfieldinfo", __FILE__, __LINE__);
-	HEreport("Fieldname \"%s\" not found.\n", fieldname);
-    }
-    free(utlstr);
+    status = GDwrrdfield(gridID, fieldname, "r", start, stride, edge,
+			 buffer);
     return (status);
 }
 
 
 
 
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdeffield                                                       |
+|  FUNCTION: GDwrrdattr                                                       |
 |                                                                             |
-|  DESCRIPTION: Defines a new data field within the grid.                     |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -2793,14 +2403,14 @@ GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
 |                                                                             |
 |  INPUTS:                                                                    |
 |  gridID         int32               grid structure ID                       |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|  merge          int32               merge code                              |
-|                                                                             |
+|  attrname       char                attribute name                          |
+|  numbertype     int32               attribute HDF numbertype                |
+|  count          int32               Number of attribute elements            |
+|  wrcode         char                Read/Write Code "w/r"                   |
+|  datbuf         void                I/O buffer                              |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  datbuf                                                                     |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -2808,3630 +2418,91 @@ GDfieldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Check name for ODL compliance                       |
-|  Sep 96   Joel Gales    Make string array "dimbuf" dynamic                  |
-|  Sep 96   Joel Gales    Add support for Block SOM (MISR)                    |
-|  Jan 97   Joel Gales    Add support for tiling                              |
-|  Feb 99   Abe Taaheri   Changed strcpy to memmove to avoid overlapping      |
-|                         problem when copying strings                        |
+|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-GDdeffield(int32 gridID, const char *fieldname, const char *dimlist,
-	   int32 numbertype, int32 merge)
+static intn
+GDwrrdattr(int32 gridID, const char *attrname, int32 numbertype, int32 count,
+	   const char *wrcode, VOIDP datbuf)
 
 {
-    intn            i;		/* Loop index */
     intn            status;	/* routine return status variable */
-    intn            found;	/* utility found flag */
-    intn            foundNT = 0;/* found number type flag */
-    intn            foundAllDim = 1;	/* found all dimensions flag */
-    intn            first = 1;	/* first entry flag */
 
     int32           fid;	/* HDF-EOS file ID */
-    int32           vgid;	/* Geo/Data field Vgroup ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           sdid;	/* SDS object ID */
-    int32           dimid;	/* SDS dimension ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           dims[8];	/* Dimension size array */
-    int32           dimsize;	/* Dimension size */
-    int32           rank = 0;	/* Field rank */
-    int32           slen[32];	/* String length array */
+    int32           attrVgrpID;	/* Grid attribute ID */
+    int32           dum;	/* dummy variable */
     int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           compcode;	/* Compression code */
-    int32           tilecode;	/* Tiling code */
-    int32           chunkFlag;	/* Chunking (Tiling) flag */
-    int32           gID;	/* GridID - offset */
-    int32           xdim;	/* Grid X dimension */
-    int32           ydim;	/* Grid Y dimension */
-    int32           projcode;	/* Projection Code */
-
-    float64         projparm[13];	/* Projection Parameters */
-
-    char           *dimbuf;	/* Dimension buffer */
-    char           *dimlist0;	/* Auxiliary dimension list */
-    char           *comma;	/* Pointer to comma */
-    char           *dimcheck;	/* Dimension check buffer */
-    char            utlbuf[512];/* Utility buffer */
-    char            utlbuf2[256];	/* Utility buffer 1 */
-    char           *ptr[32];	/* String pointer array */
-    char            gridname[80];	/* Grid name */
-    char            parmbuf[128];	/* Parameter string buffer */
-    char            errbuf1[128];	/* Error buffer 1 */
-    char            errbuf2[128];	/* Error buffer 2 */
-    static const char errmsg1[] = "Dimension: %d (size: %d) not divisible by ";
-    /* Tiling  error message part 1 */
-    static const char errmsg2[] = "tile dimension (size:  %d).\n";
-    /* Tiling  error message part 2 */
-    char            errmsg[128];/* Tiling error message */
-
-    /* Valid number types */
-    static const uint16 good_number[10] = {
-        3, 4, 5, 6, 20, 21, 22, 23, 24, 25
-    };
-
-    comp_info       c_info;	/* Compression parameter structure */
-
-    HDF_CHUNK_DEF   chunkDef;	/* Tiling structure */
-
-    memset(&c_info, 0, sizeof(c_info));
-    memset(&chunkDef, 0, sizeof(chunkDef));
-
-
-    /* Setup error message strings */
-    /* --------------------------- */
-    strcpy(errbuf1, "GDXSDname array too small.\nPlease increase ");
-    strcat(errbuf1, "size of HDFE_NAMBUFSIZE in \"HdfEosDef.h\".\n");
-    strcpy(errbuf2, "GDXSDdims array too small.\nPlease increase ");
-    strcat(errbuf2, "size of HDFE_DIMBUFSIZE in \"HdfEosDef.h\".\n");
-
-
-    /* Build tiling dimension error message */
-    /* ------------------------------------ */
-    strcpy(errmsg, errmsg1);
-    strcat(errmsg, errmsg2);
-
-    /*
-     * Check for proper grid ID and return HDF-EOS file ID, SDinterface ID,
-     * and grid root Vgroup ID
-     */
-    status = GDchkgdid(gridID, "GDdefinefield",
-		       &fid, &sdInterfaceID, &gdVgrpID);
 
 
+    /* Check Grid id */
+    status = GDchkgdid(gridID, "GDwrrdattr", &fid, &dum, &dum);
+
     if (status == 0)
     {
-	/* Remove offset from grid ID & get gridname */
-	gID = gridID % idOffset;
+	/* Perform Attribute I/O */
+	/* --------------------- */
+	int gID = gridID % idOffset;
 	if (gID >= NGRID)
 	{
-	    return -1;
+		return -1;
 	}
-	Vgetname(GDXGrid[gID].IDTable, gridname);
+	attrVgrpID = GDXGrid[gID].VIDTable[1];
+	status = EHattr(fid, attrVgrpID, attrname, numbertype, count,
+			wrcode, datbuf);
+    }
+    return (status);
+}
 
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: GDreadattr                                                       |
+|                                                                             |
+|  DESCRIPTION: Reads attribute from a grid.                                  |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  gridID         int32               grid structure ID                       |
+|  attrname       char                attribute name                          |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  datbuf         void                I/O buffer                              |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+intn
+GDreadattr(int32 gridID, const char *attrname, VOIDP datbuf)
+{
+    intn            status = 0;	/* routine return status variable */
+    int32           dum = 0;	/* dummy variable */
 
-	/* Allocate space for dimension buffer and auxiliary dimension list */
-	/* ---------------------------------------------------------------- */
-	dimbuf = (char *) calloc(strlen(dimlist) + 64, 1);
-	if(dimbuf == NULL)
-	{
-	    HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
-	    return(-1);
-	}
-	dimlist0 = (char *) calloc(strlen(dimlist) + 64, 1);
-	if(dimlist0 == NULL)
-	{
-	    HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
-	    free(dimbuf);
-	    return(-1);
-	}
-
-
-	/* Get Grid and Projection info */
-	/* ---------------------------- */
-	status = GDgridinfo(gridID, &xdim, &ydim, NULL, NULL);
-	status = GDprojinfo(gridID, &projcode, NULL, NULL, projparm);
-
-
-	/* Setup Block Dimension if "Blocked" SOM projection */
-	/* ------------------------------------------------- */
-	if (projcode == GCTP_SOM && (int32) projparm[11] != 0)
-	{
-	    dimsize = GDdiminfo(gridID, "SOMBlockDim");
-
-	    /* If "SOMBlockDim" not yet defined then do it */
-	    if (dimsize == -1)
-	    {
-		GDdefdim(gridID, "SOMBlockDim", (int32) projparm[11]);
-	    }
-
-	    /* If not 1D field then prepend to dimension list */
-	    if (strchr(dimlist, ',') != NULL)
-	    {
-		strcpy(dimbuf, "SOMBlockDim,");
-		strcat(dimbuf, dimlist);
-	    }
-	    else
-	    {
-		strcpy(dimbuf, dimlist);
-	    }
-	}
-	else
-	{
-	    /* If not "Blocked" SOM then just copy dim list to dim buffer */
-	    strcpy(dimbuf, dimlist);
-	}
-
-	/*
-	 * Copy dimension buffer to auxiliary dimlist and append a comma to
-	 * end of dimension list.
-	 */
-	strcpy(dimlist0, dimbuf);
-	strcat(dimbuf, ",");
-
-
-	/* Find comma */
-	/* ---------- */
-	comma = strchr(dimbuf, ',');
-
-
-	/*
-	 * Loop through entries in dimension list to make sure they are
-	 * defined in grid
-	 */
-	while (comma != NULL)
-	{
-	    /* Copy dimension list entry to dimcheck */
-	    /* ------------------------------------- */
-	    dimcheck = (char *) calloc(comma - dimbuf + 1, 1);
-	    if(dimcheck == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
-		free(dimbuf);
-		free(dimlist0);
-		return(-1);
-	    }
-	    memcpy(dimcheck, dimbuf, comma - dimbuf);
-
-
-	    /* Get Dimension Size */
-	    /* ------------------ */
-	    if (strcmp(dimcheck, "XDim") == 0)
-	    {
-		/* If "XDim" then use xdim value for grid definition */
-		/* ------------------------------------------------- */
-		dimsize = xdim;
-		found = 1;
-		dims[rank] = dimsize;
-		rank++;
-	    }
-	    else if (strcmp(dimcheck, "YDim") == 0)
-	    {
-		/* If "YDim" then use ydim value for grid definition */
-		/* ------------------------------------------------- */
-		dimsize = ydim;
-		found = 1;
-		dims[rank] = dimsize;
-		rank++;
-	    }
-	    else
-	    {
-		/* "Regular" Dimension */
-		/* ------------------- */
-		dimsize = GDdiminfo(gridID, dimcheck);
-		if (dimsize != -1)
-		{
-		    found = 1;
-		    dims[rank] = dimsize;
-		    rank++;
-		}
-		else
-		{
-		    found = 0;
-		}
-	    }
-
-
-	    /*
-	     * If dimension list entry not found - set error return status,
-	     * append name to utility buffer for error report
-	     */
-	    if (found == 0)
-	    {
-		status = -1;
-		foundAllDim = 0;
-		if (first == 1)
-		{
-		    snprintf(utlbuf, sizeof(utlbuf), "%s", dimcheck);
-		}
-		else
-		{
-		    char utlbufTmp[sizeof(utlbuf)];
-		    strcpy(utlbufTmp, utlbuf);
-		    CPLsnprintf(utlbuf, sizeof(utlbuf), "%s,%s", utlbufTmp, dimcheck);
-		}
-		first = 0;
-	    }
-
-	    /*
-	     * Go to next dimension entry, find next comma, & free up
-	     * dimcheck buffer
-	     */
-	    memmove(dimbuf, comma + 1, strlen(comma)-1);
-	    dimbuf[strlen(comma)-1]= 0;
-	    comma = strchr(dimbuf, ',');
-	    free(dimcheck);
-	}
-	free(dimbuf);
-
-	/* Check fieldname length */
-	/* ---------------------- */
-	if (status == 0)
-	{
-/* if ((intn) strlen(fieldname) > MAX_NC_NAME - 7)
-** this was changed because HDF4.1r3 made a change in the
-** hlimits.h file.  We have notified NCSA and asked to have
-** it made the same as in previous versions of HDF
-** see ncr 26314.  DaW  Apr 2000
-*/
-            if((intn) strlen(fieldname) > (256 - 7))
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDdefinefield", __FILE__, __LINE__);
-		HEreport("Fieldname \"%s\" too long.\n", fieldname);
-	    }
-	}
-
-	/* Check for valid numbertype */
-	/* -------------------------- */
-	if (status == 0)
-	{
-	    for (i = 0; i < 10; i++)
-	    {
-		if (numbertype == good_number[i])
-		{
-		    foundNT = 1;
-		    break;
-		}
-	    }
-
-	    if (foundNT == 0)
-	    {
-		HEpush(DFE_BADNUMTYPE, "GDdeffield", __FILE__, __LINE__);
-		HEreport("Invalid number type: %d (%s).\n",
-			 numbertype, fieldname);
-		status = -1;
-	    }
-	}
-
-
-	/* Define Field */
-	/* ------------ */
-	if (status == 0)
-	{
-	    /* Get Field Vgroup id, compression code, & tiling code */
-	    /* -------------------------------------------------- */
-	    vgid = GDXGrid[gID].VIDTable[0];
-	    compcode = GDXGrid[gID].compcode;
-	    tilecode = GDXGrid[gID].tilecode;
-
-
-	    /* SDS Interface (Multi-dim fields) */
-	    /* -------------------------------- */
-
-
-	    /*
-	     * If rank is less than or equal to 3 (and greater than 1) and
-	     * AUTOMERGE is set and the first dimension is not appendable and
-	     * the compression code is set to none then ...
-	     */
-	    if (rank >= 2 && rank <= 3 && merge == HDFE_AUTOMERGE &&
-		dims[0] != 0 && compcode == HDFE_COMP_NONE &&
-		tilecode == HDFE_NOTILE)
-	    {
-
-		/* Find first empty slot in external combination array */
-		/* --------------------------------------------------- */
-		i = 0;
-		while (GDXSDcomb[5 * i] != 0)
-		{
-		    i++;
-		}
-
-		/*
-		 * Store dimensions, grid root Vgroup ID, and number type in
-		 * external combination array "GDXSDcomb"
-		 */
-		if (rank == 2)
-		{
-		    /* If 2-dim field then set lowest dimension to 1 */
-		    /* --------------------------------------------- */
-		    GDXSDcomb[5 * i] = 1;
-		    GDXSDcomb[5 * i + 1] = dims[0];
-		    GDXSDcomb[5 * i + 2] = dims[1];
-		}
-		else
-		{
-		    GDXSDcomb[5 * i] = dims[0];
-		    GDXSDcomb[5 * i + 1] = dims[1];
-		    GDXSDcomb[5 * i + 2] = dims[2];
-		}
-
-		GDXSDcomb[5 * i + 3] = gdVgrpID;
-		GDXSDcomb[5 * i + 4] = numbertype;
-
-
-		/* Concatenate fieldname with combined name string */
-		/* ----------------------------------------------- */
-		if ((intn) strlen(GDXSDname) +
-		    (intn) strlen(fieldname) + 2 < HDFE_NAMBUFSIZE)
-		{
-		    strcat(GDXSDname, fieldname);
-		    strcat(GDXSDname, ",");
-		}
-		else
-		{
-		    /* GDXSDname array too small! */
-		    /* -------------------------- */
-		    HEpush(DFE_GENAPP, "GDdefinefield",
-			   __FILE__, __LINE__);
-		    HEreport(errbuf1);
-		    status = -1;
-		    free(dimlist0);
-		    return (status);
-		}
-
-
-		/*
-		 * If 2-dim field then set lowest dimension (in 3-dim array)
-		 * to "ONE"
-		 */
-		if (rank == 2)
-		{
-		    if ((intn) strlen(GDXSDdims) + 5 < HDFE_DIMBUFSIZE)
-		    {
-			strcat(GDXSDdims, "ONE,");
-		    }
-		    else
-		    {
-			/* GDXSDdims array too small! */
-			/* -------------------------- */
-			HEpush(DFE_GENAPP, "GDdefinefield",
-			       __FILE__, __LINE__);
-			HEreport(errbuf2);
-			status = -1;
-			free(dimlist0);
-			return (status);
-		    }
-		}
-
-
-		/*
-		 * Concatanate field dimlist to merged dimlist and separate
-		 * fields with semi-colon.
-		 */
-		if ((intn) strlen(GDXSDdims) +
-		    (intn) strlen(dimlist0) + 2 < HDFE_DIMBUFSIZE)
-		{
-		    strcat(GDXSDdims, dimlist0);
-		    strcat(GDXSDdims, ";");
-		}
-		else
-		{
-		    /* GDXSDdims array too small! */
-		    /* -------------------------- */
-		    HEpush(DFE_GENAPP, "GDdefinefield",
-			   __FILE__, __LINE__);
-		    HEreport(errbuf2);
-		    status = -1;
-		    free(dimlist0);
-		    return (status);
-		}
-
-	    }			/* End Multi-Dim Merge Section */
-	    else
-	    {
-
-		/* Multi-Dim No Merge Section */
-		/* ========================== */
-
-
-		/* Check that field dims are divisible by tile dims */
-		/* ------------------------------------------------ */
-		if (tilecode == HDFE_TILE)
-		{
-		    for (i = 0; i < GDXGrid[gID].tilerank; i++)
-		    {
-			if ((dims[i] % GDXGrid[gID].tiledims[i]) != 0)
-			{
-			    HEpush(DFE_GENAPP, "GDdeffield",
-				   __FILE__, __LINE__);
-			    HEreport(errmsg,
-				     i, dims[i], GDXGrid[gID].tiledims[0]);
-			    status = -1;
-			}
-		    }
-
-		    if (status == -1)
-		    {
-			free(dimlist0);
-			return (status);
-		    }
-		}
-
-
-		/* Create SDS dataset */
-		/* ------------------ */
-		sdid = SDcreate(sdInterfaceID, fieldname,
-				numbertype, rank, dims);
-
-
-		/* Store Dimension Names in SDS */
-		/* ---------------------------- */
-		rank = EHparsestr(dimlist0, ',', ptr, slen);
-		for (i = 0; i < rank; i++)
-		{
-		    /* Dimension name = Swathname:Dimname */
-		    /* ---------------------------------- */
-		    memcpy(utlbuf, ptr[i], slen[i]);
-		    utlbuf[slen[i]] = 0;
-		    strcat(utlbuf, ":");
-		    strcat(utlbuf, gridname);
-
-		    dimid = SDgetdimid(sdid, i);
-		    SDsetdimname(dimid, utlbuf);
-		}
-
-
-		/* Setup Compression */
-		/* ----------------- */
-		if (compcode == HDFE_COMP_NBIT)
-		{
-		    c_info.nbit.nt = numbertype;
-		    c_info.nbit.sign_ext = GDXGrid[gID].compparm[0];
-		    c_info.nbit.fill_one = GDXGrid[gID].compparm[1];
-		    c_info.nbit.start_bit = GDXGrid[gID].compparm[2];
-		    c_info.nbit.bit_len = GDXGrid[gID].compparm[3];
-		}
-		else if (compcode == HDFE_COMP_SKPHUFF)
-		{
-		    c_info.skphuff.skp_size = (intn) DFKNTsize(numbertype);
-		}
-		else if (compcode == HDFE_COMP_DEFLATE)
-		{
-		    c_info.deflate.level = GDXGrid[gID].compparm[0];
-		}
-
-
-		/* If field is compressed w/o tiling then call SDsetcompress */
-		/* --------------------------------------------------------- */
-		if (compcode != HDFE_COMP_NONE && tilecode == HDFE_NOTILE)
-		{
-                    /* status = */ SDsetcompress(sdid, (comp_coder_t) compcode, &c_info);
-		}
-
-
-		/* Setup Tiling */
-		/* ------------ */
-		if (tilecode == HDFE_TILE)
-		{
-		    /* Tiling without Compression */
-		    /* -------------------------- */
-		    if (compcode == HDFE_COMP_NONE)
-		    {
-
-			/* Setup chunk lengths */
-			/* ------------------- */
-			for (i = 0; i < GDXGrid[gID].tilerank; i++)
-			{
-			    chunkDef.chunk_lengths[i] =
-				GDXGrid[gID].tiledims[i];
-			}
-
-			chunkFlag = HDF_CHUNK;
-		    }
-
-		    /* Tiling with Compression */
-		    /* ----------------------- */
-		    else
-		    {
-			/* Setup chunk lengths */
-			/* ------------------- */
-			for (i = 0; i < GDXGrid[gID].tilerank; i++)
-			{
-			    chunkDef.comp.chunk_lengths[i] =
-				GDXGrid[gID].tiledims[i];
-			}
-
-
-			/* Setup chunk flag & chunk compression type */
-			/* ----------------------------------------- */
-			chunkFlag = HDF_CHUNK | HDF_COMP;
-			chunkDef.comp.comp_type = compcode;
-
-
-			/* Setup chunk compression parameters */
-			/* ---------------------------------- */
-			if (compcode == HDFE_COMP_SKPHUFF)
-			{
-			    chunkDef.comp.cinfo.skphuff.skp_size =
-				c_info.skphuff.skp_size;
-			}
-			else if (compcode == HDFE_COMP_DEFLATE)
-			{
-			    chunkDef.comp.cinfo.deflate.level =
-				c_info.deflate.level;
-			}
-		    }
-
-		    /* Call SDsetchunk routine */
-		    /* ----------------------- */
-		    /* status = */ SDsetchunk(sdid, chunkDef, chunkFlag);
-		}
-
-
-		/* Attach to Vgroup */
-		/* ---------------- */
-		Vaddtagref(vgid, DFTAG_NDG, SDidtoref(sdid));
-
-
-		/* Store SDS dataset IDs */
-		/* --------------------- */
-
-		/* Allocate space for the SDS ID array */
-		/* ----------------------------------- */
-		if (GDXGrid[gID].nSDS > 0)
-		{
-		    /* Array already exists therefore reallocate */
-		    /* ----------------------------------------- */
-		    GDXGrid[gID].sdsID = (int32 *)
-			realloc((void *) GDXGrid[gID].sdsID,
-				(GDXGrid[gID].nSDS + 1) * 4);
-		    if(GDXGrid[gID].sdsID == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
-			free(dimlist0);
-			return(-1);
-		    }
-		}
-		else
-		{
-		    /* Array does not exist */
-		    /* -------------------- */
-		    GDXGrid[gID].sdsID = (int32 *) calloc(1, 4);
-		    if(GDXGrid[gID].sdsID == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"GDdeffield", __FILE__, __LINE__);
-			free(dimlist0);
-			return(-1);
-		    }
-		}
-
-		/* Store SDS ID in array & increment count */
-		/* --------------------------------------- */
-		GDXGrid[gID].sdsID[GDXGrid[gID].nSDS] = sdid;
-		GDXGrid[gID].nSDS++;
-
-	    }
-
-
-	    /* Setup metadata string */
-	    /* --------------------- */
-	    snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist0);
-
-
-	    /* Setup compression metadata */
-	    /* -------------------------- */
-	    if (compcode != HDFE_COMP_NONE)
-	    {
-		snprintf(utlbuf2, sizeof(utlbuf2),
-			"%s%s",
-			":\n\t\t\t\tCompressionType=", HDFcomp[compcode]);
-
-		switch (compcode)
-		{
-		case HDFE_COMP_NBIT:
-
-		    snprintf(parmbuf, sizeof(parmbuf),
-			    "%s%d,%d,%d,%d%s",
-			    "\n\t\t\t\tCompressionParams=(",
-			    GDXGrid[gID].compparm[0],
-			    GDXGrid[gID].compparm[1],
-			    GDXGrid[gID].compparm[2],
-			    GDXGrid[gID].compparm[3], ")");
-		    strcat(utlbuf2, parmbuf);
-		    break;
-
-
-		case HDFE_COMP_DEFLATE:
-
-		    snprintf(parmbuf, sizeof(parmbuf),
-			    "%s%d",
-			    "\n\t\t\t\tDeflateLevel=",
-			    GDXGrid[gID].compparm[0]);
-		    strcat(utlbuf2, parmbuf);
-		    break;
-		}
-		strcat(utlbuf, utlbuf2);
-	    }
-
-
-
-
-	    /* Setup tiling metadata */
-	    /* --------------------- */
-	    if (tilecode == HDFE_TILE)
-	    {
-		if (compcode == HDFE_COMP_NONE)
-		{
-		    snprintf(utlbuf2, sizeof(utlbuf2), "%s%d",
-			    ":\n\t\t\t\tTilingDimensions=(",
-			    (int)GDXGrid[gID].tiledims[0]);
-		}
-		else
-		{
-		    snprintf(utlbuf2, sizeof(utlbuf2), "%s%d",
-			    "\n\t\t\t\tTilingDimensions=(",
-			    (int)GDXGrid[gID].tiledims[0]);
-		}
-
-		for (i = 1; i < GDXGrid[gID].tilerank; i++)
-		{
-		    snprintf(parmbuf, sizeof(parmbuf), ",%d", (int)GDXGrid[gID].tiledims[i]);
-		    strcat(utlbuf2, parmbuf);
-		}
-		strcat(utlbuf2, ")");
-		strcat(utlbuf, utlbuf2);
-	    }
-
-
-	    /* Insert field metadata within File Structural Metadata */
-	    /* ----------------------------------------------------- */
-	    status = EHinsertmeta(sdInterfaceID, gridname, "g", 4L,
-				  utlbuf, &numbertype);
-
-	}
-	free(dimlist0);
-
-    }
-
-    /* If all dimensions not found then report error */
-    /* --------------------------------------------- */
-    if (foundAllDim == 0)
-    {
-	HEpush(DFE_GENAPP, "GDdeffield", __FILE__, __LINE__);
-	HEreport("Dimension(s): \"%s\" not found (%s).\n",
-		 utlbuf, fieldname);
-	status = -1;
-    }
-
-    return (status);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDwritefieldmeta                                                 |
-|                                                                             |
-|  DESCRIPTION: Writes field meta data for an existing grid field not         |
-|               defined within the grid API routine "GDdeffield".             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDwritefieldmeta(int32 gridID, const char *fieldname, const char *dimlist,
-		 int32 numbertype)
-{
-    intn            status = 0;	/* routine return status variable */
-
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           dum;	/* dummy variable */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-
-    char            utlbuf[256];/* Utility buffer */
-    char            gridname[80];	/* Grid name */
-
-
-    status = GDchkgdid(gridID, "GDwritefieldmeta", &dum, &sdInterfaceID,
-		       &dum);
-
-    if (status == 0)
-    {
-	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
-
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	   return -1;
-	}
-
-	Vgetname(GDXGrid[gID].IDTable, gridname);
-	int32 numbertypeArray[1] = { numbertype };
-	status = EHinsertmeta(sdInterfaceID, gridname, "g", 4L,
-			      utlbuf, numbertypeArray);
-    }
-    return (status);
-}
-#endif
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDSDfldsrch                                                      |
-|                                                                             |
-|  DESCRIPTION: Retrieves information from SDS fields                         |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  sdInterfaceID  int32               SD interface ID                         |
-|  fieldname      char                field name                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  sdid           int32               SD element ID                           |
-|  rankSDS        int32               Rank of SDS                             |
-|  rankFld        int32               True rank of field (merging)            |
-|  offset         int32               Offset of field within merged field     |
-|  dims           int32               Dimensions of field                     |
-|  solo           int32               Solo field flag                         |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-GDSDfldsrch(int32 gridID, int32 sdInterfaceID, const char *fieldname,
-            int32 * sdid, int32 * rankSDS, int32 * rankFld, int32 * offset,
-            int32 dims[], int32 * solo)
-{
-    intn            i;		/* Loop index */
-    intn            status = -1;/* routine return status variable */
-
-    int32           gID;	/* GridID - offset */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           dum;	/* Dummy variable */
-    int32           dums[128];	/* Dummy array */
-    int32           attrIndex;	/* Attribute l_index */
-
-    char            name[2048];	/* Merged-Field Names */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;/* Utility string */
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-#ifdef broken_logic
-    char           *oldmetaptr;	/* Pointer within SM section */
-    char           *metaptr;	/* Pointer within SM section */
-#endif
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDSDfldsrch", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Set solo flag to 0 (no) */
-    /* ----------------------- */
-    *solo = 0;
-
-
-    /* Compute "reduced" grid ID */
-    /* ------------------------- */
-    gID = gridID % idOffset;
-    if (gID >= NGRID)
-    {
-        free(utlstr);
-        return -1;
-    }
-
-    /* Loop through all SDSs in grid */
-    /* ----------------------------- */
-    for (i = 0; i < GDXGrid[gID].nSDS; i++)
-    {
-	/* If active SDS ... */
-	/* ----------------- */
-	if (GDXGrid[gID].sdsID[i] != 0)
-	{
-	    /* Get SDS ID, name, rankSDS, and dimensions */
-	    /* ----------------------------------------- */
-	    *sdid = GDXGrid[gID].sdsID[i];
-	    SDgetinfo(*sdid, name, rankSDS, dims, &dum, &dum);
-	    *rankFld = *rankSDS;
-
-
-	    /* If merged field ... */
-	    /* ------------------- */
-	    if (strstr(name, "MRGFLD_") == &name[0])
-	    {
-		/* Get grid name */
-		/* ------------- */
-		Vgetname(GDXGrid[gID].IDTable, gridname);
-
-
-		/* Get pointers to "MergedFields" section within SM */
-		/* ------------------------------------------------ */
-		metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-					       "MergedFields", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-
-#ifdef broken_logic
-		/* Initialize metaptr to beg. of section */
-		/* ------------------------------------- */
-		metaptr = metaptrs[0];
-
-
-		/* Store metaptr in order to recover */
-		/* --------------------------------- */
-		oldmetaptr = metaptr;
-
-
-		/* Search for Merged field name */
-		/* ---------------------------- */
-		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "MergedFieldName=\"",
-			name, "\"\n");
-		metaptr = strstr(metaptr, utlstr);
-
-
-		/* If not found check for old metadata */
-		/* ----------------------------------- */
-		if (metaptr == NULL)
-		{
-		    snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "OBJECT=\"", name, "\"\n");
-		    metaptr = strstr(oldmetaptr, utlstr);
-		}
-#endif
-
-		/* Get field list and strip off leading and trailing quotes */
-		/* -------------------------------------------------------- */
-		EHgetmetavalue(metaptrs, "FieldList", name);
-		memmove(name, name + 1, strlen(name) - 2);
-		name[strlen(name) - 2] = 0;
-
-
-		/* Search for desired field within merged field list */
-		/* ------------------------------------------------- */
-		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"");
-		dum = EHstrwithin(utlstr, name, ',');
-
-		free(metabuf);
-	    }
-	    else
-	    {
-		/* If solo (unmerged) check if SDS name matches fieldname */
-		/* ------------------------------------------------------ */
-		dum = EHstrwithin(fieldname, name, ',');
-		if (dum != -1)
-		{
-		    *solo = 1;
-		    *offset = 0;
-		}
-	    }
-
-
-
-	    /* If field found ... */
-	    /* ------------------ */
-	    if (dum != -1)
-	    {
-		status = 0;
-
-		/* If merged field ... */
-		/* ------------------- */
-		if (*solo == 0)
-		{
-		    /* Get "Field Offsets" SDS attribute l_index */
-		    /* --------------------------------------- */
-		    attrIndex = SDfindattr(*sdid, "Field Offsets");
-
-		    /*
-		     * If attribute exists then get offset of desired field
-		     * within merged field
-		     */
-		    if (attrIndex != -1)
-		    {
-			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
-			*offset = dums[dum];
-		    }
-
-
-		    /* Get "Field Dims" SDS attribute l_index */
-		    /* ------------------------------------ */
-		    attrIndex = SDfindattr(*sdid, "Field Dims");
-
-		    /*
-		     * If attribute exists then get 0th dimension of desired
-		     * field within merged field
-		     */
-		    if (attrIndex != -1)
-		    {
-			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
-			dims[0] = dums[dum];
-
-			/* If this dimension = 1 then field is really 2 dim */
-			/* ------------------------------------------------ */
-			if (dums[dum] == 1)
-			{
-			    *rankFld = 2;
-			}
-		    }
-		}
-
-
-		/* Break out of SDS loop */
-		/* --------------------- */
-		break;
-	    }			/* End of found field section */
-	}
-	else
-	{
-	    /* First non-active SDS signifies no more, break out of SDS loop */
-	    /* ------------------------------------------------------------- */
-	    break;
-	}
-    }
-    free(utlstr);
-    return (status);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDwrrdfield                                                      |
-|                                                                             |
-|  DESCRIPTION: Writes/Reads fields                                           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                fieldname                               |
-|  code           char                Write/Read code (w/r)                   |
-|  start          int32               start array                             |
-|  stride         int32               stride array                            |
-|  edge           int32               edge array                              |
-|  datbuf         void                data buffer for read                    |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  datbuf         void                data buffer for write                   |
-|                                                                             |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Feb 97   Joel Gales    Stride = 1 HDF compression workaround               |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-GDwrrdfield(int32 gridID, const char *fieldname, const char *code,
-	    int32 start[], int32 stride[], int32 edge[], VOIDP datbuf)
-
-{
-    intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           sdid;	/* SDS ID */
-    int32           dum;	/* Dummy variable */
-    int32           rankSDS;	/* Rank of SDS */
-    int32           rankFld;	/* Rank of field */
-
-    int32           offset[8];	/* I/O offset (start) */
-    int32           incr[8];	/* I/O increment (stride) */
-    int32           count[8];	/* I/O count (edge) */
-    int32           dims[8];	/* Field/SDS dimensions */
-    int32           mrgOffset;	/* Merged field offset */
-    int32           strideOne;	/* Strides = 1 flag */
-
-
-    /* Check for valid grid ID */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDwrrdfield", &fid, &sdInterfaceID, &dum);
-
-
-    if (status == 0)
-    {
-	/* Check that field exists */
-	/* ----------------------- */
-	status = GDfieldinfo(gridID, fieldname, &rankSDS, dims, &dum, NULL);
-
-
-	if (status != 0)
-	{
-	    HEpush(DFE_GENAPP, "GDwrrdfield", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-	    status = -1;
-
-	}
-
-
-	if (status == 0)
-	{
-	    status = GDSDfldsrch(gridID, sdInterfaceID, fieldname, &sdid,
-				 &rankSDS, &rankFld, &mrgOffset, dims, &dum);
-
-
-	    /* Set I/O offset Section */
-	    /* ---------------------- */
-
-	    /*
-	     * If start == NULL (default) set I/O offset of 0th field to
-	     * offset within merged field (if any) and the rest to 0
-	     */
-	    if (start == NULL)
-	    {
-		for (i = 0; i < rankSDS; i++)
-		{
-		    offset[i] = 0;
-		}
-		offset[0] = mrgOffset;
-	    }
-	    else
-	    {
-		/*
-		 * ... otherwise set I/O offset to user values, adjusting the
-		 * 0th field with the merged field offset (if any)
-		 */
-		if (rankFld == rankSDS)
-		{
-		    for (i = 0; i < rankSDS; i++)
-		    {
-			offset[i] = start[i];
-		    }
-		    offset[0] += mrgOffset;
-		}
-		else
-		{
-		    /*
-		     * If field really 2-dim merged in 3-dim field then set
-		     * 0th field offset to merge offset and then next two to
-		     * the user values
-		     */
-		    for (i = 0; i < rankFld; i++)
-		    {
-			offset[i + 1] = start[i];
-		    }
-		    offset[0] = mrgOffset;
-		}
-	    }
-
-
-
-	    /* Set I/O stride Section */
-	    /* ---------------------- */
-
-	    /*
-	     * If stride == NULL (default) set I/O stride to 1
-	     */
-	    if (stride == NULL)
-	    {
-		for (i = 0; i < rankSDS; i++)
-		{
-		    incr[i] = 1;
-		}
-	    }
-	    else
-	    {
-		/*
-		 * ... otherwise set I/O stride to user values
-		 */
-		if (rankFld == rankSDS)
-		{
-		    for (i = 0; i < rankSDS; i++)
-		    {
-			incr[i] = stride[i];
-		    }
-		}
-		else
-		{
-		    /*
-		     * If field really 2-dim merged in 3-dim field then set
-		     * 0th field stride to 1 and then next two to the user
-		     * values.
-		     */
-		    for (i = 0; i < rankFld; i++)
-		    {
-			incr[i + 1] = stride[i];
-		    }
-		    incr[0] = 1;
-		}
-	    }
-
-
-
-	    /* Set I/O count Section */
-	    /* --------------------- */
-
-	    /*
-	     * If edge == NULL (default) set I/O count to number of remaining
-	     * entries (dims - start) / increment.  Note that 0th field
-	     * offset corrected for merged field offset (if any).
-	     */
-	    if (edge == NULL)
-	    {
-		for (i = 1; i < rankSDS; i++)
-		{
-		    count[i] = (dims[i] - offset[i]) / incr[i];
-		}
-		count[0] = (dims[0] - (offset[0] - mrgOffset)) / incr[0];
-	    }
-	    else
-	    {
-		/*
-		 * ... otherwise set I/O count to user values
-		 */
-		if (rankFld == rankSDS)
-		{
-		    for (i = 0; i < rankSDS; i++)
-		    {
-			count[i] = edge[i];
-		    }
-		}
-		else
-		{
-		    /*
-		     * If field really 2-dim merged in 3-dim field then set
-		     * 0th field count to 1 and then next two to the user
-		     * values.
-		     */
-		    for (i = 0; i < rankFld; i++)
-		    {
-			count[i + 1] = edge[i];
-		    }
-		    count[0] = 1;
-		}
-	    }
-
-
-	    /* Perform I/O with relevant HDF I/O routine */
-	    /* ----------------------------------------- */
-	    if (strcmp(code, "w") == 0)
-	    {
-		/* Set strideOne to true (1) */
-		/* ------------------------- */
-		strideOne = 1;
-
-
-		/* If incr[i] != 1 set strideOne to false (0) */
-		/* ------------------------------------------ */
-		for (i = 0; i < rankSDS; i++)
-		{
-		    if (incr[i] != 1)
-		    {
-			strideOne = 0;
-			break;
-		    }
-		}
-
-
-		/*
-		 * If strideOne is true use NULL parameter for stride. This
-		 * is a work-around to HDF compression problem
-		 */
-		if (strideOne == 1)
-		{
-		    status = SDwritedata(sdid, offset, NULL, count,
-					 (VOIDP) datbuf);
-		}
-		else
-		{
-		    status = SDwritedata(sdid, offset, incr, count,
-					 (VOIDP) datbuf);
-		}
-	    }
-	    else
-	    {
-		status = SDreaddata(sdid, offset, incr, count,
-				    (VOIDP) datbuf);
-	    }
-	}
-    }
-
-    return (status);
-}
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDwritefield                                                     |
-|                                                                             |
-|  DESCRIPTION: Writes data to a grid field.                                  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                fieldname                               |
-|  start          int32               start array                             |
-|  stride         int32               stride array                            |
-|  edge           int32               edge array                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  data           void                data buffer for write                   |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDwritefield(int32 gridID, const char *fieldname,
-	     int32 start[], int32 stride[], int32 edge[], VOIDP data)
-
-{
-    intn            status = 0;	/* routine return status variable */
-
-    status = GDwrrdfield(gridID, fieldname, "w", start, stride, edge,
-			 data);
-    return (status);
-}
-#endif
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDreadfield                                                      |
-|                                                                             |
-|  DESCRIPTION: Reads data from a grid field.                                 |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                fieldname                               |
-|  start          int32               start array                             |
-|  stride         int32               stride array                            |
-|  edge           int32               edge array                              |
-|  buffer         void                data buffer for read                    |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|     None                                                                    |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDreadfield(int32 gridID, const char *fieldname,
-	    int32 start[], int32 stride[], int32 edge[], VOIDP buffer)
-
-{
-    intn            status = 0;	/* routine return status variable */
-
-    status = GDwrrdfield(gridID, fieldname, "r", start, stride, edge,
-			 buffer);
-    return (status);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDwrrdattr                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  attrname       char                attribute name                          |
-|  numbertype     int32               attribute HDF numbertype                |
-|  count          int32               Number of attribute elements            |
-|  wrcode         char                Read/Write Code "w/r"                   |
-|  datbuf         void                I/O buffer                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  datbuf                                                                     |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-GDwrrdattr(int32 gridID, const char *attrname, int32 numbertype, int32 count,
-	   const char *wrcode, VOIDP datbuf)
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           attrVgrpID;	/* Grid attribute ID */
-    int32           dum;	/* dummy variable */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-
-
-    /* Check Grid id */
-    status = GDchkgdid(gridID, "GDwrrdattr", &fid, &dum, &dum);
-
-    if (status == 0)
-    {
-	/* Perform Attribute I/O */
-	/* --------------------- */
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-		return -1;
-	}
-	attrVgrpID = GDXGrid[gID].VIDTable[1];
-	status = EHattr(fid, attrVgrpID, attrname, numbertype, count,
-			wrcode, datbuf);
-    }
-    return (status);
-}
-
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDwriteattr                                                      |
-|                                                                             |
-|  DESCRIPTION: Writes/updates attribute in a grid.                           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  attrname       char                attribute name                          |
-|  numbertype     int32               attribute HDF numbertype                |
-|  count          int32               Number of attribute elements            |
-|  datbuf         void                I/O buffer                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDwriteattr(int32 gridID, const char *attrname, int32 numbertype, int32 count,
-	    VOIDP datbuf)
-{
-    intn            status = 0;	/* routine return status variable */
-
-    /* Call GDwrrdattr routine to write attribute */
-    /* ------------------------------------------ */
-    status = GDwrrdattr(gridID, attrname, numbertype, count, "w", datbuf);
-
-    return (status);
-}
-#endif
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDreadattr                                                       |
-|                                                                             |
-|  DESCRIPTION: Reads attribute from a grid.                                  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  attrname       char                attribute name                          |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  datbuf         void                I/O buffer                              |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDreadattr(int32 gridID, const char *attrname, VOIDP datbuf)
-{
-    intn            status = 0;	/* routine return status variable */
-    int32           dum = 0;	/* dummy variable */
-
-    /* Call GDwrrdattr routine to read attribute */
-    /* ----------------------------------------- */
-    status = GDwrrdattr(gridID, attrname, dum, dum, "r", datbuf);
-
-    return (status);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDattrinfo                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  attrname       char                attribute name                          |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  numbertype     int32               attribute HDF numbertype                |
-|  count          int32               Number of attribute elements            |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDattrinfo(int32 gridID, const char *attrname, int32 * numbertype, int32 * count)
-{
-    intn            status = 0;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           attrVgrpID;	/* Grid attribute ID */
-    int32           dum;	/* dummy variable */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-
-    status = GDchkgdid(gridID, "GDattrinfo", &fid, &dum, &dum);
-
-    int gID = gridID % idOffset;
-    if (gID >= NGRID)
-    {
-        return -1;
-    }
-    attrVgrpID = GDXGrid[gID].VIDTable[1];
-
-    status = EHattrinfo(fid, attrVgrpID, attrname, numbertype,
-			count);
-
-    return (status);
-}
-
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDinqattrs                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nattr          int32               Number of attributes in swath struct    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  grid ID        int32               grid structure ID                       |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  attrnames      char                Attribute names in swath struct         |
-|                                     (Comma-separated list)                  |
-|  strbufsize     int32               Attributes name list string length      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Initialize nattr                                    |
-|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDinqattrs(int32 gridID, char *attrnames, int32 * strbufsize)
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           attrVgrpID;	/* Grid attribute ID */
-    int32           dum;	/* dummy variable */
-    int32           nattr = 0;	/* Number of attributes */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-
-
-    /* Check Grid id */
-    status = GDchkgdid(gridID, "GDinqattrs", &fid, &dum, &dum);
-
-    if (status == 0)
-    {
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	    return -1;
-    }
-	attrVgrpID = GDXGrid[gID].VIDTable[1];
-	nattr = EHattrcat(fid, attrVgrpID, attrnames, strbufsize);
-    }
-
-    return (nattr);
-}
-
-
-
-
-
-
-#define REMQUOTE(x) do { \
-    char* l_x = x; \
-    const size_t l_x_len = strlen(l_x); \
-    if (l_x_len >= 2 && l_x[0] == '"' && l_x[l_x_len - 1] == '"') {\
-        memmove(l_x, l_x + 1, l_x_len - 2); \
-        l_x[l_x_len - 2] = 0; \
-    } \
-  } while(0)
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDinqdims                                                        |
-|                                                                             |
-|  DESCRIPTION: Retrieve information about all dimensions defined in a grid.  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nDim           int32               Number of defined dimensions            |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  dimnames       char                Dimension names (comma-separated)       |
-|  dims           int32               Dimension values                        |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nDim to -1 if status = -1                       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDinqdims(int32 gridID, char *dimnames, int32 dims[])
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           size;	/* Dimension size */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           nDim = 0;	/* Number of dimensions */
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;/* Utility string */
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDinqdims", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check for valid grid id */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDinqdims", &fid, &sdInterfaceID, &gdVgrpID);
-
-    if (status == 0)
-    {
-	/* If dimension names or sizes are requested */
-	/* ----------------------------------------- */
-	if (dimnames != NULL || dims != NULL)
-	{
-	    /* Get grid name */
-	    /* ------------- */
-	    int gID = gridID % idOffset;
-	    if (gID >= NGRID)
-	    {
-	       free(utlstr);
-	       return -1;
-	    }
-	    Vgetname(GDXGrid[gID].IDTable, gridname);
-
-
-	    /* Get pointers to "Dimension" section within SM */
-	    /* --------------------------------------------- */
-	    metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-					   "Dimension", metaptrs);
-	    if(metabuf == NULL)
-	    {
-		free(utlstr);
-		return(-1);
-	    }
-
-
-	    /* If dimension names are requested then "clear" name buffer */
-	    /* --------------------------------------------------------- */
-	    if (dimnames != NULL)
-	    {
-		dimnames[0] = 0;
-	    }
-
-	    while (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-	    {
-		strcpy(utlstr, "\t\tOBJECT=");
-		metaptrs[0] = strstr(metaptrs[0], utlstr);
-		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-		{
-		    /* Get Dimension Name */
-		    /* ------------------ */
-		    if (dimnames != NULL)
-		    {
-			/* Check 1st for old meta data then new */
-			/* ------------------------------------ */
-			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
-			if (utlstr[0] != '"')
-			{
-			    metaptrs[0] =
-				strstr(metaptrs[0], "\t\t\t\tDimensionName=");
-			    EHgetmetavalue(metaptrs, "DimensionName", utlstr);
-			}
-
-			/* Strip off double quotes */
-			/* ----------------------- */
-			memmove(utlstr, utlstr + 1, strlen(utlstr) - 2);
-			utlstr[strlen(utlstr) - 2] = 0;
-
-			if (nDim > 0)
-			{
-			    strcat(dimnames, ",");
-			}
-			strcat(dimnames, utlstr);
-		    }
-
-		    /* Get Dimension Size */
-		    /* ------------------ */
-		    if (dims != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "Size", utlstr);
-			size = atoi(utlstr);
-			dims[nDim] = size;
-		    }
-		    nDim++;
-		}
-	    }
-	    free(metabuf);
-
-	}
-    }
-
-
-    /* Set nDim to -1 if error status exists */
-    /* ------------------------------------- */
-    if (status == -1)
-    {
-	nDim = -1;
-    }
-    free(utlstr);
-    return (nDim);
-}
-
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDinqfields                                                      |
-|                                                                             |
-|  DESCRIPTION: Retrieve information about all data fields defined in a grid. |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nFld           int32               Number of fields in swath               |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  fieldlist      char                Field names (comma-separated)           |
-|  rank           int32               Array of ranks                          |
-|  numbertype     int32               Array of HDF number types               |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nFld to -1 if status = -1                       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDinqfields(int32 gridID, char *fieldlist, int32 rank[],
-	    int32 numbertype[])
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           nFld = 0;	/* Number of mappings */
-    int32           slen[8];	/* String length array */
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;/* Utility string */
-    char           *ptr[8];	/* String pointer array */
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDinqfields", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check for valid grid id */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDinqfields", &fid, &sdInterfaceID, &gdVgrpID);
-    if (status == 0)
-    {
-
-	/* If field names, ranks,  or number types desired ... */
-	/* --------------------------------------------------- */
-	if (fieldlist != NULL || rank != NULL || numbertype != NULL)
-	{
-	    /* Get grid name */
-	    /* ------------- */
-	    int gID = gridID % idOffset;
-	    if (gID >= NGRID)
-	    {
-	       free(utlstr);
-	       return -1;
-	    }
-	    Vgetname(GDXGrid[gID].IDTable, gridname);
-
-
-	    /* Get pointers to "DataField" section within SM */
-	    /* --------------------------------------------- */
-	    metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-					   "DataField", metaptrs);
-	    if(metabuf == NULL)
-	    {
-		free(utlstr);
-		return(-1);
-	    }
-
-
-	    /* If field names are desired then "clear" name buffer */
-	    /* --------------------------------------------------- */
-	    if (fieldlist != NULL)
-	    {
-		fieldlist[0] = 0;
-	    }
-
-
-	    /* Begin loop through mapping entries in metadata */
-	    /* ---------------------------------------------- */
-	    while (1)
-	    {
-		/* Search for OBJECT string */
-		/* ------------------------ */
-		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
-
-
-		/* If found within "Data" Field metadata section .. */
-		/* ------------------------------------------------ */
-		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-		{
-		    /* Get Fieldnames (if desired) */
-		    /* --------------------------- */
-		    if (fieldlist != NULL)
-		    {
-			/* Check 1st for old meta data then new */
-			/* ------------------------------------ */
-			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
-
-			/*
-			 * If OBJECT value begins with double quote then old
-			 * metadata, field name is OBJECT value. Otherwise
-			 * search for "DataFieldName" string
-			 */
-
-			if (utlstr[0] != '"')
-			{
-			    strcpy(utlstr, "\t\t\t\t");
-			    strcat(utlstr, "DataFieldName");
-			    strcat(utlstr, "=");
-			    metaptrs[0] = strstr(metaptrs[0], utlstr);
-			    EHgetmetavalue(metaptrs, "DataFieldName", utlstr);
-			}
-
-			/* Strip off double quotes */
-			/* ----------------------- */
-			REMQUOTE(utlstr);
-
-
-			/* Add to fieldlist */
-			/* ---------------- */
-			    if (nFld > 0)
-			{
-			    strcat(fieldlist, ",");
-			}
-			strcat(fieldlist, utlstr);
-
-		    }
-		    /* Get Numbertype */
-		    if (numbertype != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "DataType", utlstr);
-			numbertype[nFld] = EHnumstr(utlstr);
-		    }
-		    /*
-		     * Get Rank (if desired) by counting # of dimensions in
-		     * "DimList" string
-		     */
-		    if (rank != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "DimList", utlstr);
-			rank[nFld] = EHparsestr(utlstr, ',', ptr, slen);
-		    }
-		    /* Increment number of fields */
-		    nFld++;
-		}
-		else
-		    /* No more fields found */
-		{
-		    break;
-		}
-	    }
-	    free(metabuf);
-	}
-    }
-
-    /* Set nFld to -1 if error status exists */
-    /* ------------------------------------- */
-    if (status == -1)
-    {
-	nFld = -1;
-    }
-    free(utlstr);
-    return (nFld);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDnentries                                                       |
-|                                                                             |
-|  DESCRIPTION: Returns number of entries and descriptive string buffer       |
-|                size for a specified entity.                                 |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nEntries       int32               Number of entries                       |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  entrycode      int32               Entry code                              |
-|	                              HDFE_NENTDIM  (0)                       |
-|	                              HDFE_NENTDFLD (4)                       |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  strbufsize     int32               Length of comma-separated list          |
-|                                     (Does not include null-terminator       |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nEntries to -1 if status = -1                   |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
-
-{
-    intn            status;	/* routine return status variable */
-    intn            i;		/* Loop index */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           nEntries = 0;	/* Number of entries */
-    int32           metaflag;	/* Old (0), New (1) metadata flag) */
-    int32           nVal = 0;	/* Number of strings to search for */
-
-    char           *metabuf = NULL;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2] = {NULL, NULL};/* Pointers to begin and end of SM section */
-    char            gridname[80];	/* Grid Name */
-    char           *utlstr;/* Utility string */
-    char            valName[2][32];	/* Strings to search for */
-
-    memset(valName, 0, sizeof(valName));
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDnentries", __FILE__, __LINE__);
-	return(-1);
-    }
-    status = GDchkgdid(gridID, "GDnentries", &fid, &sdInterfaceID, &gdVgrpID);
-
-    if (status == 0)
-    {
-	/* Get grid name */
-	int gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	   free(utlstr);
-	   return -1;
-	}
-
-	Vgetname(GDXGrid[gID].IDTable, gridname);
-
-	/* Zero out string buffer size */
-	*strbufsize = 0;
-
-
-	/*
-	 * Get pointer to  relevant section within SM and Get names of
-	 * metadata strings to inquire about
-	 */
-	switch (entrycode)
-	{
-	case HDFE_NENTDIM:
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-					       "Dimension", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-
-		nVal = 1;
-		strcpy(&valName[0][0], "DimensionName");
-	    }
-	    break;
-
-	case HDFE_NENTDFLD:
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
-					       "DataField", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-
-		nVal = 1;
-		strcpy(&valName[0][0], "DataFieldName");
-	    }
-	    break;
-	}
-
-	if (!metabuf || metaptrs[0] == NULL)
-    {
-        free(metabuf);
-        return -1;
-    }
-
-	/*
-	 * Check for presence of 'GROUP="' string If found then old metadata,
-	 * search on OBJECT string
-	 */
-	metaflag = (strstr(metabuf, "GROUP=\"") == NULL) ? 1 : 0;
-	if (metaflag == 0)
-	{
-	    nVal = 1;
-	    strcpy(&valName[0][0], "\t\tOBJECT");
-	}
-
-
-	/* Begin loop through entries in metadata */
-	/* -------------------------------------- */
-	while (1)
-	{
-	    /* Search for first string */
-	    strcpy(utlstr, &valName[0][0]);
-	    strcat(utlstr, "=");
-	    metaptrs[0] = strstr(metaptrs[0], utlstr);
-
-	    /* If found within relevant metadata section ... */
-	    if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-	    {
-		for (i = 0; i < nVal; i++)
-		{
-		    /*
-		     * Get all string values Don't count quotes
-		     */
-		    EHgetmetavalue(metaptrs, &valName[i][0], utlstr);
-		    *strbufsize += (int32)strlen(utlstr) - 2;
-		}
-		/* Increment number of entries */
-		nEntries++;
-
-		/* Go to end of OBJECT */
-		metaptrs[0] = strstr(metaptrs[0], "END_OBJECT");
-	    }
-	    else
-		/* No more entries found */
-	    {
-		break;
-	    }
-	}
-	free(metabuf);
-
-
-	/* Count comma separators & slashes (if mappings) */
-	/* ---------------------------------------------- */
-	if (nEntries > 0)
-	{
-	    *strbufsize += nEntries - 1;
-	    *strbufsize += (nVal - 1) * nEntries;
-	}
-    }
-
-
-    /* Set nEntries to -1 if error status exists */
-    /* ----------------------------------------- */
-    if (status == -1)
-    {
-	nEntries = -1;
-    }
-
-    free(utlstr);
-    return (nEntries);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDinqgrid                                                        |
-|                                                                             |
-|  DESCRIPTION: Returns number and names of grid structures in file           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nGrid          int32               Number of grid structures in file       |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  filename       char                HDF-EOS filename                        |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  gridlist       char                List of grid names (comma-separated)    |
-|  strbufsize     int32               Length of gridlist                      |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDinqgrid(const char *filename, char *gridlist, int32 * strbufsize)
-{
-    int32           nGrid;	/* Number of grid structures in file */
-
-    /* Call "EHinquire" routine */
-    /* ------------------------ */
-    nGrid = EHinquire(filename, "GRID", gridlist, strbufsize);
-
-    return (nGrid);
-}
-
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDsetfillvalue                                                   |
-|                                                                             |
-|  DESCRIPTION: Sets fill value for the specified field.                      |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                field name                              |
-|  fillval        void                fill value                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDsetfillvalue(int32 gridID, const char *fieldname, VOIDP fillval)
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           sdid;	/* SDS id */
-    int32           nt;		/* Number type */
-    int32           dims[8];	/* Dimensions array */
-    int32           dum;	/* Dummy variable */
-    int32           solo;	/* "Solo" (non-merged) field flag */
-
-    char            name[80];	/* Fill value "attribute" name */
-
-    /* Check for valid grid ID and get SDS interface ID */
-    status = GDchkgdid(gridID, "GDsetfillvalue",
-		       &fid, &sdInterfaceID, &gdVgrpID);
-
-    if (status == 0)
-    {
-	/* Get field info */
-	status = GDfieldinfo(gridID, fieldname, &dum, dims, &nt, NULL);
-
-	if (status == 0)
-	{
-	    /* Get SDS ID and solo flag */
-	    status = GDSDfldsrch(gridID, sdInterfaceID, fieldname,
-				 &sdid, &dum, &dum, &dum,
-				 dims, &solo);
-
-	    /* If unmerged field then call HDF set field routine */
-	    if (solo == 1)
-	    {
-                /* status = */ SDsetfillvalue(sdid, fillval);
-	    }
-
-	    /*
-	     * Store fill value in attribute.  Name is given by fieldname
-	     * prepended with "_FV_"
-	     */
-	    strcpy(name, "_FV_");
-	    strcat(name, fieldname);
-	    status = GDwriteattr(gridID, name, nt, 1, fillval);
-
-
-	}
-	else
-	{
-	    HEpush(DFE_GENAPP, "GDsetfillvalue", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-	}
-    }
-    return (status);
-}
-#endif
-
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDgetfillvalue                                                   |
-|                                                                             |
-|  DESCRIPTION: Retrieves fill value for a specified field.                   |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                field name                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  fillval        void                fill value                              |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDgetfillvalue(int32 gridID, const char *fieldname, VOIDP fillval)
-{
-    intn            status;	/* routine return status variable */
-
-    int32           nt;		/* Number type */
-    int32           dims[8];	/* Dimensions array */
-    int32           dum;	/* Dummy variable */
-
-    char            name[80];	/* Fill value "attribute" name */
-
-    status = GDchkgdid(gridID, "GDgetfillvalue", &dum, &dum, &dum);
-
-    /* Check for valid grid ID */
-    if (status == 0)
-    {
-	/* Get field info */
-	status = GDfieldinfo(gridID, fieldname, &dum, dims, &nt, NULL);
-
-	if (status == 0)
-	{
-	    /* Read fill value attribute */
-	    strcpy(name, "_FV_");
-	    strcat(name, fieldname);
-	    status = GDreadattr(gridID, name, fillval);
-	}
-	else
-	{
-	    HEpush(DFE_GENAPP, "GDgetfillvalue", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-	}
-
-    }
-    return (status);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDdetach                                                         |
-|                                                                             |
-|  DESCRIPTION: Detaches from grid interface and performs file housekeeping.  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Sep 96   Joel Gales    Setup dim names for SDsetdimname in dimbuf1 rather  |
-|                         that utlstr                                         |
-|  Oct 96   Joel Gales    Detach Grid Vgroups                                 |
-|  Oct 96   Joel Gales    "Detach" from SDS                                   |
-|  Nov 96   Joel Gales    Call GDchkgdid to check for proper grid ID          |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting garbage collection |
-|  Oct 98   Abe Taaheri   Added GDXRegion[k]->DimNamePtr[i] =0; after freeing |
-|                         memory                                              |
-|  Sep 99   Abe Taaheri   Changed memcpy to memmove because of overlapping    |
-|                         source and destination for GDXSDcomb, nameptr, and  |
-|                         dimptr. memcpy may cause unexpected results.        |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDdetach(int32 gridID)
-
-{
-    intn            i;		/* Loop index */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    intn            j;		/* Loop index */
-#endif
-    intn            k;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    intn            statusFill = 0;	/* return status from GDgetfillvalue */
-#endif
-
-    int32          *namelen = NULL;	/* Pointer to name string length array */
-    int32          *dimlen = NULL;	/* Pointer to dim string length array */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    int32           slen1[3];	/* String length array 1 */
-    int32           slen2[3];	/* String length array 2 */
-    int32           nflds;	/* Number of fields */
-    int32           match[5];	/* Merged field match array */
-    int32           cmbfldcnt;	/* Number of fields combined */
-    int32           sdid;	/* SDS ID */
-    int32           vgid;	/* Vgroup ID */
-    int32           dims[3];	/* Dimension array */
-#endif
-    int32          *offset = NULL;	/* Pointer to merged field offset array */
-    int32          *indvdims = NULL;	/* Pointer to merged field size array */
-    int32           sdInterfaceID;	/* SDS interface ID */
-    int32           gID;	/* Grid ID - offset */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    int32           nflds0;	/* Number of fields */
-#endif
-    int32          *namelen0 = NULL;	/* Pointer to name string length array */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    int32           rank;	/* Rank of merged field */
-    int32           truerank;	/* True rank of merged field */
-#endif
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    int32           dum;	/* Dummy variable */
-
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    char           *nambuf;	/* Pointer to name buffer */
-#endif
-    char          **nameptr = NULL;	/* Pointer to name string pointer array */
-    char          **dimptr = NULL;	/* Pointer to dim string pointer array */
-    char          **nameptr0 = NULL;	/* Pointer to name string pointer array */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    char           *ptr1[3];	/* String pointer array */
-    char           *ptr2[3];	/* String pointer array */
-    char            dimbuf1[128];	/* Dimension buffer 1 */
-    char            dimbuf2[128];	/* Dimension buffer 2 */
-#endif
-    char            gridname[VGNAMELENMAX + 1];	/* Grid name */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-    char           *utlbuf;	/* Utility buffer */
-    char            fillval[32];/* Fill value buffer */
-#endif
-
-
-    status = GDchkgdid(gridID, "GDdetach", &dum, &sdInterfaceID, &dum);
-
-    if (status == 0)
-    {
-	gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	   return -1;
-	}
-	Vgetname(GDXGrid[gID].IDTable, gridname);
-
-	/* SDS combined fields */
-	/* ------------------- */
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-	if (strlen(GDXSDname) == 0)
-#endif
-	{
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-	    nflds = 0;
-#endif
-
-	    /* Allocate "dummy" arrays so free() doesn't bomb later */
-	    /* ---------------------------------------------------- */
-	    nameptr = (char **) calloc(1, sizeof(char *));
-	    if(nameptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		return(-1);
-	    }
-	    namelen = (int32 *) calloc(1, sizeof(int32));
-	    if(namelen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		return(-1);
-	    }
-	    nameptr0 = (char **) calloc(1, sizeof(char *));
-	    if(nameptr0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		return(-1);
-	    }
-	    namelen0 = (int32 *) calloc(1, sizeof(int32));
-	    if(namelen0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		return(-1);
-	    }
-	    dimptr = (char **) calloc(1, sizeof(char *));
-	    if(dimptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		return(-1);
-	    }
-	    dimlen = (int32 *) calloc(1, sizeof(int32));
-	    if(dimlen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		return(-1);
-	    }
-	    offset = (int32 *) calloc(1, sizeof(int32));
-	    if(offset == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		return(-1);
-	    }
-	    indvdims = (int32 *) calloc(1, sizeof(int32));
-	    if(indvdims == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		free(offset);
-		return(-1);
-	    }
-	}
-#if defined(HDFEOS_GD_WRITE_SUPPORT)
-	else
-	{
-	    /*
-	     * "Trim Off" trailing "," and ";" in GDXSDname & GDXSDdims
-	     * respectively
-	     */
-	    GDXSDname[strlen(GDXSDname) - 1] = 0;
-	    GDXSDdims[strlen(GDXSDdims) - 1] = 0;
-
-
-	    /* Get number of fields from GDXSDname string */
-	    /* ------------------------------------------ */
-	    nflds = EHparsestr(GDXSDname, ',', NULL, NULL);
-
-	    /* Allocate space for various dynamic arrays */
-	    /* ----------------------------------------- */
-	    nameptr = (char **) calloc(nflds, sizeof(char *));
-	    if(nameptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		return(-1);
-	    }
-	    namelen = (int32 *) calloc(nflds, sizeof(int32));
-	    if(namelen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		return(-1);
-	    }
-	    nameptr0 = (char **) calloc(nflds, sizeof(char *));
-	    if(nameptr0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		return(-1);
-	    }
-	    namelen0 = (int32 *) calloc(nflds, sizeof(int32));
-	    if(namelen0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		return(-1);
-	    }
-	    dimptr = (char **) calloc(nflds, sizeof(char *));
-	    if(dimptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		return(-1);
-	    }
-	    dimlen = (int32 *) calloc(nflds, sizeof(int32));
-	    if(dimlen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		return(-1);
-	    }
-	    offset = (int32 *) calloc(nflds, sizeof(int32));
-	    if(offset == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		return(-1);
-	    }
-	    indvdims = (int32 *) calloc(nflds, sizeof(int32));
-	    if(indvdims == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		free(offset);
-		return(-1);
-	    }
-
-	    /* Parse GDXSDname and GDXSDdims strings */
-	    /* ------------------------------------- */
-	    nflds = EHparsestr(GDXSDname, ',', nameptr, namelen);
-	    nflds = EHparsestr(GDXSDdims, ';', dimptr, dimlen);
-	}
-
-	for (i = 0; i < nflds; i++)
-	{
-	    if (GDXSDcomb[5 * i] != 0 &&
-		GDXSDcomb[5 * i + 3] == GDXGrid[gID].IDTable)
-	    {
-		nambuf = (char *) calloc(strlen(GDXSDname) + 1, 1);
-		if(nambuf == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		    free(nameptr);
-		    free(namelen);
-		    free(nameptr0);
-		    free(namelen0);
-		    free(dimptr);
-		    free(dimlen);
-		    free(offset);
-		    free(indvdims);
-		    return(-1);
-		}
-		utlbuf = (char *) calloc(strlen(GDXSDname) * 2 + 7, 1);
-		if(utlbuf == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"GDdetach", __FILE__, __LINE__);
-		    free(nambuf);
-		    free(nameptr);
-		    free(namelen);
-		    free(nameptr0);
-		    free(namelen0);
-		    free(dimptr);
-		    free(dimlen);
-		    free(offset);
-		    free(indvdims);
-		    return(-1);
-		}
-
-		for (k = 0; k < (intn)sizeof(dimbuf1); k++)
-		    dimbuf1[k] = 0;
-
-
-		/* Load array to match, name & parse dims */
-		/* -------------------------------------- */
-		memcpy(match, &GDXSDcomb[5 * i], 20);
-		memcpy(nambuf, nameptr[i], namelen[i]);
-
-		memcpy(dimbuf1, dimptr[i], dimlen[i]);
-		dum = EHparsestr(dimbuf1, ',', ptr1, slen1);
-
-
-		/* Separate combined dimension from others */
-		/* --------------------------------------- */
-		dimbuf1[slen1[0]] = 0;
-
-		offset[0] = 0;
-		indvdims[0] = abs(match[0]);
-
-		for (j = i + 1, cmbfldcnt = 0; j < nflds; j++)
-		{
-		    for (k = 0; k < (intn)sizeof(dimbuf2); k++)
-			dimbuf2[k] = 0;
-		    memcpy(dimbuf2, dimptr[j], dimlen[j]);
-		    dum = EHparsestr(dimbuf2, ',', ptr2, slen2);
-		    dimbuf2[slen2[0]] = 0;
-
-
-		    if (GDXSDcomb[5 * j] != 0 &&
-			strcmp(dimbuf1 + slen1[0],
-			       dimbuf2 + slen2[0]) == 0 &&
-			match[1] == GDXSDcomb[5 * j + 1] &&
-			match[2] == GDXSDcomb[5 * j + 2] &&
-			match[3] == GDXSDcomb[5 * j + 3] &&
-			match[4] == GDXSDcomb[5 * j + 4])
-		    {
-			/* Add to combined dimension size */
-			match[0] += GDXSDcomb[5 * j];
-
-			/* Concatenate name */
-			strcat(nambuf, ",");
-			memcpy(nambuf + strlen(nambuf),
-			       nameptr[j], namelen[j]);
-
-			/* Store individual dims and dim offsets */
-			cmbfldcnt++;
-			indvdims[cmbfldcnt] = abs(GDXSDcomb[5 * j]);
-			offset[cmbfldcnt] =
-			    offset[cmbfldcnt - 1] + indvdims[cmbfldcnt - 1];
-
-			GDXSDcomb[5 * j] = 0;
-		    }
-		}
-
-
-		/* Create SDS */
-		/* ---------- */
-		nflds0 = EHparsestr(nambuf, ',', nameptr0, namelen0);
-
-		if (abs(match[0]) == 1)
-		{
-		    for (k = 0; k < 2; k++)
-			dims[k] = abs(match[k + 1]);
-
-		    rank = 2;
-
-		    sdid = SDcreate(sdInterfaceID, nambuf,
-				    GDXSDcomb[5 * i + 4], 2, dims);
-		}
-		else
-		{
-		    for (k = 0; k < 3; k++)
-			dims[k] = abs(match[k]);
-
-		    rank = 3;
-
-		    if (cmbfldcnt > 0)
-		    {
-			strcpy(utlbuf, "MRGFLD_");
-			memcpy(utlbuf + 7, nameptr0[0], namelen0[0]);
-			utlbuf[7 + namelen0[0]] = 0;
-			strcat(utlbuf, ":");
-			strcat(utlbuf, nambuf);
-
-			status = EHinsertmeta(sdInterfaceID, gridname, "g",
-					      6L, utlbuf, NULL);
-		    }
-		    else
-		    {
-			strcpy(utlbuf, nambuf);
-		    }
-
-		    sdid = SDcreate(sdInterfaceID, utlbuf,
-				    GDXSDcomb[5 * i + 4], 3, dims);
-
-
-		    if (cmbfldcnt > 0)
-		    {
-			SDsetattr(sdid, "Field Dims", DFNT_INT32,
-				  cmbfldcnt + 1, (VOIDP) indvdims);
-
-			SDsetattr(sdid, "Field Offsets", DFNT_INT32,
-				  cmbfldcnt + 1, (VOIDP) offset);
-		    }
-
-		}
-
-
-
-		/* Register Dimensions in SDS */
-		/* -------------------------- */
-		for (k = 0; k < rank; k++)
-		{
-		    if (rank == 2)
-		    {
-			memcpy(dimbuf2, ptr1[k + 1], slen1[k + 1]);
-			dimbuf2[slen1[k + 1]] = 0;
-		    }
-		    else
-		    {
-			memcpy(dimbuf2, ptr1[k], slen1[k]);
-			dimbuf2[slen1[k]] = 0;
-		    }
-
-
-		    if (k == 0 && rank > 2 && cmbfldcnt > 0)
-		    {
-			snprintf(dimbuf2, sizeof(dimbuf2), "%s%s_%d", "MRGDIM:",
-				gridname, (int)dims[0]);
-		    }
-		    else
-		    {
-			strcat(dimbuf2, ":");
-			strcat(dimbuf2, gridname);
-		    }
-		    SDsetdimname(SDgetdimid(sdid, k), (char *) dimbuf2);
-		}
-
-
-
-		/* Write Fill Value */
-		/* ---------------- */
-		for (k = 0; k < nflds0; k++)
-		{
-		    memcpy(utlbuf, nameptr0[k], namelen0[k]);
-		    utlbuf[namelen[k]] = 0;
-		    statusFill = GDgetfillvalue(gridID, utlbuf, fillval);
-
-		    if (statusFill == 0)
-		    {
-			if (cmbfldcnt > 0)
-			{
-			    dims[0] = indvdims[k];
-			    truerank = (dims[0] == 1) ? 2 : 3;
-			    EHfillfld(sdid, rank, truerank,
-				      DFKNTsize(match[4]), offset[k],
-				      dims, fillval);
-			}
-			else
-			{
-			    status = SDsetfillvalue(sdid, fillval);
-			}
-		    }
-		}
-
-
-		vgid = GDXGrid[gID].VIDTable[0];
-		Vaddtagref(vgid, DFTAG_NDG, SDidtoref(sdid));
-		SDendaccess(sdid);
-
-		free(nambuf);
-		free(utlbuf);
-
-	    }
-	}
-
-
-	for (i = 0; i < nflds; i++)
-	{
-	    if (GDXSDcomb[5 * i + 3] == GDXGrid[gID].IDTable)
-	    {
-		if (i == (nflds - 1))
-		{
-		    GDXSDcomb[5 * i] = 0;
-		    *(nameptr[i] - (nflds != 1)) = 0;
-		    *(dimptr[i] - (nflds != 1)) = 0;
-		}
-		else
-		{
-		    /* memcpy(&GDXSDcomb[5 * i],
-			   &GDXSDcomb[5 * (i + 1)],
-			   (512 - i - 1) * 5 * 4);*/
-		    memmove(&GDXSDcomb[5 * i],
-			   &GDXSDcomb[5 * (i + 1)],
-			   (512 - i - 1) * 5 * 4);
-		   /* memcpy(nameptr[i],
-			   nameptr[i + 1],
-			   nameptr[0] + 2048 - nameptr[i + 1] - 1);*/
-		    memmove(nameptr[i],
-			   nameptr[i + 1],
-			   nameptr[0] + 2048 - nameptr[i + 1] - 1);
-		    /* memcpy(dimptr[i],
-			   dimptr[i + 1],
-			   dimptr[0] + 2048 * 2 - dimptr[i + 1] - 1);*/
-		    memmove(dimptr[i],
-			   dimptr[i + 1],
-			   dimptr[0] + 2048 * 2 - dimptr[i + 1] - 1);
-		}
-
-		i--;
-		nflds = EHparsestr(GDXSDname, ',', nameptr, namelen);
-		nflds = EHparsestr(GDXSDdims, ';', dimptr, dimlen);
-	    }
-	}
-
-	if (nflds != 0)
-	{
-	    strcat(GDXSDname, ",");
-	    strcat(GDXSDdims, ";");
-	}
-#endif
-
-
-	/* Free up a bunch of dynamically allocated arrays */
-	/* ----------------------------------------------- */
-	free(nameptr);
-	free(namelen);
-	free(nameptr0);
-	free(namelen0);
-	free(dimptr);
-	free(dimlen);
-	free(offset);
-	free(indvdims);
-
-
-
-	/* "Detach" from previously attached SDSs */
-	/* -------------------------------------- */
-	for (k = 0; k < GDXGrid[gID].nSDS; k++)
-	{
-	    SDendaccess(GDXGrid[gID].sdsID[k]);
-	}
-	free(GDXGrid[gID].sdsID);
-	GDXGrid[gID].sdsID = 0;
-	GDXGrid[gID].nSDS = 0;
-
-
-
-	/* Detach Grid Vgroups */
-	/* ------------------- */
-	Vdetach(GDXGrid[gID].VIDTable[0]);
-	Vdetach(GDXGrid[gID].VIDTable[1]);
-	Vdetach(GDXGrid[gID].IDTable);
-
-	GDXGrid[gID].active = 0;
-	GDXGrid[gID].VIDTable[0] = 0;
-	GDXGrid[gID].VIDTable[1] = 0;
-	GDXGrid[gID].IDTable = 0;
-	GDXGrid[gID].fid = 0;
-
-
-
-
-	/* Free Region Pointers */
-	/* -------------------- */
-	for (k = 0; k < NGRIDREGN; k++)
-	{
-	    if (GDXRegion[k] != 0 &&
-		GDXRegion[k]->gridID == gridID)
-	    {
-		for (i = 0; i < 8; i++)
-		{
-		    if (GDXRegion[k]->DimNamePtr[i] != 0)
-		    {
-			free(GDXRegion[k]->DimNamePtr[i]);
-			GDXRegion[k]->DimNamePtr[i] = 0;
-		    }
-		}
-
-		free(GDXRegion[k]);
-		GDXRegion[k] = 0;
-	    }
-	}
-    }
-    return (status);
-}
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDclose                                                          |
-|                                                                             |
-|  DESCRIPTION: Closes file.                                                  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  fid            int32               File ID                                 |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDclose(int32 fid)
-
-{
-    intn            status = 0;	/* routine return status variable */
-
-    /* Call EHclose to perform file close */
-    /* ---------------------------------- */
-    status = EHclose(fid);
-
-    return (status);
-}
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDgetdefaults                                                    |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  projcode       int32               GCTP projection code                    |
-|  zonecode       int32               UTM zone code                           |
-|  projparm       float64             Projection parameters                   |
-|  spherecode     int32               GCTP spheriod code                      |
-|  upleftpt       float64             upper left corner coordinates           |
-|  lowrightpt     float64             lower right corner coordinates          |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  upleftpt       float64             upper left corner coordinates           |
-|  lowrightpt     float64             lower right corner coordinates          |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Aug 96   Joel Gales    Original Programmer                                 |
-|  Sep 96   Raj Gejjaga   Fixed  bugs in Polar Stereographic and Goode        | |                         Homolosine default calculations.                    |
-|  Sep 96   Raj Gejjaga   Added code to compute default boundary points       |
-|                         for Lambert Azimuthal Polar and Equatorial          |
-|                         projections.                                        |
-|  Feb 97   Raj Gejjaga   Added code to compute default boundary points       |
-|                         for Integerized Sinusoidal Grid.  Added error       |
-|                         handling code.                                      |
-|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
-	      int32 spherecode, float64 upleftpt[], float64 lowrightpt[])
-{
-    int32           errorcode = 0, status = 0;
-    int32(*for_trans[100]) (double, double, double*, double*);
-
-    float64         lon, lat, plat, x, y;
-    float64         plon, tlon, llon, rlon, pplon, LLon, LLat, RLon, RLat;
-
-
-    /* invoke GCTP initialization routine */
-    /* ---------------------------------- */
-    for_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
-	     &errorcode, for_trans);
-
-    /* Report error if any */
-    /* ------------------- */
-    if (errorcode != 0)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	HEreport("GCTP Error: %d\n", errorcode);
-	return (status);
-    }
-
-    /* Compute Default Boundary Points for EASE Grid          */
-    /* Use Global coverage */
-    /* ------------------------------------------------------ */
-    if (projcode == GCTP_BCEA &&
-	upleftpt[0] == 0 && upleftpt[1] == 0 &&
-	lowrightpt[0] == 0 && lowrightpt[1] == 0)
-    {
-	upleftpt[0] = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LON, HDFE_DEG_DMS);
-	upleftpt[1] = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LAT, HDFE_DEG_DMS);
-	lowrightpt[0] = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LON, HDFE_DEG_DMS);
-	lowrightpt[1] = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LAT, HDFE_DEG_DMS);
-    }
-
-/* Compute Default Boundary Points for CEA     */
-   /* --------------------------------------------*/
-   if (projcode == GCTP_CEA &&
-      upleftpt[0] == 0 && upleftpt[1] == 0 &&
-      lowrightpt[0] == 0 && lowrightpt[1] == 0)
-    {
-      LLon = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LON, HDFE_DEG_RAD);
-      LLat = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LAT, HDFE_DEG_RAD);
-      RLon = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LON, HDFE_DEG_RAD);
-      RLat = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LAT, HDFE_DEG_RAD);
-
-      errorcode = for_trans[projcode] (LLon, LLat, &x, &y);
-      if (errorcode != 0)
-      {
-           status = -1;
-           HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-           HEreport("GCTP Error: %d\n", errorcode);
-           return (status);
-      }
-        upleftpt[0] = x;
-        upleftpt[1] = y;
-
-      errorcode = for_trans[projcode] (RLon, RLat, &x, &y);
-      if (errorcode != 0)
-      {
-           status = -1;
-           HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-           HEreport("GCTP Error: %d\n", errorcode);
-           return (status);
-      }
-      lowrightpt[0] = x;
-      lowrightpt[1] = y;
-
-    }
-
-
-    /* Compute Default Boundary Points for Polar Sterographic */
-    /* ------------------------------------------------------ */
-    if (projcode == GCTP_PS &&
-	upleftpt[0] == 0 && upleftpt[1] == 0 &&
-	lowrightpt[0] == 0 && lowrightpt[1] == 0)
-    {
-	/*
-	 * Convert the longitude and latitude from the DMS to decimal degree
-	 * format.
-	 */
-	plon = EHconvAng(projparm[4], HDFE_DMS_DEG);
-	plat = EHconvAng(projparm[5], HDFE_DMS_DEG);
-
-	/*
-	 * Compute the longitudes at 90, 180 and 270 degrees from the central
-	 * longitude.
-	 */
-
-	if (plon <= 0.0)
-	{
-	    tlon = 180.0 + plon;
-	    pplon = plon + 360.0;
-	}
-	else
-	{
-	    tlon = plon - 180.0;
-	    pplon = plon;
-	}
-
-	rlon = pplon + 90.0;
-	if (rlon > 360.0)
-	    rlon = rlon - 360;
-
-	if (rlon > 180.0)
-	    rlon = rlon - 360.0;
-
-	if (rlon <= 0.0)
-	    llon = 180.0 + rlon;
-	else
-	    llon = rlon - 180.0;
-
-
-	/* Convert all four longitudes from decimal degrees to radians */
-	plon = EHconvAng(plon, HDFE_DEG_RAD);
-	tlon = EHconvAng(tlon, HDFE_DEG_RAD);
-	llon = EHconvAng(llon, HDFE_DEG_RAD);
-	rlon = EHconvAng(rlon, HDFE_DEG_RAD);
-
-	errorcode = for_trans[projcode] (llon, 0.0, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	upleftpt[0] = x;
-
-	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	lowrightpt[0] = x;
-
-	/*
-	 * Compute the upperleft and lowright y values based on the south or
-	 * north polar projection
-	 */
-
-	if (plat < 0.0)
-	{
-	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    upleftpt[1] = y;
-
-	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    lowrightpt[1] = y;
-
-	}
-	else
-	{
-	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    upleftpt[1] = y;
-
-	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    lowrightpt[1] = y;
-
-	}
-    }
-
-
-    /* Compute Default Boundary Points for Goode Homolosine */
-    /* ---------------------------------------------------- */
-    if (projcode == GCTP_GOOD &&
-	upleftpt[0] == 0 && upleftpt[1] == 0 &&
-	lowrightpt[0] == 0 && lowrightpt[1] == 0)
-    {
-	lon = EHconvAng(-180, HDFE_DEG_RAD);
-	lat = 0.0;
-
-	errorcode = for_trans[projcode] (lon, lat, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	upleftpt[0] = -fabs(x);
-	lowrightpt[0] = +fabs(x);
-
-	lat = EHconvAng(90, HDFE_DEG_RAD);
-
-	errorcode = for_trans[projcode] (lon, lat, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	upleftpt[1] = +fabs(y);
-	lowrightpt[1] = -fabs(y);
-    }
-
-    /* Compute Default Boundary Points for Lambert Azimuthal */
-    /* ----------------------------------------------------- */
-    if (projcode == GCTP_LAMAZ &&
-	upleftpt[0] == 0 && upleftpt[1] == 0 &&
-	lowrightpt[0] == 0 && lowrightpt[1] == 0)
-    {
-	/*
-	 * Convert the longitude and latitude from the DMS to decimal degree
-	 * format.
-	 */
-	plon = EHconvAng(projparm[4], HDFE_DMS_DEG);
-	plat = EHconvAng(projparm[5], HDFE_DMS_DEG);
-
-	/*
-	 * Compute the longitudes at 90, 180 and 270 degrees from the central
-	 * longitude.
-	 */
-
-	if (plon <= 0.0)
-	{
-	    tlon = 180.0 + plon;
-	    pplon = plon + 360.0;
-	}
-	else
-	{
-	    tlon = plon - 180.0;
-	    pplon = plon;
-	}
-
-	rlon = pplon + 90.0;
-	if (rlon > 360.0)
-	    rlon = rlon - 360;
-
-	if (rlon > 180.0)
-	    rlon = rlon - 360.0;
-
-	if (rlon <= 0.0)
-	    llon = 180.0 + rlon;
-	else
-	    llon = rlon - 180.0;
-
-	/* Convert all four longitudes from decimal degrees to radians */
-	plon = EHconvAng(plon, HDFE_DEG_RAD);
-	tlon = EHconvAng(tlon, HDFE_DEG_RAD);
-	llon = EHconvAng(llon, HDFE_DEG_RAD);
-	rlon = EHconvAng(rlon, HDFE_DEG_RAD);
-
-	errorcode = for_trans[projcode] (llon, 0.0, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	upleftpt[0] = x;
-
-	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	lowrightpt[0] = x;
-
-	/*
-	 * Compute upperleft and lowerright values based on whether the
-	 * projection is south polar, north polar or equatorial
-	 */
-
-	if (plat == -90.0)
-	{
-	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    upleftpt[1] = y;
-
-	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    lowrightpt[1] = y;
-	}
-	else if (plat == 90.0)
-	{
-	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    upleftpt[1] = y;
-
-	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    lowrightpt[1] = y;
-	}
-	else
-	{
-	    lat = EHconvAng(90, HDFE_DEG_RAD);
-	    errorcode = for_trans[projcode] (plon, lat, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    upleftpt[1] = y;
-
-	    lat = EHconvAng(-90, HDFE_DEG_RAD);
-	    errorcode = for_trans[projcode] (plon, lat, &x, &y);
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    lowrightpt[1] = y;
-	}
-    }
-
-    /* Compute Default Boundary Points for Integerized Sinusoidal Grid */
-    /* --------------------------------------------------------------- */
-    if (((projcode == GCTP_ISINUS) || (projcode == GCTP_ISINUS1)) &&
-	upleftpt[0] == 0 && upleftpt[1] == 0 &&
-	lowrightpt[0] == 0 && lowrightpt[1] == 0)
-    {
-	/*
-	 * Convert the longitude and latitude from the DMS to decimal degree
-	 * format.
-	 */
-	plon = EHconvAng(projparm[4], HDFE_DMS_DEG);
-	/*plat = EHconvAng(projparm[5], HDFE_DMS_DEG); */
-
-	/*
-	 * Compute the longitudes at 90, 180 and 270 degrees from the central
-	 * longitude.
-	 */
-
-	if (plon <= 0.0)
-	{
-	    tlon = 180.0 + plon;
-	    pplon = plon + 360.0;
-	}
-	else
-	{
-	    tlon = plon - 180.0;
-	    pplon = plon;
-	}
-
-	rlon = pplon + 90.0;
-	if (rlon > 360.0)
-	    rlon = rlon - 360;
-
-	if (rlon > 180.0)
-	    rlon = rlon - 360.0;
-
-	if (rlon <= 0.0)
-	    llon = 180.0 + rlon;
-	else
-	    llon = rlon - 180.0;
-
-	/* Convert all four longitudes from decimal degrees to radians */
-	plon = EHconvAng(plon, HDFE_DEG_RAD);
-	tlon = EHconvAng(tlon, HDFE_DEG_RAD);
-	llon = EHconvAng(llon, HDFE_DEG_RAD);
-	rlon = EHconvAng(rlon, HDFE_DEG_RAD);
-
-	errorcode = for_trans[projcode] (llon, 0.0, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
-
-	upleftpt[0] = x;
-
-	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
+    /* Call GDwrrdattr routine to read attribute */
+    /* ----------------------------------------- */
+    status = GDwrrdattr(gridID, attrname, dum, dum, "r", datbuf);
 
-	lowrightpt[0] = x;
+    return (status);
+}
 
-	lat = EHconvAng(90, HDFE_DEG_RAD);
-	errorcode = for_trans[projcode] (plon, lat, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
 
-	upleftpt[1] = y;
 
-	lat = EHconvAng(-90, HDFE_DEG_RAD);
-	errorcode = for_trans[projcode] (plon, lat, &x, &y);
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	}
 
-	lowrightpt[1] = y;
-    }
-    return (errorcode);
-}
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDll2ij                                                          |
+|  FUNCTION: GDattrinfo                                                       |
 |                                                                             |
 |  DESCRIPTION:                                                               |
 |                                                                             |
@@ -6441,1318 +2512,705 @@ GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  projcode       int32               GCTP projection code                    |
-|  zonecode       int32               UTM zone code                           |
-|  projparm       float64             Projection parameters                   |
-|  spherecode     int32               GCTP spheriod code                      |
-|  xdimsize       int32               xdimsize from GDcreate                  |
-|  ydimsize       int32               ydimsize from GDcreate                  |
-|  upleftpt       float64             upper left corner coordinates           |
-|  lowrightpt     float64             lower right corner coordinates          |
-|  npnts          int32               number of lon-lat points                |
-|  longitude      float64             longitude array (radians)               |
-|  latitude       float64             latitude array (radians)                |
+|  gridID         int32               grid structure ID                       |
+|  attrname       char                attribute name                          |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  row            int32               Row array                               |
-|  col            int32               Column array                            |
-|  xval           float64             X value array                           |
-|  yval           float64             Y value array                           |
+|  numbertype     int32               attribute HDF numbertype                |
+|  count          int32               Number of attribute elements            |
 |                                                                             |
 |                                                                             |
+|  OUTPUTS:                                                                   |
+|             None                                                            |
+|                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Return x and y values if requested                  |
-|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
+|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-static intn
-GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
-	int32 spherecode, int32 xdimsize, int32 ydimsize,
-	float64 upleftpt[], float64 lowrightpt[],
-	int32 npnts, float64 longitude[], float64 latitude[],
-	int32 row[], int32 col[], float64 xval[], float64 yval[])
-
-
+intn
+GDattrinfo(int32 gridID, const char *attrname, int32 * numbertype, int32 * count)
 {
-    intn            i;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
 
-    int32           errorcode = 0;	/* GCTP error code */
-    int32(*for_trans[100]) (double, double, double*, double*);	/* GCTP function pointer */
-
-    float64         xVal;	/* Scaled x distance */
-    float64         yVal;	/* Scaled y distance */
-    float64         xMtr;	/* X value in meters from GCTP */
-    float64         yMtr;	/* Y value in meters from GCTP */
-    float64         lonrad0;	/* Longitude in radians of upleft point */
-    float64         latrad0 = 0;	/* Latitude in radians of upleft point */
-    float64         lonrad;	/* Longitude in radians of point */
-    float64         latrad;	/* Latitude in radians of point */
-    float64         scaleX;	/* X scale factor */
-    float64         scaleY;	/* Y scale factor */
-    float64         xMtr0 = 0, xMtr1, yMtr0 = 0, yMtr1;
-    float64         lonrad1;	/* Longitude in radians of lowright point */
-
-    /* If projection not GEO call GCTP initialization routine */
-    /* ------------------------------------------------------ */
-    if (projcode != GCTP_GEO)
-    {
-	for_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
-		 &errorcode, for_trans);
-
-	/* Report error if any */
-	/* ------------------- */
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	}
-    }
-
-
-    if (status == 0)
-    {
-	/* GEO projection */
-	/* -------------- */
-	if (projcode == GCTP_GEO)
-	{
-	    /* Convert upleft and lowright X coords from DMS to radians */
-	    /* -------------------------------------------------------- */
-	    lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
-	    lonrad = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
-
-	    /* Compute x scale factor */
-	    /* ---------------------- */
-	    scaleX = (lonrad - lonrad0) / xdimsize;
-
-
-	    /* Convert upleft and lowright Y coords from DMS to radians */
-	    /* -------------------------------------------------------- */
-	    latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
-	    latrad = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
-
-
-	    /* Compute y scale factor */
-	    /* ---------------------- */
-	    scaleY = (latrad - latrad0) / ydimsize;
-	}
-
-	/* BCEA projection */
-        /* -------------- */
-	else if ( projcode == GCTP_BCEA)
-	{
-	    /* Convert upleft and lowright X coords from DMS to radians */
-	    /* -------------------------------------------------------- */
-
-	    lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
-	    lonrad = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
-
-	    /* Convert upleft and lowright Y coords from DMS to radians */
-	    /* -------------------------------------------------------- */
-	    latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
-	    latrad = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
-
-	    /* Convert from lon/lat to meters(or whatever unit is, i.e unit
-	       of r_major and r_minor) using GCTP */
-	    /* ----------------------------------------- */
-	    errorcode = for_trans[projcode] (lonrad0, latrad0, &xMtr0, &yMtr0);
-
-
-	    /* Report error if any */
-	    /* ------------------- */
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    /* Convert from lon/lat to meters(or whatever unit is, i.e unit
-	       of r_major and r_minor) using GCTP */
-	    /* ----------------------------------------- */
-	    errorcode = for_trans[projcode] (lonrad, latrad, &xMtr1, &yMtr1);
-
-
-	    /* Report error if any */
-	    /* ------------------- */
-	    if (errorcode != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	    }
-
-	    /* Compute x scale factor */
-	    /* ---------------------- */
-	    scaleX = (xMtr1 - xMtr0) / xdimsize;
-
-	    /* Compute y scale factor */
-	    /* ---------------------- */
-	    scaleY = (yMtr1 - yMtr0) / ydimsize;
-	}
-	else
-	{
-	    /* Non-GEO, Non_BCEA projections */
-	    /* ---------------------------- */
+    int32           fid;	/* HDF-EOS file ID */
+    int32           attrVgrpID;	/* Grid attribute ID */
+    int32           dum;	/* dummy variable */
+    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
 
-	    /* Compute x & y scale factors */
-	    /* --------------------------- */
-	    scaleX = (lowrightpt[0] - upleftpt[0]) / xdimsize;
-	    scaleY = (lowrightpt[1] - upleftpt[1]) / ydimsize;
-	}
+    status = GDchkgdid(gridID, "GDattrinfo", &fid, &dum, &dum);
 
+    int gID = gridID % idOffset;
+    if (gID >= NGRID)
+    {
+        return -1;
+    }
+    attrVgrpID = GDXGrid[gID].VIDTable[1];
 
+    status = EHattrinfo(fid, attrVgrpID, attrname, numbertype,
+			count);
 
-	/* Loop through all points */
-	/* ----------------------- */
-	for (i = 0; i < npnts; i++)
-	{
-	    /* Convert lon & lat from decimal degrees to radians */
-	    /* ------------------------------------------------- */
-	    lonrad = EHconvAng(longitude[i], HDFE_DEG_RAD);
-	    latrad = EHconvAng(latitude[i], HDFE_DEG_RAD);
+    return (status);
+}
 
 
-	    /* GEO projection */
-	    /* -------------- */
-	    if (projcode == GCTP_GEO)
-	    {
-	        /* allow map to span dateline */
-	        lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
-	        lonrad1 = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
-		/* if time-line is passed */
-		if(lonrad < lonrad1)
-		  {
-		    if (lonrad < lonrad0) lonrad += 2.0 * M_PI;
-		    if (lonrad > lonrad1) lonrad -= 2.0 * M_PI;
-		  }
 
-		/* Compute scaled distance to point from origin */
-		/* -------------------------------------------- */
-		xVal = (lonrad - lonrad0) / scaleX;
-		yVal = (latrad - latrad0) / scaleY;
-	    }
-	    else
-	    {
-		/* Convert from lon/lat to meters using GCTP */
-		/* ----------------------------------------- */
-		errorcode = for_trans[projcode] (lonrad, latrad, &xMtr, &yMtr);
 
 
-		/* Report error if any */
-		/* ------------------- */
-		if (errorcode != 0)
-		{
-		  /*status = -1;
-		    HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
-		    HEreport("GCTP Error: %d\n", errorcode);
-		    return (status); */                  /* Bruce Beaumont */
-		    xVal = -2147483648.0;	         /* Bruce Beaumont */
-		    yVal = -2147483648.0;	         /* Bruce Beaumont */
-		}/* (Note: MAXLONG is defined as 2147483647.0 in
-		    function cproj.c of GCTP) */
-		else {
-		  /* if projection is BCEA normalize x and y by cell size and
-		     measure it from the upperleft corner of the grid */
 
-		  /* Compute scaled distance to point from origin */
-		  /* -------------------------------------------- */
-		  if(  projcode == GCTP_BCEA)
-		    {
-		      xVal = (xMtr - xMtr0) / scaleX;
-		      yVal = (yMtr - yMtr0) / scaleY;
-		    }
-		  else
-		    {
-		      xVal = (xMtr - upleftpt[0]) / scaleX;
-		      yVal = (yMtr - upleftpt[1]) / scaleY;
-		    }
-		}
-	    }
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: GDinqattrs                                                       |
+|                                                                             |
+|  DESCRIPTION:                                                               |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  nattr          int32               Number of attributes in swath struct    |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  grid ID        int32               grid structure ID                       |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  attrnames      char                Attribute names in swath struct         |
+|                                     (Comma-separated list)                  |
+|  strbufsize     int32               Attributes name list string length      |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|             None                                                            |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Oct 96   Joel Gales    Initialize nattr                                    |
+|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+int32
+GDinqattrs(int32 gridID, char *attrnames, int32 * strbufsize)
+{
+    intn            status;	/* routine return status variable */
 
+    int32           fid;	/* HDF-EOS file ID */
+    int32           attrVgrpID;	/* Grid attribute ID */
+    int32           dum;	/* dummy variable */
+    int32           nattr = 0;	/* Number of attributes */
+    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
 
-	    /* Compute row and col from scaled distance */
-	    /* ---------------------------------------- */
-	    col[i] = (int32) xVal;
-	    row[i] = (int32) yVal;
 
-	    /* Store scaled distances if requested */
-	    /* ----------------------------------- */
-	    if (xval != NULL)
-	    {
-		xval[i] = xVal;
-	    }
+    /* Check Grid id */
+    status = GDchkgdid(gridID, "GDinqattrs", &fid, &dum, &dum);
 
-	    if (yval != NULL)
-	    {
-		yval[i] = yVal;
-	    }
-	}
+    if (status == 0)
+    {
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	    return -1;
     }
-    return (status);
+	attrVgrpID = GDXGrid[gID].VIDTable[1];
+	nattr = EHattrcat(fid, attrVgrpID, attrnames, strbufsize);
+    }
+
+    return (nattr);
 }
 
 
 
-#ifdef UNUSED_BY_GDAL
+
+
+
+#define REMQUOTE(x) do { \
+    char* l_x = x; \
+    const size_t l_x_len = strlen(l_x); \
+    if (l_x_len >= 2 && l_x[0] == '"' && l_x[l_x_len - 1] == '"') {\
+        memmove(l_x, l_x + 1, l_x_len - 2); \
+        l_x[l_x_len - 2] = 0; \
+    } \
+  } while(0)
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDrs2ll                                                          |
+|  FUNCTION: GDinqdims                                                        |
 |                                                                             |
-|  DESCRIPTION:  Converts EASE grid's (r,s) coordinates to longitude and      |
-|                latitude (in decimal degrees).                               |
+|  DESCRIPTION: Retrieve information about all dimensions defined in a grid.  |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nDim           int32               Number of defined dimensions            |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  projcode       int32               GCTP projection code                    |
-|  projparm       float64             Projection parameters                   |
-|  xdimsize       int32               xdimsize from GDcreate                  |
-|  ydimsize       int32               ydimsize from GDcreate                  |
-|  pixcen         int32               pixel center code                       |
-|  npnts          int32               number of lon-lat points                |
-|  s              int32               s coordinate                            |
-|  r              int32               r coordinate                            |
-|  pixcen         int32               Code from GDpixreginfo                  |
-|  pixcnr         int32               Code from GDorigininfo                  |
-|  upleft         float64             upper left corner coordinates (DMS)     |
-|  lowright       float64             lower right corner coordinates (DMS)    |
+|  gridID         int32               grid structure ID                       |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  dimnames       char                Dimension names (comma-separated)       |
+|  dims           int32               Dimension values                        |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  longitude      float64             longitude array (decimal degrees)       |
-|  latitude       float64             latitude array  (decimal degrees)       |
+|             None                                                            |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Jul 00   Abe Taaheri   Original Programmer                                 |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nDim to -1 if status = -1                       |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-GDrs2ll(int32 projcode, float64 projparm[],
-	int32 xdimsize, int32 ydimsize,
-	float64 upleft[], float64 lowright[],
-	int32 npnts, float64 r[], float64 s[],
-	float64 longitude[], float64 latitude[], int32 pixcen, int32 pixcnr)
+int32
+GDinqdims(int32 gridID, char *dimnames, int32 dims[])
 {
-    intn            i;		    /* Loop index */
-    intn            status = 0;	    /* routine return status variable */
-
-    int32           errorcode = 0;  /* GCTP error code */
-    int32(*inv_trans[100]) (double, double, double*, double*);	    /* GCTP function pointer */
-
-    float64         pixadjX = 0.0;  /* Pixel adjustment (x) */
-    float64         pixadjY = 0.0;  /* Pixel adjustment (y) */
-    float64         lonrad;	    /* Longitude in radians of point */
-    float64         latrad;	    /* Latitude in radians of point */
-    float64         xMtr;	    /* X value in meters from GCTP */
-    float64         yMtr;	    /* Y value in meters from GCTP */
-    float64         epsilon;
-    float64         beta;
-    float64         qp_cea = 0;
-    float64         kz_cea = 0;
-    float64         eccen, eccen_sq;
-    float64         phi1, sinphi1, cosphi1;
-    float64         scaleX, scaleY;
-
-    int32           zonecode=0;
-
-    int32           spherecode=0;
-    float64         lon[2],lat[2];
-    float64         xcor[2], ycor[2];
-    int32           nlatlon;
-
-    /* If projection is BCEA define scale, r0 and s0 */
-    if (projcode == GCTP_BCEA)
-    {
-	eccen_sq = 1.0 - SQUARE(projparm[1]/projparm[0]);
-	eccen = sqrt(eccen_sq);
-	if(eccen < 0.00001)
-	  {
-	    qp_cea = 2.0;
-	  }
-	else
-	  {
-	    qp_cea =
-	      (1.0 - eccen_sq)*((1.0/(1.0 - eccen_sq))-(1.0/(2.0*eccen))*
-				log((1.0 - eccen)/(1.0 + eccen)));
-	  }
-	phi1 = EHconvAng(projparm[5],HDFE_DMS_RAD);
-	cosphi1 = cos(phi1);
-	sinphi1 = sin(phi1);
-	kz_cea = cosphi1/(sqrt(1.0 - (eccen_sq*sinphi1*sinphi1)));
-    }
-
+    intn            status;	/* routine return status variable */
 
+    int32           fid;	/* HDF-EOS file ID */
+    int32           sdInterfaceID;	/* HDF SDS interface ID */
+    int32           gdVgrpID;	/* Grid root Vgroup ID */
+    int32           size;	/* Dimension size */
+    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           nDim = 0;	/* Number of dimensions */
 
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;/* Utility string */
 
-    /* Compute adjustment of position within pixel */
-    /* ------------------------------------------- */
-    if (pixcen == HDFE_CENTER)
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
     {
-	/* Pixel defined at center */
-	/* ----------------------- */
-	pixadjX = 0.5;
-	pixadjY = 0.5;
+	HEpush(DFE_NOSPACE,"GDinqdims", __FILE__, __LINE__);
+	return(-1);
     }
-    else
+    /* Check for valid grid id */
+    /* ----------------------- */
+    status = GDchkgdid(gridID, "GDinqdims", &fid, &sdInterfaceID, &gdVgrpID);
+
+    if (status == 0)
     {
-	switch (pixcnr)
+	/* If dimension names or sizes are requested */
+	/* ----------------------------------------- */
+	if (dimnames != NULL || dims != NULL)
 	{
-	case HDFE_GD_UL:
-	    {
-		/* Pixel defined at upper left corner */
-		/* ---------------------------------- */
-		pixadjX = 0.0;
-		pixadjY = 0.0;
-		break;
-	    }
-
-	case HDFE_GD_UR:
-	    {
-		/* Pixel defined at upper right corner */
-		/* ----------------------------------- */
-		pixadjX = 1.0;
-		pixadjY = 0.0;
-		break;
-	    }
-
-	case HDFE_GD_LL:
-	    {
-		/* Pixel defined at lower left corner */
-		/* ---------------------------------- */
-		pixadjX = 0.0;
-		pixadjY = 1.0;
-		break;
-	    }
-
-	case HDFE_GD_LR:
+	    /* Get grid name */
+	    /* ------------- */
+	    int gID = gridID % idOffset;
+	    if (gID >= NGRID)
 	    {
-		/* Pixel defined at lower right corner */
-		/* ----------------------------------- */
-		pixadjX = 1.0;
-		pixadjY = 1.0;
-		break;
+	       free(utlstr);
+	       return -1;
 	    }
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 
-	}
-    }
-
-    /* If projection is BCEA call GCTP initialization routine */
-    /* ------------------------------------------------------ */
-    if (projcode == GCTP_BCEA)
-    {
-
-	inv_init(projcode, 0, projparm, 0, NULL, NULL,
-		 &errorcode, inv_trans);
 
-	/* Report error if any */
-	/* ------------------- */
-	if (errorcode != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDrs2ll", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	}
-	else
-	{
-	    /* For each point ... */
-	    /* ------------------ */
-	  for (i = 0; i < npnts; i++)
+	    /* Get pointers to "Dimension" section within SM */
+	    /* --------------------------------------------- */
+	    metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+					   "Dimension", metaptrs);
+	    if(metabuf == NULL)
 	    {
-	      /* Convert from EASE grid's (r,s) to lon/lat (radians)
-		 using GCTP */
-	      /* --------------------------------------------------- */
-	      nlatlon = 2;
-	      lon[0] = upleft[0];
-	      lon[1] = lowright[0];
-	      lat[0] = upleft[1];
-	      lat[1] = lowright[1];
-	      status =
-		GDll2mm_cea(projcode,zonecode,spherecode,projparm,
-			    xdimsize, ydimsize,
-			    upleft, lowright, nlatlon,
-			    lon, lat,
-			    xcor, ycor, &scaleX, &scaleY);
-
-	      if (status == -1)
-		{
-		  HEpush(DFE_GENAPP, "GDrs2ll", __FILE__, __LINE__);
-		  return (status);
-		}
+		free(utlstr);
+		return(-1);
+	    }
 
-	      xMtr = (r[i]/ scaleX + pixadjX - 0.5)* scaleX;
-	      yMtr = - (s[i]/fabs(scaleY) + pixadjY - 0.5)* fabs(scaleY);
 
+	    /* If dimension names are requested then "clear" name buffer */
+	    /* --------------------------------------------------------- */
+	    if (dimnames != NULL)
+	    {
+		dimnames[0] = 0;
+	    }
 
-	      /* allow .5 cell tolerance in arcsin function
-		 (used in bceainv function) so that grid
-		 coordinates which are less than .5 cells
-		 above 90.00N or below 90.00S are given lat of 90.00
-	      */
+	    while (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
+	    {
+		strcpy(utlstr, "\t\tOBJECT=");
+		metaptrs[0] = strstr(metaptrs[0], utlstr);
+		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
+		{
+		    /* Get Dimension Name */
+		    /* ------------------ */
+		    if (dimnames != NULL)
+		    {
+			/* Check 1st for old meta data then new */
+			/* ------------------------------------ */
+			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
+			if (utlstr[0] != '"')
+			{
+			    metaptrs[0] =
+				strstr(metaptrs[0], "\t\t\t\tDimensionName=");
+			    EHgetmetavalue(metaptrs, "DimensionName", utlstr);
+			}
 
-	      epsilon = 1 + 0.5 * (fabs(scaleY)/projparm[0]);
-	      beta = 2.0 * (yMtr - projparm[7]) * kz_cea/(projparm[0] * qp_cea);
+			/* Strip off double quotes */
+			/* ----------------------- */
+			memmove(utlstr, utlstr + 1, strlen(utlstr) - 2);
+			utlstr[strlen(utlstr) - 2] = 0;
 
-	      if( fabs (beta) > epsilon)
-		{
-		  status = -1;
-		  HEpush(DFE_GENAPP, "GDrs2ll", __FILE__, __LINE__);
-		  HEreport("GCTP Error: %s %s %s\n", "grid coordinates",
-			   "are more than .5 cells",
-			   "above 90.00N or below 90.00S. ");
-		  return (status);
-		}
-	      else if( beta <= -1)
-		{
-		  errorcode = inv_trans[projcode] (xMtr, 0.0,
-						   &lonrad, &latrad);
-		  latrad = - M_PI/2;
-		}
-	      else if( beta >= 1)
-		{
-		  errorcode = inv_trans[projcode] (xMtr, 0.0,
-						   &lonrad, &latrad);
-		  latrad = M_PI/2;
-		}
-	      else
-		{
-		  errorcode = inv_trans[projcode] (xMtr, yMtr,
-						   &lonrad, &latrad);
-		}
+			if (nDim > 0)
+			{
+			    strcat(dimnames, ",");
+			}
+			strcat(dimnames, utlstr);
+		    }
 
-	      /* Report error if any */
-	      /* ------------------- */
-	      if (errorcode != 0)
-		{
-		  status = -1;
-		  HEpush(DFE_GENAPP, "GDrs2ll", __FILE__, __LINE__);
-		  HEreport("GCTP Error: %d\n", errorcode);
-		  return (status);
+		    /* Get Dimension Size */
+		    /* ------------------ */
+		    if (dims != NULL)
+		    {
+			EHgetmetavalue(metaptrs, "Size", utlstr);
+			size = atoi(utlstr);
+			dims[nDim] = size;
+		    }
+		    nDim++;
 		}
-
-	      /* Convert from radians to decimal degrees */
-	      /* --------------------------------------- */
-	      longitude[i] = EHconvAng(lonrad, HDFE_RAD_DEG);
-	      latitude[i] = EHconvAng(latrad, HDFE_RAD_DEG);
 	    }
+	    free(metabuf);
+
 	}
     }
 
 
+    /* Set nDim to -1 if error status exists */
+    /* ------------------------------------- */
+    if (status == -1)
+    {
+	nDim = -1;
+    }
+    free(utlstr);
+    return (nDim);
+}
+
+
 
 
-    return (status);
-}
-#endif
 
 
-#ifdef HDFEOS_GD_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: lamaxDxDtheta                                                    |
+|  FUNCTION: GDinqfields                                                      |
 |                                                                             |
-|  DESCRIPTION: Partial derivative along longitude line for Lambert Azimuthal |
+|  DESCRIPTION: Retrieve information about all data fields defined in a grid. |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|                 float64             Dx/D(theta) for LAMAZ projection        |
+|  nFld           int32               Number of fields in swath               |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  parms          float64             Parameters defining partial derivative  |
+|  gridID         int32               grid structure ID                       |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  fieldlist      char                Field names (comma-separated)           |
+|  rank           int32               Array of ranks                          |
+|  numbertype     int32               Array of HDF number types               |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Nov 96   Joel Gales    Original Programmer                                 |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nFld to -1 if status = -1                       |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-static float64
-lamazDxDtheta(float64 parms[])
+int32
+GDinqfields(int32 gridID, char *fieldlist, int32 rank[],
+	    int32 numbertype[])
 {
-    float64         snTheta, sn2Theta, snTheta1, csTheta1, csLamda;
-
-    snTheta = sin(EHconvAng(parms[0], HDFE_DEG_RAD));
-    sn2Theta = sin(2 * EHconvAng(parms[0], HDFE_DEG_RAD));
-    snTheta1 = sin(EHconvAng(parms[1], HDFE_DEG_RAD));
-    csTheta1 = cos(EHconvAng(parms[1], HDFE_DEG_RAD));
-    csLamda = cos(EHconvAng(parms[2], HDFE_DEG_RAD) -
-		  EHconvAng(parms[3], HDFE_DEG_RAD));
-
-    return (4 * snTheta +
-	    (csTheta1 * csLamda * sn2Theta) +
-	    (2 * snTheta1 * (1 + (snTheta * snTheta))));
-}
+    intn            status;	/* routine return status variable */
 
+    int32           fid;	/* HDF-EOS file ID */
+    int32           sdInterfaceID;	/* HDF SDS interface ID */
+    int32           gdVgrpID;	/* Grid root Vgroup ID */
+    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           nFld = 0;	/* Number of mappings */
+    int32           slen[8];	/* String length array */
 
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;/* Utility string */
+    char           *ptr[8];	/* String pointer array */
 
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"GDinqfields", __FILE__, __LINE__);
+	return(-1);
+    }
+    /* Check for valid grid id */
+    /* ----------------------- */
+    status = GDchkgdid(gridID, "GDinqfields", &fid, &sdInterfaceID, &gdVgrpID);
+    if (status == 0)
+    {
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: lamaxDxDlamda                                                    |
-|                                                                             |
-|  DESCRIPTION: Partial derivative along latitude line for Lambert Azimuthal  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|                 float64             Dx/D(lamda) for LAMAZ projection        |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  parms          float64             Parameters defining partial derivative  |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Nov 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static float64
-lamazDxDlamda(float64 parms[])
-{
-    float64         snTheta, csTheta, snTheta1, csTheta1, csLamda;
-    float64         cs, sn;
+	/* If field names, ranks,  or number types desired ... */
+	/* --------------------------------------------------- */
+	if (fieldlist != NULL || rank != NULL || numbertype != NULL)
+	{
+	    /* Get grid name */
+	    /* ------------- */
+	    int gID = gridID % idOffset;
+	    if (gID >= NGRID)
+	    {
+	       free(utlstr);
+	       return -1;
+	    }
+	    Vgetname(GDXGrid[gID].IDTable, gridname);
 
-    snTheta = sin(EHconvAng(parms[2], HDFE_DEG_RAD));
-    csTheta = cos(EHconvAng(parms[2], HDFE_DEG_RAD));
-    snTheta1 = sin(EHconvAng(parms[1], HDFE_DEG_RAD));
-    csTheta1 = cos(EHconvAng(parms[1], HDFE_DEG_RAD));
-    csLamda = cos(EHconvAng(parms[0], HDFE_DEG_RAD) -
-		  EHconvAng(parms[3], HDFE_DEG_RAD));
 
-    cs = csTheta * csTheta1;
-    sn = snTheta * snTheta1;
+	    /* Get pointers to "DataField" section within SM */
+	    /* --------------------------------------------- */
+	    metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+					   "DataField", metaptrs);
+	    if(metabuf == NULL)
+	    {
+		free(utlstr);
+		return(-1);
+	    }
 
-    return (cs + (2 * (1 + sn) + (cs * csLamda)) * csLamda);
-}
 
+	    /* If field names are desired then "clear" name buffer */
+	    /* --------------------------------------------------- */
+	    if (fieldlist != NULL)
+	    {
+		fieldlist[0] = 0;
+	    }
 
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: lamaxDyDtheta                                                    |
-|                                                                             |
-|  DESCRIPTION: Partial derivative along longitude line for Lambert Azimuthal |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|                 float64             Dy/D(theta) for LAMAZ projection        |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  parms          float64             Parameters defining partial derivative  |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Nov 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static float64
-lamazDyDtheta(float64 parms[])
-{
-    float64         snTheta, csTheta, snTheta1, csTheta1, csLamda;
-    float64         sn2, cs2, sndiff;
-
-    snTheta = sin(EHconvAng(parms[0], HDFE_DEG_RAD));
-    csTheta = cos(EHconvAng(parms[0], HDFE_DEG_RAD));
-    snTheta1 = sin(EHconvAng(parms[1], HDFE_DEG_RAD));
-    csTheta1 = cos(EHconvAng(parms[1], HDFE_DEG_RAD));
-    csLamda = cos(EHconvAng(parms[2], HDFE_DEG_RAD) -
-		  EHconvAng(parms[3], HDFE_DEG_RAD));
-
-    sn2 = snTheta1 * snTheta;
-    cs2 = csTheta1 * csTheta;
-    sndiff = snTheta1 - snTheta;
-
-    return (cs2 * (sn2 * (1 + (csLamda * csLamda)) + 2) +
-	    csLamda * (2 * (1 + sn2 * sn2) - (sndiff * sndiff)));
-}
+	    /* Begin loop through mapping entries in metadata */
+	    /* ---------------------------------------------- */
+	    while (1)
+	    {
+		/* Search for OBJECT string */
+		/* ------------------------ */
+		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
 
 
+		/* If found within "Data" Field metadata section .. */
+		/* ------------------------------------------------ */
+		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
+		{
+		    /* Get Fieldnames (if desired) */
+		    /* --------------------------- */
+		    if (fieldlist != NULL)
+		    {
+			/* Check 1st for old meta data then new */
+			/* ------------------------------------ */
+			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: homDyDtheta                                                      |
-|                                                                             |
-|  DESCRIPTION: Partial derivative along longitude line for Oblique Mercator  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|                 float64             Dx/D(theta) for HOM projection          |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  parms          float64             Parameters defining partial derivative  |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Mar 97   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static float64
-homDyDtheta(float64 parms[])
-{
-    float64         tnTheta, tnTheta1, snLamda;
+			/*
+			 * If OBJECT value begins with double quote then old
+			 * metadata, field name is OBJECT value. Otherwise
+			 * search for "DataFieldName" string
+			 */
+
+			if (utlstr[0] != '"')
+			{
+			    strcpy(utlstr, "\t\t\t\t");
+			    strcat(utlstr, "DataFieldName");
+			    strcat(utlstr, "=");
+			    metaptrs[0] = strstr(metaptrs[0], utlstr);
+			    EHgetmetavalue(metaptrs, "DataFieldName", utlstr);
+			}
+
+			/* Strip off double quotes */
+			/* ----------------------- */
+			REMQUOTE(utlstr);
+
+
+			/* Add to fieldlist */
+			/* ---------------- */
+			    if (nFld > 0)
+			{
+			    strcat(fieldlist, ",");
+			}
+			strcat(fieldlist, utlstr);
 
-    tnTheta = tan(EHconvAng(parms[0], HDFE_DEG_RAD));
-    tnTheta1 = tan(EHconvAng(parms[1], HDFE_DEG_RAD));
-    snLamda = cos(EHconvAng(parms[2], HDFE_DEG_RAD) -
-		  EHconvAng(parms[3], HDFE_DEG_RAD));
+		    }
+		    /* Get Numbertype */
+		    if (numbertype != NULL)
+		    {
+			EHgetmetavalue(metaptrs, "DataType", utlstr);
+			numbertype[nFld] = EHnumstr(utlstr);
+		    }
+		    /*
+		     * Get Rank (if desired) by counting # of dimensions in
+		     * "DimList" string
+		     */
+		    if (rank != NULL)
+		    {
+			EHgetmetavalue(metaptrs, "DimList", utlstr);
+			rank[nFld] = EHparsestr(utlstr, ',', ptr, slen);
+		    }
+		    /* Increment number of fields */
+		    nFld++;
+		}
+		else
+		    /* No more fields found */
+		{
+		    break;
+		}
+	    }
+	    free(metabuf);
+	}
+    }
 
-    return (tnTheta * snLamda + tnTheta1);
+    /* Set nFld to -1 if error status exists */
+    /* ------------------------------------- */
+    if (status == -1)
+    {
+	nFld = -1;
+    }
+    free(utlstr);
+    return (nFld);
 }
 
 
 
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDtangentpnts                                                    |
+|  FUNCTION: GDnentries                                                       |
 |                                                                             |
-|  DESCRIPTION: Finds tangent points along lon/lat lines                      |
+|  DESCRIPTION: Returns number of entries and descriptive string buffer       |
+|                size for a specified entity.                                 |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nEntries       int32               Number of entries                       |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  projcode       int32               Projection code                         |
-|  projparm       float64             Projection parameters                   |
-|  cornerlon      float64  dec deg    Longitude of opposite corners of box    |
-|  cornerlat      float64  dec deg    Latitude of opposite corners of box     |
-|  longitude      float64  dec deg    Longitude of points to check            |
-|  latitude       float64  dec deg    Latitude of points to check             |
+|  gridID         int32               grid structure ID                       |
+|  entrycode      int32               Entry code                              |
+|	                              HDFE_NENTDIM  (0)                       |
+|	                              HDFE_NENTDFLD (4)                       |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  npnts          int32               Number of points to check in subset     |
+|  strbufsize     int32               Length of comma-separated list          |
+|                                     (Does not include null-terminator       |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Nov 96   Joel Gales    Original Programmer                                 |
-|  Mar 97   Joel Gales    Add support for LAMCC, POLYC, TM                    |
-|  Aug 99   Abe Taaheri   Add support for ALBERS, and MERCAT projections.     |
-|                         Also changed mistyped bisectParm[2] to              |
-|                         bisectParm[3] for HOM projection.                   |
-|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nEntries to -1 if status = -1                   |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-static intn
-GDtangentpnts(int32 projcode, float64 projparm[], float64 cornerlon[],
-	      float64 cornerlat[], float64 longitude[], float64 latitude[],
-	      int32 * npnts)
+int32
+GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
+
 {
+    intn            status;	/* routine return status variable */
     intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
 
-    float64         lonrad;	/* Longitude (radians) */
-    float64         latrad;	/* Latitude (radians) */
-    float64         cs[4];	/* Cosine array */
-    float64         sn[4];	/* Sine array */
-    float64         csTest;	/* Cosine test value */
-    float64         snTest;	/* Sine test value */
-    float64         crs01;	/* Cross product */
-    float64         crsTest[2];	/* Cross product array */
-    float64         longPol;	/* Longitude beneath pole */
-    float64         minLat;	/* Minimum latitude */
-    float64         bisectParm[4];	/* Bisection parameters */
-    float64         tanLat;	/* Tangent latitude */
-    float64         tanLon;	/* Tangent longitude */
-    float64         dotPrd;	/* Dot product */
-    float64         centMerd;	/* Central Meridian */
-    float64         orgLat;	/* Latitude of origin */
-    float64         dpi;	/* Double precision pi */
-
-#if 0
-    float64         lamazDxDtheta();	/* Lambert Azimuthal Dx/Dtheta */
-    float64         lamazDxDlamda();	/* Lambert Azimuthal Dx/Dlamda */
-    float64         lamazDyDtheta();	/* Lambert Azimuthal Dy/Dtheta */
-    float64         homDyDtheta();	/* Oblique Mercator  Dy/Dtheta */
-#endif
+    int32           fid;	/* HDF-EOS file ID */
+    int32           sdInterfaceID;	/* HDF SDS interface ID */
+    int32           gdVgrpID;	/* Grid root Vgroup ID */
+    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           nEntries = 0;	/* Number of entries */
+    int32           metaflag;	/* Old (0), New (1) metadata flag) */
+    int32           nVal = 0;	/* Number of strings to search for */
 
-    /* Compute pi (double precision) */
-    /* ----------------------------- */
-    dpi = atan(1.0) * 4;
+    char           *metabuf = NULL;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2] = {NULL, NULL};/* Pointers to begin and end of SM section */
+    char            gridname[80];	/* Grid Name */
+    char           *utlstr;/* Utility string */
+    char            valName[2][32];	/* Strings to search for */
 
+    memset(valName, 0, sizeof(valName));
 
-    switch (projcode)
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
     {
-      case GCTP_MERCAT:
-	{
-	    /* No need for tangent points, since MERCAT projection
-	       is rectangular */
-	}
-	break;
-      case GCTP_BCEA:
-	{
-	    /* No need for tangent points, since BCEA projection
-	       is rectangular */
-	}
-	break;
-     case GCTP_CEA:
-      {
-             /* No need for tangent points, since CEA projection
-                is rectangular */
-      }
-      break;
+	HEpush(DFE_NOSPACE,"GDnentries", __FILE__, __LINE__);
+	return(-1);
+    }
+    status = GDchkgdid(gridID, "GDnentries", &fid, &sdInterfaceID, &gdVgrpID);
 
-      case GCTP_PS:
+    if (status == 0)
+    {
+	/* Get grid name */
+	int gID = gridID % idOffset;
+	if (gID >= NGRID)
 	{
-	    /* Add "xy axis" points for Polar Stereographic if necessary */
-	    /* --------------------------------------------------------- */
-
-
-	    /* Get minimum of corner latitudes */
-	    /* ------------------------------- */
-	    minLat = (fabs(cornerlat[0]) <= fabs(cornerlat[1]))
-		? cornerlat[0] : cornerlat[1];
-
-
-	    /* Compute sine and cosine of corner longitudes */
-	    /* -------------------------------------------- */
-	    for (i = 0; i < 2; i++)
-	    {
-		lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		cs[i] = cos(lonrad);
-		sn[i] = sin(lonrad);
-	    }
-
-
-	    /* Compute cross product */
-	    /* --------------------- */
-	    crs01 = cs[0] * sn[1] - cs[1] * sn[0];
-
-
-	    /* Convert longitude beneath pole from DMS to DEG */
-	    /* ---------------------------------------------- */
-	    longPol = EHconvAng(projparm[4], HDFE_DMS_RAD);
-
-
-
-	    for (i = 0; i < 4; i++)
-	    {
-		csTest = cos(longPol);
-		snTest = sin(longPol);
+	   free(utlstr);
+	   return -1;
+	}
 
-		crsTest[0] = cs[0] * snTest - csTest * sn[0];
-		crsTest[1] = cs[1] * snTest - csTest * sn[1];
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
-		if ((crs01 > 0 && crsTest[0] > 0 && crsTest[1] < 0) ||
-		    (crs01 < 0 && crsTest[0] < 0 && crsTest[1] < 0) ||
-		    (crs01 < 0 && crsTest[0] > 0 && crsTest[1] < 0) ||
-		    (crs01 < 0 && crsTest[0] > 0 && crsTest[1] > 0))
-		{
-		    longitude[*npnts] = EHconvAng(longPol, HDFE_RAD_DEG);
-		    latitude[*npnts] = minLat;
-		    (*npnts)++;
-		}
-		longPol += 0.5 * dpi;
-	    }
-	}
-	break;
+	/* Zero out string buffer size */
+	*strbufsize = 0;
 
 
-      case GCTP_LAMAZ:
+	/*
+	 * Get pointer to  relevant section within SM and Get names of
+	 * metadata strings to inquire about
+	 */
+	switch (entrycode)
 	{
-	    if ((int32) projparm[5] == +90000000 ||
-		(int32) projparm[5] == -90000000)
+	case HDFE_NENTDIM:
 	    {
-		/* Add "xy axis" points for Polar Lambert Azimuthal */
-		/* ------------------------------------------------ */
-		minLat = (fabs(cornerlat[0]) <= fabs(cornerlat[1]))
-		    ? cornerlat[0] : cornerlat[1];
-
-		for (i = 0; i < 2; i++)
+		metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+					       "Dimension", metaptrs);
+		if(metabuf == NULL)
 		{
-		    lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		    cs[i] = cos(lonrad);
-		    sn[i] = sin(lonrad);
+		    free(utlstr);
+		    return(-1);
 		}
-		crs01 = cs[0] * sn[1] - cs[1] * sn[0];
-
-		longPol = EHconvAng(projparm[4], HDFE_DMS_RAD);
-		for (i = 0; i < 4; i++)
-		{
-		    csTest = cos(longPol);
-		    snTest = sin(longPol);
-
-		    crsTest[0] = cs[0] * snTest - csTest * sn[0];
-		    crsTest[1] = cs[1] * snTest - csTest * sn[1];
 
-		    if ((crs01 > 0 && crsTest[0] > 0 && crsTest[1] < 0) ||
-			(crs01 < 0 && crsTest[0] < 0 && crsTest[1] < 0) ||
-			(crs01 < 0 && crsTest[0] > 0 && crsTest[1] < 0) ||
-			(crs01 < 0 && crsTest[0] > 0 && crsTest[1] > 0))
-		    {
-			longitude[*npnts] = EHconvAng(longPol, HDFE_RAD_DEG);
-			latitude[*npnts] = minLat;
-			(*npnts)++;
-		    }
-		    longPol += 0.5 * dpi;
-		}
+		nVal = 1;
+		strcpy(&valName[0][0], "DimensionName");
 	    }
-	    else if ((int32) projparm[5] == 0)
-	    {
-		/* Add "Equator" points for Equatorial Lambert Azimuthal */
-		/* ----------------------------------------------------- */
-		if (cornerlat[0] * cornerlat[1] < 0)
-		{
-		    longitude[4] = cornerlon[0];
-		    latitude[4] = 0;
-
-		    longitude[5] = cornerlon[1];
-		    latitude[5] = 0;
+	    break;
 
-		    *npnts = 6;
-		}
-	    }
-	    else
+	case HDFE_NENTDFLD:
 	    {
-		/* Add tangent points for Oblique Lambert Azimuthal */
-		/* ------------------------------------------------ */
-		bisectParm[0] = EHconvAng(projparm[5], HDFE_DMS_DEG);
-		bisectParm[2] = EHconvAng(projparm[4], HDFE_DMS_DEG);
-
-
-		/* Tangent to y-axis along longitude */
-		/* --------------------------------- */
-		for (i = 0; i < 2; i++)
-		{
-		    bisectParm[1] = cornerlon[i];
-
-		    if (EHbisect(lamazDxDtheta, bisectParm, 3,
-				 cornerlat[0], cornerlat[1],
-				 0.0001, &tanLat) == 0)
-		    {
-			longitude[*npnts] = cornerlon[i];
-			latitude[*npnts] = tanLat;
-			(*npnts)++;
-		    }
-		}
-
-		/* Tangent to y-axis along latitude */
-		/* -------------------------------- */
-		for (i = 0; i < 2; i++)
-		{
-		    bisectParm[1] = cornerlat[i];
-
-		    if (EHbisect(lamazDxDlamda, bisectParm, 3,
-				 cornerlon[0], cornerlon[1],
-				 0.0001, &tanLon) == 0)
-		    {
-			longitude[*npnts] = tanLon;
-			latitude[*npnts] = cornerlat[i];
-			(*npnts)++;
-		    }
-		}
-
-
-		/* Tangent to x-axis along longitude */
-		/* --------------------------------- */
-		for (i = 0; i < 2; i++)
-		{
-		    bisectParm[1] = cornerlon[i];
-
-		    if (EHbisect(lamazDyDtheta, bisectParm, 3,
-				 cornerlat[0], cornerlat[1],
-				 0.0001, &tanLat) == 0)
-		    {
-			longitude[*npnts] = cornerlon[i];
-			latitude[*npnts] = tanLat;
-			(*npnts)++;
-		    }
-		}
-
-		/* Tangent to x-axis along latitude */
-		/* -------------------------------- */
-		for (i = 0; i < 2; i++)
-		{
-		    lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		    cs[i] = cos(lonrad);
-		    sn[i] = sin(lonrad);
-		}
-		crs01 = cs[0] * sn[1] - cs[1] * sn[0];
-
-		longPol = EHconvAng(projparm[4], HDFE_DMS_RAD);
-		for (i = 0; i < 2; i++)
+		metabuf = (char *) EHmetagroup(sdInterfaceID, gridname, "g",
+					       "DataField", metaptrs);
+		if(metabuf == NULL)
 		{
-		    csTest = cos(longPol);
-		    snTest = sin(longPol);
-
-		    crsTest[0] = cs[0] * snTest - csTest * sn[0];
-		    crsTest[1] = cs[1] * snTest - csTest * sn[1];
-
-		    if ((crs01 > 0 && crsTest[0] > 0 && crsTest[1] < 0) ||
-			(crs01 < 0 && crsTest[0] < 0 && crsTest[1] < 0) ||
-			(crs01 < 0 && crsTest[0] > 0 && crsTest[1] < 0) ||
-			(crs01 < 0 && crsTest[0] > 0 && crsTest[1] > 0))
-		    {
-			longitude[*npnts] = EHconvAng(longPol, HDFE_RAD_DEG);
-			latitude[*npnts] = cornerlat[0];
-			(*npnts)++;
-			longitude[*npnts] = EHconvAng(longPol, HDFE_RAD_DEG);
-			latitude[*npnts] = cornerlat[1];
-			(*npnts)++;
-		    }
-		    longPol += dpi;
+		    free(utlstr);
+		    return(-1);
 		}
-	    }
-	}
-	break;
-
-
-      case GCTP_GOOD:
-	{
-	    /* Add "Equator" points for Goode Homolosine if necessary */
-	    /* ------------------------------------------------------ */
-	    if (cornerlat[0] * cornerlat[1] < 0)
-	    {
-		longitude[4] = cornerlon[0];
-		latitude[4] = 0;
-
-		longitude[5] = cornerlon[1];
-		latitude[5] = 0;
-
-		*npnts = 6;
-	    }
-	}
-	break;
-
-
-      case GCTP_LAMCC:
-	{
-	    /* Compute sine and cosine of corner longitudes */
-	    /* -------------------------------------------- */
-	    for (i = 0; i < 2; i++)
-	    {
-		lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		cs[i] = cos(lonrad);
-		sn[i] = sin(lonrad);
-	    }
-
-
-	    /* Compute dot product */
-	    /* ------------------- */
-	    dotPrd = cs[0] * cs[1] + sn[0] * sn[1];
-
-
-	    /* Convert central meridian (DMS to DEG) & compute sin & cos */
-	    /* --------------------------------------------------------- */
-	    centMerd = EHconvAng(projparm[4], HDFE_DMS_DEG);
-	    lonrad = EHconvAng(centMerd, HDFE_DEG_RAD);
-	    cs[1] = cos(lonrad);
-	    sn[1] = sin(lonrad);
-
-
-	    /* If box brackets central meridian ... */
-	    /* ------------------------------------ */
-	    if (cs[0] * cs[1] + sn[0] * sn[1] > dotPrd)
-	    {
-		latitude[4] = cornerlat[0];
-		longitude[4] = centMerd;
-
-		latitude[5] = cornerlat[1];
-		longitude[5] = centMerd;
-
-		*npnts = 6;
-	    }
-	}
-	break;
-
-
-      case GCTP_ALBERS:
-	{
-	    /* Compute sine and cosine of corner longitudes */
-	    /* -------------------------------------------- */
-	    for (i = 0; i < 2; i++)
-	    {
-		lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		cs[i] = cos(lonrad);
-		sn[i] = sin(lonrad);
-	    }
-
-
-	    /* Compute dot product */
-	    /* ------------------- */
-	    dotPrd = cs[0] * cs[1] + sn[0] * sn[1];
-
-
-	    /* Convert central meridian (DMS to DEG) & compute sin & cos */
-	    /* --------------------------------------------------------- */
-	    centMerd = EHconvAng(projparm[4], HDFE_DMS_DEG);
-	    lonrad = EHconvAng(centMerd, HDFE_DEG_RAD);
-	    cs[1] = cos(lonrad);
-	    sn[1] = sin(lonrad);
-
-
-	    /* If box brackets central meridian ... */
-	    /* ------------------------------------ */
-	    if (cs[0] * cs[1] + sn[0] * sn[1] > dotPrd)
-	    {
-		latitude[4] = cornerlat[0];
-		longitude[4] = centMerd;
-
-		latitude[5] = cornerlat[1];
-		longitude[5] = centMerd;
-
-		*npnts = 6;
-	    }
-	}
-	break;
-
 
-      case GCTP_POLYC:
-	{
-	    /* Compute sine and cosine of corner longitudes */
-	    /* -------------------------------------------- */
-	    for (i = 0; i < 2; i++)
-	    {
-		lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		cs[i] = cos(lonrad);
-		sn[i] = sin(lonrad);
-	    }
-
-
-	    /* Compute dot product */
-	    /* ------------------- */
-	    dotPrd = cs[0] * cs[1] + sn[0] * sn[1];
-
-
-	    /* Convert central meridian (DMS to DEG) & compute sin & cos */
-	    /* --------------------------------------------------------- */
-	    centMerd = EHconvAng(projparm[4], HDFE_DMS_DEG);
-	    lonrad = EHconvAng(centMerd, HDFE_DEG_RAD);
-	    cs[1] = cos(lonrad);
-	    sn[1] = sin(lonrad);
-
-
-	    /* If box brackets central meridian ... */
-	    /* ------------------------------------ */
-	    if (cs[0] * cs[1] + sn[0] * sn[1] > dotPrd)
-	    {
-		latitude[4] = cornerlat[0];
-		longitude[4] = centMerd;
-
-		latitude[5] = cornerlat[1];
-		longitude[5] = centMerd;
-
-		*npnts = 6;
+		nVal = 1;
+		strcpy(&valName[0][0], "DataFieldName");
 	    }
+	    break;
 	}
-	break;
 
+	if (!metabuf || metaptrs[0] == NULL)
+    {
+        free(metabuf);
+        return -1;
+    }
 
-      case GCTP_TM:
+	/*
+	 * Check for presence of 'GROUP="' string If found then old metadata,
+	 * search on OBJECT string
+	 */
+	metaflag = (strstr(metabuf, "GROUP=\"") == NULL) ? 1 : 0;
+	if (metaflag == 0)
 	{
-	    /* Compute sine and cosine of corner longitudes */
-	    /* -------------------------------------------- */
-	    for (i = 0; i < 2; i++)
-	    {
-		lonrad = EHconvAng(cornerlon[i], HDFE_DEG_RAD);
-		cs[i] = cos(lonrad);
-		sn[i] = sin(lonrad);
-	    }
-
+	    nVal = 1;
+	    strcpy(&valName[0][0], "\t\tOBJECT");
+	}
 
-	    /* Compute dot product */
-	    /* ------------------- */
-	    dotPrd = cs[0] * cs[1] + sn[0] * sn[1];
 
+	/* Begin loop through entries in metadata */
+	/* -------------------------------------- */
+	while (1)
+	{
+	    /* Search for first string */
+	    strcpy(utlstr, &valName[0][0]);
+	    strcat(utlstr, "=");
+	    metaptrs[0] = strstr(metaptrs[0], utlstr);
 
-	    for (i = -1; i <= 1; i++)
+	    /* If found within relevant metadata section ... */
+	    if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 	    {
-		centMerd = EHconvAng(projparm[4], HDFE_DMS_DEG);
-		lonrad = EHconvAng(centMerd + 90 * i, HDFE_DEG_RAD);
-		csTest = cos(lonrad);
-		snTest = sin(lonrad);
-
-
-		/* If box brackets meridian ... */
-		/* ---------------------------- */
-		if (csTest * cs[1] + snTest * sn[1] > dotPrd)
+		for (i = 0; i < nVal; i++)
 		{
-		    latitude[*npnts] = cornerlat[0];
-		    longitude[*npnts] = centMerd;
-		    (*npnts)++;
-
-		    latitude[*npnts] = cornerlat[1];
-		    longitude[*npnts] = centMerd;
-		    (*npnts)++;
+		    /*
+		     * Get all string values Don't count quotes
+		     */
+		    EHgetmetavalue(metaptrs, &valName[i][0], utlstr);
+		    *strbufsize += (int32)strlen(utlstr) - 2;
 		}
-	    }
-
-
+		/* Increment number of entries */
+		nEntries++;
 
-	    /* Compute sine and cosine of corner latitudes */
-	    /* ------------------------------------------- */
-	    for (i = 0; i < 2; i++)
-	    {
-		latrad = EHconvAng(cornerlat[i], HDFE_DEG_RAD);
-		cs[i] = cos(latrad);
-		sn[i] = sin(latrad);
+		/* Go to end of OBJECT */
+		metaptrs[0] = strstr(metaptrs[0], "END_OBJECT");
 	    }
-
-
-	    /* Compute dot product */
-	    /* ------------------- */
-	    dotPrd = cs[0] * cs[1] + sn[0] * sn[1];
-
-
-	    /* Convert origin latitude (DMS to DEG) & compute sin & cos */
-	    /* -------------------------------------------------------- */
-	    orgLat = EHconvAng(projparm[5], HDFE_DMS_DEG);
-	    latrad = EHconvAng(orgLat, HDFE_DEG_RAD);
-	    cs[1] = cos(latrad);
-	    sn[1] = sin(latrad);
-
-
-	    /* If box brackets origin latitude ... */
-	    /* ----------------------------------- */
-	    if (cs[0] * cs[1] + sn[0] * sn[1] > dotPrd)
+	    else
+		/* No more entries found */
 	    {
-		latitude[*npnts] = orgLat;
-		longitude[*npnts] = cornerlon[0];
-		(*npnts)++;
-
-		latitude[*npnts] = orgLat;
-		longitude[*npnts] = cornerlon[1];
-		(*npnts)++;
+		break;
 	    }
 	}
-	break;
+	free(metabuf);
 
 
-      case GCTP_HOM:
+	/* Count comma separators & slashes (if mappings) */
+	/* ---------------------------------------------- */
+	if (nEntries > 0)
 	{
-	    /* Tangent to y-axis along longitude */
-	    /* --------------------------------- */
-	    if (projparm[12] == 0)
-	    {
-		cs[0] = cos(EHconvAng(projparm[8], HDFE_DMS_RAD));
-		sn[0] = sin(EHconvAng(projparm[8], HDFE_DMS_RAD));
-		cs[1] = cos(EHconvAng(projparm[9], HDFE_DMS_RAD));
-		sn[1] = sin(EHconvAng(projparm[9], HDFE_DMS_RAD));
-		cs[2] = cos(EHconvAng(projparm[10], HDFE_DMS_RAD));
-		sn[2] = sin(EHconvAng(projparm[10], HDFE_DMS_RAD));
-		cs[3] = cos(EHconvAng(projparm[11], HDFE_DMS_RAD));
-		sn[3] = sin(EHconvAng(projparm[11], HDFE_DMS_RAD));
-
-		bisectParm[3] = atan2(
-			    (cs[1] * sn[3] * cs[0] - sn[1] * cs[3] * cs[2]),
-			   (sn[1] * cs[3] * sn[2] - cs[1] * sn[3] * sn[0]));
-		bisectParm[0] = atan(
-		 (sin(bisectParm[3]) * sn[0] - cos(bisectParm[3]) * cs[0]) /
-				     (sn[1] / cs[1]));
-		bisectParm[2] = bisectParm[3] + 0.5 * dpi;
-	    }
-	    else
-	    {
-		cs[0] = cos(EHconvAng(projparm[3], HDFE_DMS_RAD));
-		sn[0] = sin(EHconvAng(projparm[3], HDFE_DMS_RAD));
-		cs[1] = cos(EHconvAng(projparm[4], HDFE_DMS_RAD));
-		sn[1] = sin(EHconvAng(projparm[4], HDFE_DMS_RAD));
-
-		bisectParm[0] = asin(cs[1] * sn[0]);
-		bisectParm[2] = atan2(-cs[0], (-sn[1] * sn[0])) + 0.5 * dpi;
-	    }
-
-	    for (i = 0; i < 2; i++)
-	    {
-		bisectParm[1] = cornerlon[i];
-
-		if (EHbisect(homDyDtheta, bisectParm, 3,
-			     cornerlat[0], cornerlat[1],
-			     0.0001, &tanLat) == 0)
-		{
-		    longitude[*npnts] = cornerlon[i];
-		    latitude[*npnts] = tanLat;
-		    (*npnts)++;
-		}
-	    }
-
+	    *strbufsize += nEntries - 1;
+	    *strbufsize += (nVal - 1) * nEntries;
 	}
-	break;
     }
 
 
-    return (status);
+    /* Set nEntries to -1 if error status exists */
+    /* ----------------------------------------- */
+    if (status == -1)
+    {
+	nEntries = -1;
+    }
+
+    free(utlstr);
+    return (nEntries);
 }
 
 
 
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdefboxregion                                                   |
+|  FUNCTION: GDinqgrid                                                        |
 |                                                                             |
-|  DESCRIPTION: Defines region for subsetting in a grid.                      |
+|  DESCRIPTION: Returns number and names of grid structures in file           |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  regionID       int32               Region ID                               |
+|  nGrid          int32               Number of grid structures in file       |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  cornerlon      float64  dec deg    Longitude of opposite corners of box    |
-|  cornerlat      float64  dec deg    Latitude of opposite corners of box     |
-|                                                                             |
+|  filename       char                HDF-EOS filename                        |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  gridlist       char                List of grid names (comma-separated)    |
+|  strbufsize     int32               Length of gridlist                      |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -7760,616 +3218,216 @@ GDtangentpnts(int32 projcode, float64 projparm[], float64 cornerlon[],
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    "Clamp" subset region around grid                   |
-|  Oct 96   Joel Gales    Fix "outside region" check                          |
-|  Nov 96   Joel Gales    Add check for "tangent" points (GDtangentpnts)      |
-|  Dec 96   Joel Gales    Trap if no projection code defined                  |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Mar 99   David Wynne   Fix for NCR 21195, allow subsetting of MISR SOM     |
-|                         data sets                                           |
-|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int32
-GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
+GDinqgrid(const char *filename, char *gridlist, int32 * strbufsize)
 {
-    intn            i;		    /* Loop index */
-    intn            j;		    /* Loop index */
-    intn            k;		    /* Loop index */
-    intn            n;		    /* Loop index */
-    intn            status = 0;	    /* routine return status variable */
-
-    int32           fid;	    /* HDF-EOS file ID */
-    int32           sdInterfaceID;  /* HDF SDS interface ID */
-    int32           gdVgrpID;	    /* Grid root Vgroup ID */
-    int32           regionID = -1;  /* Region ID */
-    int32           xdimsize;	    /* XDim size */
-    int32           ydimsize;	    /* YDim size */
-    int32           projcode;	    /* Projection code */
-    int32           zonecode;	    /* Zone code */
-    int32           spherecode;	    /* Sphere code */
-    int32           row[32];	    /* Row array */
-    int32           col[32];	    /* Column array */
-    int32           minCol = 0;	    /* Minimum column value */
-    int32           minRow = 0;	    /* Minimum row value */
-    int32           maxCol = 0;	    /* Maximum column value */
-    int32           maxRow = 0;	    /* Maximum row value */
-    int32           npnts;	    /* Number of boundary
-                                       (edge & tangent) pnts */
-
-    float64         longitude[32];  /* Longitude array */
-    float64         latitude[32];   /* Latitude array */
-    float64         upleftpt[2];    /* Upper left pt coordinates */
-    float64         lowrightpt[2];  /* Lower right pt coordinates */
-    float64         somupleftpt[2]; /* temporary Upper left pt coordinates
-                                       for SOM projection */
-    float64         somlowrightpt[2];   /* temporary Lower right pt
-                                           coordinates for SOM projection */
-    float64         projparm[16];   /* Projection parameters */
-    float64         xscale;	    /* X scale */
-    float64         yscale;	    /* Y scale */
-    float64         lonrad0;	    /* Longitude of upper left point
-                                       (radians) */
-    float64         latrad0;	    /* Latitude of upper left point (radians) */
-    float64         lonrad2;	    /* Longitude of point (radians) */
-    float64         latrad2;	    /* Latitude of point (radians) */
-
-    /* Used for SOM projection  */
-    char            *utlbuf;
-    char            *gridname;
-    int32	    blockindexstart = -1;
-    int32	    blockindexstop = -1;
-    float32         offset[180];
-    float64         templeftpt[2];
-    float64         temprightpt[2];
-    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
-    float64         xmtr[2], ymtr[2];
-    float64         lon[2],lat[2];
-    float64         xcor[2], ycor[2];
-    int32           nlatlon;
-    float64         upleftpt_m[2];
-
+    int32           nGrid;	/* Number of grid structures in file */
 
-    utlbuf = (char *)calloc(128, sizeof(char));
-    if(utlbuf == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDdefboxregion", __FILE__, __LINE__);
-	return(-1);
-    }
-    gridname = (char *)calloc(128, sizeof(char));
-    if(gridname == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDdefboxregion", __FILE__, __LINE__);
-	free(utlbuf);
-	return(-1);
-    }
+    /* Call "EHinquire" routine */
+    /* ------------------------ */
+    nGrid = EHinquire(filename, "GRID", gridlist, strbufsize);
 
-    /* Check for valid grid ID */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDdefboxregion",
-		       &fid, &sdInterfaceID, &gdVgrpID);
+    return (nGrid);
+}
 
 
-    if (status == 0)
-    {
-	/* Get grid info */
-	/* ------------- */
-	status = GDgridinfo(gridID, &xdimsize, &ydimsize,
-			    upleftpt, lowrightpt);
 
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: GDgetfillvalue                                                   |
+|                                                                             |
+|  DESCRIPTION: Retrieves fill value for a specified field.                   |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  gridID         int32               grid structure ID                       |
+|  fieldname      char                field name                              |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  fillval        void                fill value                              |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+intn
+GDgetfillvalue(int32 gridID, const char *fieldname, VOIDP fillval)
+{
+    intn            status;	/* routine return status variable */
 
-	/* If error then bail */
-	/* ------------------ */
-	if (status != 0)
-	{
-	    regionID = -1;
-	    free(utlbuf);
-	    free(gridname);
-	    return (regionID);
-	}
+    int32           nt;		/* Number type */
+    int32           dims[8];	/* Dimensions array */
+    int32           dum;	/* Dummy variable */
 
+    char            name[80];	/* Fill value "attribute" name */
 
-	/* Get proj info */
-	/* ------------- */
-	status = GDprojinfo(gridID, &projcode, &zonecode,
-			    &spherecode, projparm);
+    status = GDchkgdid(gridID, "GDgetfillvalue", &dum, &dum, &dum);
 
+    /* Check for valid grid ID */
+    if (status == 0)
+    {
+	/* Get field info */
+	status = GDfieldinfo(gridID, fieldname, &dum, dims, &nt, NULL);
 
-	/* If no projection code defined then bail */
-	/* --------------------------------------- */
-	if (projcode == -1)
+	if (status == 0)
 	{
-	    regionID = -1;
-	    free(utlbuf);
-	    free(gridname);
-	    return (regionID);
+	    /* Read fill value attribute */
+	    strcpy(name, "_FV_");
+	    strcat(name, fieldname);
+	    status = GDreadattr(gridID, name, fillval);
 	}
-
-
-	/* Get default values for upleft and lowright if necessary */
-	/* ------------------------------------------------------- */
-	if (upleftpt[0] == 0 && upleftpt[1] == 0 &&
-	    lowrightpt[0] == 0 && lowrightpt[1] == 0)
+	else
 	{
-	    status = GDgetdefaults(projcode, zonecode, projparm, spherecode,
-				   upleftpt, lowrightpt);
-
-	    /* If error then bail */
-	    /* ------------------ */
-	    if (status != 0)
-	    {
-		regionID = -1;
-		free(utlbuf);
-		free(gridname);
-		return (regionID);
-	    }
+	    HEpush(DFE_GENAPP, "GDgetfillvalue", __FILE__, __LINE__);
+	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
 	}
 
+    }
+    return (status);
+}
 
 
-	/* Fill-up longitude and latitude arrays */
-	/* ------------------------------------- */
-	longitude[0] = cornerlon[0];
-	latitude[0] = cornerlat[0];
-
-	longitude[1] = cornerlon[0];
-	latitude[1] = cornerlat[1];
-
-	longitude[2] = cornerlon[1];
-	latitude[2] = cornerlat[0];
-
-	longitude[3] = cornerlon[1];
-	latitude[3] = cornerlat[1];
-
-	npnts = 4;
-
-
-	/* Find additional tangent points from GDtangentpnts */
-	/* ------------------------------------------------- */
-	status = GDtangentpnts(projcode, projparm, cornerlon, cornerlat,
-			       longitude, latitude, &npnts);
-
-        /* If SOM projection with projparm[11] non-zero ... */
-        if (projcode == GCTP_SOM && projparm[11] != 0)
-        {
-            int gID = gridID % idOffset;
-            if (gID >= NGRID)
-            {
-               free(utlbuf);
-               free(gridname);
-               return -1;
-            }
-
-            Vgetname(GDXGrid[gID].IDTable, gridname);
-            snprintf(utlbuf, 128, "%s%s", "_BLKSOM:", gridname);
-	    status = GDreadattr(gridID, utlbuf, offset);
-
-            somupleftpt[0] = upleftpt[0];
-            somupleftpt[1] = upleftpt[1];
-            somlowrightpt[0]= lowrightpt[0];
-            somlowrightpt[1] = lowrightpt[1];
-
-            k = 0;
-            n = 2;
-
-            for (j = 0; j <= projparm[11] - 1; j++)
-            {
-
-		/* Convert from lon/lat to row/col */
-		/* ------------------------------- */
-		status = GDll2ij(projcode, zonecode, projparm, spherecode,
-			 xdimsize, ydimsize, somupleftpt, somlowrightpt,
-			 npnts, longitude, latitude, row, col, NULL, NULL);
-
-
-	       /* Find min/max values for row & col */
-	       /* --------------------------------- */
-	       minCol = col[0];
-	       minRow = row[0];
-	       maxCol = col[0];
-	       maxRow = row[0];
-	       for (i = 1; i < npnts; i++)
-	       {
-	          if (col[i] < minCol)
-	          {
-		     minCol = col[i];
-	          }
-
-	          if (col[i] > maxCol)
-	          {
-		     maxCol = col[i];
-	          }
-
-	          if (row[i] < minRow)
-	          {
-		     minRow = row[i];
-	          }
-
-	          if (row[i] > maxRow)
-	          {
-		     maxRow = row[i];
-	           }
-	        }
-
-
-
-	        /* "Clamp" if outside Grid */
-	        /* ----------------------- */
-	        minCol = (minCol < 0) ? 0 : minCol;
-	        minRow = (minRow < 0) ? 0 : minRow;
-
-	        maxCol = (maxCol >= xdimsize) ? xdimsize - 1 : maxCol;
-	        maxRow = (maxRow >= ydimsize) ? ydimsize - 1 : maxRow;
-
-
-	        /* Check whether subset region is outside grid region */
-	        /* -------------------------------------------------- */
-	        if (minCol >= xdimsize || minRow >= ydimsize ||
-		    maxCol < 0 || maxRow < 0)
-	        {
-                   if ( blockindexstart == -1 && (projparm[11]) == j)
-                   {
-                      status = -1;
-	              HEpush(DFE_GENAPP, "GDdefboxregion", __FILE__, __LINE__);
-	              HEreport("Subset Region outside of Grid Region\n");
-                      regionID = -1;
-                   }
-	        }
-                else
-                {
-                   if (k == 0)
-                   {
-                      blockindexstart = j;
-                      blockindexstop = j;
-                      k = 1;
-                   }
-                   else
-                   {
-                      blockindexstop = j;
-                   }
-                }
-
-                // E. Rouault: FIXME: was really abs(int) indented here ? Forcing the cast to int to please compilers
-                templeftpt[0] = upleftpt[0] + ((offset[j]/xdimsize)*abs((int)(upleftpt[0] - lowrightpt[0]))) + abs((int)(upleftpt[0] - lowrightpt[0]))*(n-1);
-                templeftpt[1] = upleftpt[1] + ((lowrightpt[1] - upleftpt[1]))*(n-1);
-
-                temprightpt[0] = lowrightpt[0] + ((offset[j]/xdimsize)*abs((int)(lowrightpt[0] - upleftpt[0]))) + abs((int)(lowrightpt[0] - upleftpt[0]))*(n-1);
-                temprightpt[1] = lowrightpt[1] + ((upleftpt[1] - lowrightpt[1]))*(n-1);
-
-                somupleftpt[0] = templeftpt[0];
-                somupleftpt[1] = templeftpt[1];
-
-                somlowrightpt[0] = temprightpt[0];
-                somlowrightpt[1] = temprightpt[1];
-                n++;
-             }
-         }
-         else
-         {
-
-	    /* Convert from lon/lat to row/col */
-	    /* ------------------------------- */
-
-	    status = GDll2ij(projcode, zonecode, projparm, spherecode,
-			 xdimsize, ydimsize, upleftpt, lowrightpt,
-			 npnts, longitude, latitude, row, col, NULL, NULL);
-
-	    /* Find min/max values for row & col */
-	    /* --------------------------------- */
-	    minCol = col[0];
-	    minRow = row[0];
-	    maxCol = col[0];
-	    maxRow = row[0];
-	    for (i = 1; i < npnts; i++)
-	    {
-	       if (col[i] < minCol)
-	       {
-		  minCol = col[i];
-	       }
-
-	       if (col[i] > maxCol)
-	       {
-	          maxCol = col[i];
-	       }
-
-	       if (row[i] < minRow)
-	       {
-		  minRow = row[i];
-	       }
-
-	       if (row[i] > maxRow)
-	       {
-		  maxRow = row[i];
-	       }
-	    }
-
-
-
-	    /* "Clamp" if outside Grid */
-	    /* ----------------------- */
-	    minCol = (minCol < 0) ? 0 : minCol;
-	    minRow = (minRow < 0) ? 0 : minRow;
-
-	    maxCol = (maxCol >= xdimsize) ? xdimsize - 1 : maxCol;
-	    maxRow = (maxRow >= ydimsize) ? ydimsize - 1 : maxRow;
-
-
-	    /* Check whether subset region is outside grid region */
-	    /* -------------------------------------------------- */
-	    if (minCol >= xdimsize || minRow >= ydimsize || maxCol < 0 || maxRow < 0)
-	    {
-	       status = -1;
-	       HEpush(DFE_GENAPP, "GDdefboxregion", __FILE__, __LINE__);
-	       HEreport("Subset Region outside of Grid Region\n");
-	       regionID = -1;
-
-	    }
-         }
-	    if (status == 0)
-	    {
-	       /* Store grid region info */
-	       /* ---------------------- */
-	       for (i = 0; i < NGRIDREGN; i++)
-	       {
-		/* Find first empty grid region */
-		/* ---------------------------- */
-		if (GDXRegion[i] == 0)
-		{
-		    /* Allocate space for grid region entry */
-		    /* ------------------------------------ */
-		    GDXRegion[i] = (struct gridRegion *)
-			calloc(1, sizeof(struct gridRegion));
-		    if(GDXRegion[i] == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"GDdefboxregion", __FILE__, __LINE__);
-			free(utlbuf);
-			free(gridname);
-			return(-1);
-		    }
-
-
-		    /* Store file and grid ID */
-		    /* ---------------------- */
-		    GDXRegion[i]->fid = fid;
-		    GDXRegion[i]->gridID = gridID;
-
-
-		    /* Initialize vertical subset entries to -1 */
-		    /* ---------------------------------------- */
-		    for (j = 0; j < 8; j++)
-		    {
-			GDXRegion[i]->StartVertical[j] = -1;
-			GDXRegion[i]->StopVertical[j] = -1;
-		    }
-
 
-		    /* Store start & count along x & y */
-		    /* ------------------------------- */
-		    GDXRegion[i]->xStart = minCol;
-		    GDXRegion[i]->xCount = maxCol - minCol + 1;
-		    GDXRegion[i]->yStart = minRow;
-		    GDXRegion[i]->yCount = maxRow - minRow + 1;
 
 
-		    /* Store upleft and lowright points of subset region */
-		    /* ------------------------------------------------- */
-		    if (projcode == GCTP_GEO )
-		    {
-			/* GEO projection */
-			/* ------------------------ */
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: GDdetach                                                         |
+|                                                                             |
+|  DESCRIPTION: Detaches from grid interface and performs file housekeeping.  |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  gridID         int32               grid structure ID                       |
+|                                                                             |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|             None                                                            |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Sep 96   Joel Gales    Setup dim names for SDsetdimname in dimbuf1 rather  |
+|                         that utlstr                                         |
+|  Oct 96   Joel Gales    Detach Grid Vgroups                                 |
+|  Oct 96   Joel Gales    "Detach" from SDS                                   |
+|  Nov 96   Joel Gales    Call GDchkgdid to check for proper grid ID          |
+|  Dec 96   Joel Gales    Add multiple vertical subsetting garbage collection |
+|  Oct 98   Abe Taaheri   Added GDXRegion[k]->DimNamePtr[i] =0; after freeing |
+|                         memory                                              |
+|  Sep 99   Abe Taaheri   Changed memcpy to memmove because of overlapping    |
+|                         source and destination for GDXSDcomb, nameptr, and  |
+|                         dimptr. memcpy may cause unexpected results.        |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+intn
+GDdetach(int32 gridID)
 
-			/* Convert upleft & lowright lon from DMS to radians */
-			/* ------------------------------------------------- */
-			lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
-			lonrad2 = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
+{
+    intn            i;		/* Loop index */
+    intn            k;		/* Loop index */
+    intn            status = 0;	/* routine return status variable */
 
-			/* Compute X scale */
-			/* --------------- */
-			xscale = (lonrad2 - lonrad0) / xdimsize;
+    int32           sdInterfaceID;	/* SDS interface ID */
+    int32           gID;	/* Grid ID - offset */
+    int32           idOffset = GDIDOFFSET;	/* Grid ID offset */
+    int32           dum;	/* Dummy variable */
 
-			/* Convert upleft & lowright lat from DMS to radians */
-			/* ------------------------------------------------- */
-			latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
-			latrad2 = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
+    char            gridname[VGNAMELENMAX + 1];	/* Grid name */
 
-			/* Compute Y scale */
-			/* --------------- */
-			yscale = (latrad2 - latrad0) / ydimsize;
 
+    status = GDchkgdid(gridID, "GDdetach", &dum, &sdInterfaceID, &dum);
 
-			/* MinCol -> radians -> DMS -> upleftpt[0] */
-			/* --------------------------------------- */
-			GDXRegion[i]->upleftpt[0] =
-			    EHconvAng(lonrad0 + xscale * minCol,
-				      HDFE_RAD_DMS);
+    if (status == 0)
+    {
+	gID = gridID % idOffset;
+	if (gID >= NGRID)
+	{
+	   return -1;
+	}
+	Vgetname(GDXGrid[gID].IDTable, gridname);
 
 
-			/* MinRow -> radians -> DMS -> upleftpt[1] */
-			/* --------------------------------------- */
-			GDXRegion[i]->upleftpt[1] =
-			    EHconvAng(latrad0 + yscale * minRow,
-				      HDFE_RAD_DMS);
+	/* "Detach" from previously attached SDSs */
+	/* -------------------------------------- */
+	for (k = 0; k < GDXGrid[gID].nSDS; k++)
+	{
+	    SDendaccess(GDXGrid[gID].sdsID[k]);
+	}
+	free(GDXGrid[gID].sdsID);
+	GDXGrid[gID].sdsID = 0;
+	GDXGrid[gID].nSDS = 0;
 
 
-			/* MinCol + 1 -> radians -> DMS -> lowrightpt[0] */
-			/* --------------------------------------------- */
-			GDXRegion[i]->lowrightpt[0] =
-			    EHconvAng(lonrad0 + xscale * (maxCol + 1),
-				      HDFE_RAD_DMS);
 
+	/* Detach Grid Vgroups */
+	/* ------------------- */
+	Vdetach(GDXGrid[gID].VIDTable[0]);
+	Vdetach(GDXGrid[gID].VIDTable[1]);
+	Vdetach(GDXGrid[gID].IDTable);
 
-			/* MinRow + 1 -> radians -> DMS -> lowrightpt[1] */
-			/* --------------------------------------------- */
-			GDXRegion[i]->lowrightpt[1] =
-			    EHconvAng(latrad0 + yscale * (maxRow + 1),
-				      HDFE_RAD_DMS);
-		    }
-		    else if (projcode == GCTP_BCEA)
-		    {
-			/* BCEA projection */
-			/* -------------- */
-		      nlatlon = 2;
-		      lon[0] = upleftpt[0];
-		      lon[1] = lowrightpt[0];
-		      lat[0] = upleftpt[1];
-		      lat[1] = lowrightpt[1];
-		      status =
-			GDll2mm_cea(projcode,zonecode,spherecode,projparm,
-				    xdimsize, ydimsize,
-				    upleftpt, lowrightpt,nlatlon,
-				    lon, lat,
-				    xcor, ycor, &xscale, &yscale);
-		      upleftpt_m[0] = xcor[0];
-		      upleftpt_m[1] = ycor[0];
-
-
-		      if (status == -1)
-			{
-			  HEpush(DFE_GENAPP, "GDdefboxregion", __FILE__, __LINE__);
-			  free(utlbuf);
-			  free(gridname);
-			  return (status);
-			}
+	GDXGrid[gID].active = 0;
+	GDXGrid[gID].VIDTable[0] = 0;
+	GDXGrid[gID].VIDTable[1] = 0;
+	GDXGrid[gID].IDTable = 0;
+	GDXGrid[gID].fid = 0;
 
-			/* MinCol -> meters -> upleftpt[0] */
-			/* ------------------------------- */
-			xmtr[0] = upleftpt_m[0] + xscale * minCol;
-
-			/* MinRow -> meters -> upleftpt[1] */
-			/* ------------------------------- */
-			ymtr[0] = upleftpt_m[1] + yscale * minRow;
-
-			/* MinCol + 1 -> meters -> lowrightpt[0] */
-			/* ------------------------------------- */
-			xmtr[1] = upleftpt_m[0] + xscale * (maxCol + 1);
-
-			/* MinRow + 1 -> meters -> lowrightpt[1] */
-			/* ------------------------------------- */
-			ymtr[1] = upleftpt_m[1] + yscale * (maxRow + 1);
-
-			/* Convert upleft & lowright lon from DMS to radians */
-			/* ------------------------------------------------- */
-			npnts = 2;
-			status = GDmm2ll_cea(projcode, zonecode, spherecode,
-					     projparm, xdimsize, ydimsize,
-					     upleftpt, lowrightpt, npnts,
-					     xmtr,  ymtr,
-					     longitude, latitude);
-			if (status == -1)
-			  {
-			    HEpush(DFE_GENAPP, "GDdefboxregion", __FILE__, __LINE__);
-			    free(utlbuf);
-			    free(gridname);
-			    return (status);
-			}
-			GDXRegion[i]->upleftpt[0] = longitude[0];
 
-			GDXRegion[i]->upleftpt[1] = latitude[0];
 
-			GDXRegion[i]->lowrightpt[0] = longitude[1];
 
-			GDXRegion[i]->lowrightpt[1] = latitude[1];
-		    }
-		    else if (projcode == GCTP_SOM)
-                    {
-		       /* Store start & count along x & y */
-		       /* ------------------------------- */
-		       GDXRegion[i]->xStart = 0;
-		       GDXRegion[i]->xCount = xdimsize;
-		       GDXRegion[i]->yStart = 0;
-		       GDXRegion[i]->yCount = ydimsize;
-
-                       GDXRegion[i]->somStart = blockindexstart;
-                       GDXRegion[i]->somCount = blockindexstop - blockindexstart + 1;
-
-		       /* Store upleft and lowright points of subset region */
-		       /* ------------------------------------------------- */
-                       if (blockindexstart == 0)
-                       {
-                          GDXRegion[i]->upleftpt[0] = upleftpt[0];
-                          GDXRegion[i]->upleftpt[1] = upleftpt[1];
-                          GDXRegion[i]->lowrightpt[0] = lowrightpt[0];
-                          GDXRegion[i]->lowrightpt[1] = lowrightpt[1];
-                       }
-                       else
-                       {
-                          GDXRegion[i]->upleftpt[0] =
-			    (lowrightpt[0] - upleftpt[0])*
-			    (offset[blockindexstart-1]/xdimsize) + upleftpt[0];
-                          GDXRegion[i]->upleftpt[1] =
-			    (lowrightpt[1] - upleftpt[1])*
-			    (blockindexstart+1-1) + upleftpt[1];
-
-                          GDXRegion[i]->lowrightpt[0] =
-			    (lowrightpt[0] - upleftpt[0])*
-			    (offset[blockindexstart-1]/xdimsize) + lowrightpt[0];
-                          GDXRegion[i]->lowrightpt[1] =
-			    (lowrightpt[1] - upleftpt[1])*
-			    (blockindexstart+1-1) + lowrightpt[1];
-
-                       }
-                    }
-                    else
+	/* Free Region Pointers */
+	/* -------------------- */
+	for (k = 0; k < NGRIDREGN; k++)
+	{
+	    if (GDXRegion[k] != 0 &&
+		GDXRegion[k]->gridID == gridID)
+	    {
+		for (i = 0; i < 8; i++)
+		{
+		    if (GDXRegion[k]->DimNamePtr[i] != 0)
 		    {
-			/* Non-GEO, Non-BCEA projections */
-			/* ---------------------------- */
-
-			/* Compute X & Y scale */
-			/* ------------------- */
-			xscale = (lowrightpt[0] - upleftpt[0]) / xdimsize;
-			yscale = (lowrightpt[1] - upleftpt[1]) / ydimsize;
-
-
-			/* MinCol -> meters -> upleftpt[0] */
-			/* ------------------------------- */
-			GDXRegion[i]->upleftpt[0] = upleftpt[0] +
-			    xscale * minCol;
-
-
-			/* MinRow -> meters -> upleftpt[1] */
-			/* ------------------------------- */
-			GDXRegion[i]->upleftpt[1] = upleftpt[1] +
-			    yscale * minRow;
-
-
-			/* MinCol + 1 -> meters -> lowrightpt[0] */
-			/* ------------------------------------- */
-			GDXRegion[i]->lowrightpt[0] = upleftpt[0] +
-			    xscale * (maxCol + 1);
-
-
-			/* MinRow + 1 -> meters -> lowrightpt[1] */
-			/* ------------------------------------- */
-			GDXRegion[i]->lowrightpt[1] = upleftpt[1] +
-			  yscale * (maxRow + 1);
+			free(GDXRegion[k]->DimNamePtr[i]);
+			GDXRegion[k]->DimNamePtr[i] = 0;
 		    }
-
-		    /* Store region ID */
-		    /* --------------- */
-		    regionID = i;
-		    break;
 		}
 
+		free(GDXRegion[k]);
+		GDXRegion[k] = 0;
+	    }
 	}
-      }
-
     }
-    free(utlbuf);
-    free(gridname);
-    return (regionID);
+    return (status);
 }
-#endif
-
 
 
-#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDregioninfo                                                     |
+|  FUNCTION: GDclose                                                          |
 |                                                                             |
-|  DESCRIPTION: Retrieves size of region in bytes.                            |
+|  DESCRIPTION: Closes file.                                                  |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -8377,18 +3435,11 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  regionID       int32               Region ID                               |
-|  fieldname      char                Fieldname                               |
+|  fid            int32               File ID                                 |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  ntype          int32               field number type                       |
-|  rank           int32               field rank                              |
-|  dims           int32               dimensions of field region              |
-|  size           int32               size in bytes of field region           |
-|  upleftpt       float64             Upper left corner coord for region      |
-|  lowrightpt     float64             Lower right corner coord for region     |
+|             None                                                            |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -8396,1014 +3447,822 @@ GDdefboxregion(int32 gridID, float64 cornerlon[], float64 cornerlat[])
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Add vertical subsetting                             |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Apr 99   David Wynne   Added support for MISR SOM projection, NCR 21195    |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-GDregioninfo(int32 gridID, int32 regionID, const char *fieldname,
-	     int32 * ntype, int32 * rank, int32 dims[], int32 * size,
-	     float64 upleftpt[], float64 lowrightpt[])
+GDclose(int32 fid)
+
 {
-    intn            j;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           l_index;	/* Dimension l_index */
+    /* Call EHclose to perform file close */
+    /* ---------------------------------- */
+    status = EHclose(fid);
 
-    char            dimlist[256];	/* Dimension list */
-    const char           *errMesg = "Vertical Dimension Not Found: \"%s\".\n";
-    const char           *errM1 = "Both \"XDim\" and \"YDim\" must be present ";
-    const char           *errM2 = "in the dimension list for \"%s\".\n";
-    char            errbuf[256];/* Error buffer */
+    return (status);
+}
 
 
-    /* Check for valid grid ID */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDregioninfo", &fid, &sdInterfaceID,
-		       &gdVgrpID);
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: GDgetdefaults                                                    |
+|                                                                             |
+|  DESCRIPTION:                                                               |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  projcode       int32               GCTP projection code                    |
+|  zonecode       int32               UTM zone code                           |
+|  projparm       float64             Projection parameters                   |
+|  spherecode     int32               GCTP spheriod code                      |
+|  upleftpt       float64             upper left corner coordinates           |
+|  lowrightpt     float64             lower right corner coordinates          |
+|                                                                             |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  upleftpt       float64             upper left corner coordinates           |
+|  lowrightpt     float64             lower right corner coordinates          |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Aug 96   Joel Gales    Original Programmer                                 |
+|  Sep 96   Raj Gejjaga   Fixed  bugs in Polar Stereographic and Goode        | |                         Homolosine default calculations.                    |
+|  Sep 96   Raj Gejjaga   Added code to compute default boundary points       |
+|                         for Lambert Azimuthal Polar and Equatorial          |
+|                         projections.                                        |
+|  Feb 97   Raj Gejjaga   Added code to compute default boundary points       |
+|                         for Integerized Sinusoidal Grid.  Added error       |
+|                         handling code.                                      |
+|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+static intn
+GDgetdefaults(int32 projcode, int32 zonecode, float64 projparm[],
+	      int32 spherecode, float64 upleftpt[], float64 lowrightpt[])
+{
+    int32           errorcode = 0, status = 0;
+    int32(*for_trans[100]) (double, double, double*, double*);
+
+    float64         lon, lat, plat, x, y;
+    float64         plon, tlon, llon, rlon, pplon, LLon, LLat, RLon, RLat;
 
 
-    /* Check for valid region ID */
-    /* ------------------------- */
-    if (status == 0)
+    /* invoke GCTP initialization routine */
+    /* ---------------------------------- */
+    for_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
+	     &errorcode, for_trans);
+
+    /* Report error if any */
+    /* ------------------- */
+    if (errorcode != 0)
     {
-	if (regionID < 0 || regionID >= NGRIDREGN)
-	{
-	    status = -1;
-	    HEpush(DFE_RANGE, "GDregioninfo", __FILE__, __LINE__);
-	    HEreport("Invalid Region id: %d.\n", regionID);
-	}
+	status = -1;
+	HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	HEreport("GCTP Error: %d\n", errorcode);
+	return (status);
     }
 
+    /* Compute Default Boundary Points for EASE Grid          */
+    /* Use Global coverage */
+    /* ------------------------------------------------------ */
+    if (projcode == GCTP_BCEA &&
+	upleftpt[0] == 0 && upleftpt[1] == 0 &&
+	lowrightpt[0] == 0 && lowrightpt[1] == 0)
+    {
+	upleftpt[0] = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LON, HDFE_DEG_DMS);
+	upleftpt[1] = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LAT, HDFE_DEG_DMS);
+	lowrightpt[0] = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LON, HDFE_DEG_DMS);
+	lowrightpt[1] = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LAT, HDFE_DEG_DMS);
+    }
 
-    /* Check for active region ID */
-    /* -------------------------- */
-    if (status == 0)
+/* Compute Default Boundary Points for CEA     */
+   /* --------------------------------------------*/
+   if (projcode == GCTP_CEA &&
+      upleftpt[0] == 0 && upleftpt[1] == 0 &&
+      lowrightpt[0] == 0 && lowrightpt[1] == 0)
+    {
+      LLon = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LON, HDFE_DEG_RAD);
+      LLat = EHconvAng(EASE_GRID_DEFAULT_UPLEFT_LAT, HDFE_DEG_RAD);
+      RLon = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LON, HDFE_DEG_RAD);
+      RLat = EHconvAng(EASE_GRID_DEFAULT_LOWRGT_LAT, HDFE_DEG_RAD);
+
+      errorcode = for_trans[projcode] (LLon, LLat, &x, &y);
+      if (errorcode != 0)
+      {
+           status = -1;
+           HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+           HEreport("GCTP Error: %d\n", errorcode);
+           return (status);
+      }
+        upleftpt[0] = x;
+        upleftpt[1] = y;
+
+      errorcode = for_trans[projcode] (RLon, RLat, &x, &y);
+      if (errorcode != 0)
+      {
+           status = -1;
+           HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+           HEreport("GCTP Error: %d\n", errorcode);
+           return (status);
+      }
+      lowrightpt[0] = x;
+      lowrightpt[1] = y;
+
+    }
+
+
+    /* Compute Default Boundary Points for Polar Sterographic */
+    /* ------------------------------------------------------ */
+    if (projcode == GCTP_PS &&
+	upleftpt[0] == 0 && upleftpt[1] == 0 &&
+	lowrightpt[0] == 0 && lowrightpt[1] == 0)
     {
-	if (GDXRegion[regionID] == 0)
+	/*
+	 * Convert the longitude and latitude from the DMS to decimal degree
+	 * format.
+	 */
+	plon = EHconvAng(projparm[4], HDFE_DMS_DEG);
+	plat = EHconvAng(projparm[5], HDFE_DMS_DEG);
+
+	/*
+	 * Compute the longitudes at 90, 180 and 270 degrees from the central
+	 * longitude.
+	 */
+
+	if (plon <= 0.0)
 	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDregioninfo", __FILE__, __LINE__);
-	    HEreport("Inactive Region ID: %d.\n", regionID);
+	    tlon = 180.0 + plon;
+	    pplon = plon + 360.0;
 	}
-    }
+	else
+	{
+	    tlon = plon - 180.0;
+	    pplon = plon;
+	}
+
+	rlon = pplon + 90.0;
+	if (rlon > 360.0)
+	    rlon = rlon - 360;
+
+	if (rlon > 180.0)
+	    rlon = rlon - 360.0;
+
+	if (rlon <= 0.0)
+	    llon = 180.0 + rlon;
+	else
+	    llon = rlon - 180.0;
 
 
+	/* Convert all four longitudes from decimal degrees to radians */
+	plon = EHconvAng(plon, HDFE_DEG_RAD);
+	tlon = EHconvAng(tlon, HDFE_DEG_RAD);
+	llon = EHconvAng(llon, HDFE_DEG_RAD);
+	rlon = EHconvAng(rlon, HDFE_DEG_RAD);
 
-    /* Check that region defined for this file */
-    /* --------------------------------------- */
-    if (status == 0)
-    {
-	if (GDXRegion[regionID]->fid != fid)
+	errorcode = for_trans[projcode] (llon, 0.0, &x, &y);
+	if (errorcode != 0)
 	{
 	    status = -1;
-	    HEpush(DFE_GENAPP, "GDregioninfo", __FILE__, __LINE__);
-	    HEreport("Region is not defined for this file.\n");
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
-    }
 
+	upleftpt[0] = x;
 
-    /* Check that region defined for this grid */
-    /* --------------------------------------- */
-    if (status == 0)
-    {
-	if (GDXRegion[regionID]->gridID != gridID)
+	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
+	if (errorcode != 0)
 	{
 	    status = -1;
-	    HEpush(DFE_GENAPP, "GDregioninfo", __FILE__, __LINE__);
-	    HEreport("Region is not defined for this Grid.\n");
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
-    }
-
 
+	lowrightpt[0] = x;
 
-    /* Check for valid fieldname */
-    /* ------------------------- */
-    if (status == 0)
-    {
-	status = GDfieldinfo(gridID, fieldname, rank, dims, ntype, dimlist);
+	/*
+	 * Compute the upperleft and lowright y values based on the south or
+	 * north polar projection
+	 */
 
-	if (status != 0)
-	{
-	    /* Fieldname not found in grid */
-	    /* --------------------------- */
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDregioninfo", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" not found.\n",
-		     fieldname);
-	}
-	else if (*rank == 1)
-	{
-	    /* Field is 1 dimensional */
-	    /* ---------------------- */
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDregioninfo", __FILE__, __LINE__);
-	    HEreport(
-		     "One-Dimesional fields \"%s\" may not be subsetted.\n",
-		     fieldname);
-	}
-	else
+	if (plat < 0.0)
 	{
-	    /* "XDim" and/or "YDim" not found */
-	    /* ------------------------------ */
-	    if (EHstrwithin("XDim", dimlist, ',') == -1 ||
-		EHstrwithin("YDim", dimlist, ',') == -1)
+	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
+	    if (errorcode != 0)
 	    {
 		status = -1;
-		HEpush(DFE_GENAPP, "GDregioninfo", __FILE__, __LINE__);
-		snprintf(errbuf, sizeof(errbuf), "%s%s", errM1, errM2);
-		HEreport(errbuf, fieldname);
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
 	    }
-	}
-    }
 
+	    upleftpt[1] = y;
 
+	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
-    /* If no problems ... */
-    /* ------------------ */
-    if (status == 0)
-    {
-        /* Check if SOM projection */
-        /* ----------------------- */
-        if (EHstrwithin("SOMBlockDim", dimlist, ',') == 0)
-        {
-            dims[EHstrwithin("SOMBlockDim", dimlist, ',')] =
-                GDXRegion[regionID]->somCount;
-        }
-
-	/* Load XDim dimension from region entry */
-	/* ------------------------------------- */
-	if (GDXRegion[regionID]->xCount != 0)
-	{
-	    dims[EHstrwithin("XDim", dimlist, ',')] =
-		GDXRegion[regionID]->xCount;
-	}
+	    lowrightpt[1] = y;
 
-	/* Load YDim dimension from region entry */
-	/* ------------------------------------- */
-	if (GDXRegion[regionID]->yCount != 0)
-	{
-	    dims[EHstrwithin("YDim", dimlist, ',')] =
-		GDXRegion[regionID]->yCount;
 	}
-
-
-	/* Vertical Subset */
-	/* --------------- */
-	for (j = 0; j < 8; j++)
+	else
 	{
-
-	    /* If active vertical subset ... */
-	    /* ----------------------------- */
-	    if (GDXRegion[regionID]->StartVertical[j] != -1)
+	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
+	    if (errorcode != 0)
 	    {
-		/* Find vertical dimension within dimlist */
-		/* -------------------------------------- */
-		l_index = EHstrwithin(GDXRegion[regionID]->DimNamePtr[j],
-				    dimlist, ',');
-
-		/* If dimension found ... */
-		/* ---------------------- */
-		if (l_index != -1)
-		{
-		    /* Compute dimension size */
-		    /* ---------------------- */
-		    dims[l_index] =
-			GDXRegion[regionID]->StopVertical[j] -
-			GDXRegion[regionID]->StartVertical[j] + 1;
-		}
-		else
-		{
-		    /* Vertical dimension not found */
-		    /* ---------------------------- */
-		    status = -1;
-		    *size = -1;
-		    HEpush(DFE_GENAPP, "GDregioninfo",
-			   __FILE__, __LINE__);
-		    HEreport(errMesg,
-			     GDXRegion[regionID]->DimNamePtr[j]);
-		}
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
 	    }
-	}
 
+	    upleftpt[1] = y;
 
-	if (status == 0)
-	{
-	    /* Compute number of total elements */
-	    /* -------------------------------- */
-	    *size = dims[0];
-	    for (j = 1; j < *rank; j++)
+	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
+	    if (errorcode != 0)
 	    {
-		*size *= dims[j];
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
 	    }
 
-	    /* Multiply by size in bytes of numbertype */
-	    /* --------------------------------------- */
-	    *size *= DFKNTsize(*ntype);
-
+	    lowrightpt[1] = y;
 
-	    /* Return upper left and lower right subset values */
-	    /* ----------------------------------------------- */
-	    upleftpt[0] = GDXRegion[regionID]->upleftpt[0];
-	    upleftpt[1] = GDXRegion[regionID]->upleftpt[1];
-	    lowrightpt[0] = GDXRegion[regionID]->lowrightpt[0];
-	    lowrightpt[1] = GDXRegion[regionID]->lowrightpt[1];
 	}
     }
-    return (status);
-}
 
 
+    /* Compute Default Boundary Points for Goode Homolosine */
+    /* ---------------------------------------------------- */
+    if (projcode == GCTP_GOOD &&
+	upleftpt[0] == 0 && upleftpt[1] == 0 &&
+	lowrightpt[0] == 0 && lowrightpt[1] == 0)
+    {
+	lon = EHconvAng(-180, HDFE_DEG_RAD);
+	lat = 0.0;
 
+	errorcode = for_trans[projcode] (lon, lat, &x, &y);
+	if (errorcode != 0)
+	{
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
+	}
 
+	upleftpt[0] = -fabs(x);
+	lowrightpt[0] = +fabs(x);
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDextractregion                                                  |
-|                                                                             |
-|  DESCRIPTION: Retrieves data from specified region.                         |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  regionID       int32               Region ID                               |
-|  fieldname      char                Fieldname                               |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  buffer         void                Data buffer containing subsetted region |
-|                                                                             |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Add vertical subsetting                             |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Apr 99   David Wynne   Add support for MISR SOM projection, NCR 21195      |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDextractregion(int32 gridID, int32 regionID, const char *fieldname,
-		VOIDP buffer)
-{
-    intn            i;		/* Loop index */
-    intn            j;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
+	lat = EHconvAng(90, HDFE_DEG_RAD);
 
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           l_index;	/* Dimension l_index */
-    int32           start[8];	/* Start array for data read */
-    int32           edge[8];	/* Edge array for data read */
-    int32           dims[8];	/* Dimensions */
-    int32           rank = 0;	/* Field rank */
-    int32           ntype;	/* Field number type */
-    int32           origincode;	/* Pixel origin code */
+	errorcode = for_trans[projcode] (lon, lat, &x, &y);
+	if (errorcode != 0)
+	{
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
+	}
+
+	upleftpt[1] = +fabs(y);
+	lowrightpt[1] = -fabs(y);
+    }
 
-    char            dimlist[256];	/* Dimension list */
-    const char           *errMesg = "Vertical Dimension Not Found: \"%s\".\n";
-    const char           *errM1 = "Both \"XDim\" and \"YDim\" must be present ";
-    const char           *errM2 = "in the dimension list for \"%s\".\n";
-    char            errbuf[256];/* Error buffer */
+    /* Compute Default Boundary Points for Lambert Azimuthal */
+    /* ----------------------------------------------------- */
+    if (projcode == GCTP_LAMAZ &&
+	upleftpt[0] == 0 && upleftpt[1] == 0 &&
+	lowrightpt[0] == 0 && lowrightpt[1] == 0)
+    {
+	/*
+	 * Convert the longitude and latitude from the DMS to decimal degree
+	 * format.
+	 */
+	plon = EHconvAng(projparm[4], HDFE_DMS_DEG);
+	plat = EHconvAng(projparm[5], HDFE_DMS_DEG);
 
+	/*
+	 * Compute the longitudes at 90, 180 and 270 degrees from the central
+	 * longitude.
+	 */
 
-    /* Check for valid grid ID */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDextractregion", &fid, &sdInterfaceID,
-		       &gdVgrpID);
+	if (plon <= 0.0)
+	{
+	    tlon = 180.0 + plon;
+	    pplon = plon + 360.0;
+	}
+	else
+	{
+	    tlon = plon - 180.0;
+	    pplon = plon;
+	}
 
+	rlon = pplon + 90.0;
+	if (rlon > 360.0)
+	    rlon = rlon - 360;
 
-    /* Check for valid region ID */
-    /* ------------------------- */
-    if (status == 0)
-    {
-	if (regionID < 0 || regionID >= NGRIDREGN)
+	if (rlon > 180.0)
+	    rlon = rlon - 360.0;
+
+	if (rlon <= 0.0)
+	    llon = 180.0 + rlon;
+	else
+	    llon = rlon - 180.0;
+
+	/* Convert all four longitudes from decimal degrees to radians */
+	plon = EHconvAng(plon, HDFE_DEG_RAD);
+	tlon = EHconvAng(tlon, HDFE_DEG_RAD);
+	llon = EHconvAng(llon, HDFE_DEG_RAD);
+	rlon = EHconvAng(rlon, HDFE_DEG_RAD);
+
+	errorcode = for_trans[projcode] (llon, 0.0, &x, &y);
+	if (errorcode != 0)
 	{
 	    status = -1;
-	    HEpush(DFE_RANGE, "GDextractregion", __FILE__, __LINE__);
-	    HEreport("Invalid Region id: %d.\n", regionID);
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
-    }
 
+	upleftpt[0] = x;
 
-    /* Check for active region ID */
-    /* -------------------------- */
-    if (status == 0)
-    {
-	if (GDXRegion[regionID] == 0)
+	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
+	if (errorcode != 0)
 	{
 	    status = -1;
-	    HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-	    HEreport("Inactive Region ID: %d.\n", regionID);
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
-    }
 
+	lowrightpt[0] = x;
+
+	/*
+	 * Compute upperleft and lowerright values based on whether the
+	 * projection is south polar, north polar or equatorial
+	 */
+
+	if (plat == -90.0)
+	{
+	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
+
+	    upleftpt[1] = y;
 
+	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
-    /* Check that region defined for this file */
-    /* --------------------------------------- */
-    if (status == 0)
-    {
-	if (GDXRegion[regionID]->fid != fid)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-	    HEreport("Region is not defined for this file.\n");
+	    lowrightpt[1] = y;
 	}
-    }
-
-
-    /* Check that region defined for this grid */
-    /* --------------------------------------- */
-    if (status == 0)
-    {
-	if (GDXRegion[regionID]->gridID != gridID)
+	else if (plat == 90.0)
 	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-	    HEreport("Region is not defined for this Grid.\n");
-	}
-    }
-
+	    errorcode = for_trans[projcode] (tlon, 0.0, &x, &y);
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
+	    upleftpt[1] = y;
 
-    /* Check for valid fieldname */
-    /* ------------------------- */
-    if (status == 0)
-    {
-	status = GDfieldinfo(gridID, fieldname, &rank, dims, &ntype, dimlist);
+	    errorcode = for_trans[projcode] (plon, 0.0, &x, &y);
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
-	if (status != 0)
-	{
-	    /* Fieldname not found in grid */
-	    /* --------------------------- */
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" not found.\n",
-		     fieldname);
-	}
-	else if (rank == 1)
-	{
-	    /* Field is 1 dimensional */
-	    /* ---------------------- */
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-	    HEreport(
-		     "One-Dimesional fields \"%s\" may not be subsetted.\n",
-		     fieldname);
+	    lowrightpt[1] = y;
 	}
 	else
 	{
-	    /* "XDim" and/or "YDim" not found */
-	    /* ------------------------------ */
-	    if (EHstrwithin("XDim", dimlist, ',') == -1 ||
-		EHstrwithin("YDim", dimlist, ',') == -1)
+	    lat = EHconvAng(90, HDFE_DEG_RAD);
+	    errorcode = for_trans[projcode] (plon, lat, &x, &y);
+	    if (errorcode != 0)
 	    {
 		status = -1;
-		HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-		snprintf(errbuf, sizeof(errbuf), "%s%s", errM1, errM2);
-		HEreport(errbuf, fieldname);
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
 	    }
-	}
-    }
 
+	    upleftpt[1] = y;
+
+	    lat = EHconvAng(-90, HDFE_DEG_RAD);
+	    errorcode = for_trans[projcode] (plon, lat, &x, &y);
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
+	    lowrightpt[1] = y;
+	}
+    }
 
-    if (status == 0)
+    /* Compute Default Boundary Points for Integerized Sinusoidal Grid */
+    /* --------------------------------------------------------------- */
+    if (((projcode == GCTP_ISINUS) || (projcode == GCTP_ISINUS1)) &&
+	upleftpt[0] == 0 && upleftpt[1] == 0 &&
+	lowrightpt[0] == 0 && lowrightpt[1] == 0)
     {
+	/*
+	 * Convert the longitude and latitude from the DMS to decimal degree
+	 * format.
+	 */
+	plon = EHconvAng(projparm[4], HDFE_DMS_DEG);
+	/*plat = EHconvAng(projparm[5], HDFE_DMS_DEG); */
 
-	/* Get origin order info */
-	/* --------------------- */
-	status = GDorigininfo(gridID, &origincode);
-
+	/*
+	 * Compute the longitudes at 90, 180 and 270 degrees from the central
+	 * longitude.
+	 */
 
-	/* Initialize start & edge arrays */
-	/* ------------------------------ */
-	for (i = 0; i < rank; i++)
+	if (plon <= 0.0)
 	{
-	    start[i] = 0;
-	    edge[i] = dims[i];
+	    tlon = 180.0 + plon;
+	    pplon = plon + 360.0;
 	}
-
-
-	/* if MISR SOM projection, set start */
-	/* & edge arrays for SOMBlockDim     */
-	/* --------------------------------- */
-	if (EHstrwithin("SOMBlockDim", dimlist, ',') == 0)
+	else
 	{
-	    l_index = EHstrwithin("SOMBlockDim", dimlist, ',');
-	    edge[l_index] = GDXRegion[regionID]->somCount;
-	    start[l_index] = GDXRegion[regionID]->somStart;
+	    tlon = plon - 180.0;
+	    pplon = plon;
 	}
 
+	rlon = pplon + 90.0;
+	if (rlon > 360.0)
+	    rlon = rlon - 360;
 
-	/* Set start & edge arrays for XDim */
-	/* -------------------------------- */
-	l_index = EHstrwithin("XDim", dimlist, ',');
-	if (GDXRegion[regionID]->xCount != 0)
-	{
-	    edge[l_index] = GDXRegion[regionID]->xCount;
-	    start[l_index] = GDXRegion[regionID]->xStart;
-	}
-
-	/* Adjust X-dim start if origin on right edge */
-	/* ------------------------------------------ */
-	if ((origincode & 1) == 1)
-	{
-	    start[l_index] = dims[l_index] - (start[l_index] + edge[l_index]);
-	}
+	if (rlon > 180.0)
+	    rlon = rlon - 360.0;
 
+	if (rlon <= 0.0)
+	    llon = 180.0 + rlon;
+	else
+	    llon = rlon - 180.0;
 
-	/* Set start & edge arrays for YDim */
-	/* -------------------------------- */
-	l_index = EHstrwithin("YDim", dimlist, ',');
-	if (GDXRegion[regionID]->yCount != 0)
-	{
-	    start[l_index] = GDXRegion[regionID]->yStart;
-	    edge[l_index] = GDXRegion[regionID]->yCount;
-	}
+	/* Convert all four longitudes from decimal degrees to radians */
+	plon = EHconvAng(plon, HDFE_DEG_RAD);
+	tlon = EHconvAng(tlon, HDFE_DEG_RAD);
+	llon = EHconvAng(llon, HDFE_DEG_RAD);
+	rlon = EHconvAng(rlon, HDFE_DEG_RAD);
 
-	/* Adjust Y-dim start if origin on lower edge */
-	/* ------------------------------------------ */
-	if ((origincode & 2) == 2)
+	errorcode = for_trans[projcode] (llon, 0.0, &x, &y);
+	if (errorcode != 0)
 	{
-	    start[l_index] = dims[l_index] - (start[l_index] + edge[l_index]);
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
 
+	upleftpt[0] = x;
 
-
-	/* Vertical Subset */
-	/* --------------- */
-	for (j = 0; j < 8; j++)
+	errorcode = for_trans[projcode] (rlon, 0.0, &x, &y);
+	if (errorcode != 0)
 	{
-	    /* If active vertical subset ... */
-	    /* ----------------------------- */
-	    if (GDXRegion[regionID]->StartVertical[j] != -1)
-	    {
-
-		/* Find vertical dimension within dimlist */
-		/* -------------------------------------- */
-		l_index = EHstrwithin(GDXRegion[regionID]->DimNamePtr[j],
-				    dimlist, ',');
-
-		/* If dimension found ... */
-		/* ---------------------- */
-		if (l_index != -1)
-		{
-		    /* Compute start and edge for vertical dimension */
-		    /* --------------------------------------------- */
-		    start[l_index] = GDXRegion[regionID]->StartVertical[j];
-		    edge[l_index] = GDXRegion[regionID]->StopVertical[j] -
-			GDXRegion[regionID]->StartVertical[j] + 1;
-		}
-		else
-		{
-		    /* Vertical dimension not found */
-		    /* ---------------------------- */
-		    status = -1;
-		    HEpush(DFE_GENAPP, "GDextractregion", __FILE__, __LINE__);
-		    HEreport(errMesg,
-			     GDXRegion[regionID]->DimNamePtr[j]);
-		}
-	    }
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
 
+	lowrightpt[0] = x;
 
-	/* Read into data buffer */
-	/* --------------------- */
-	if (status == 0)
+	lat = EHconvAng(90, HDFE_DEG_RAD);
+	errorcode = for_trans[projcode] (plon, lat, &x, &y);
+	if (errorcode != 0)
 	{
-	    status = GDreadfield(gridID, fieldname, start, NULL, edge, buffer);
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
-    }
-    return (status);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDdupregion                                                      |
-|                                                                             |
-|  DESCRIPTION: Duplicates a region                                           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  newregionID    int32               New region ID                           |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  oldregionID    int32               Old region ID                           |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jan 97   Joel Gales    Original Programmer                                 |
-|  Oct 98   Abe Taaheri   changed *GDXRegion[i] = *GDXRegion[oldregionID];    |
-|                         to copy elements of structure one by one to avoid   |
-|                         copying pointer for DimNamePtr to another place that|
-|                         causes "Freeing Unallocated Memory" in purify when  |
-|                         using GDdetach                                      |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDdupregion(int32 oldregionID)
-{
-    intn            i;		/* Loop index */
-    intn            j;          /* Loop index */
-    int32           slendupregion;
-    int32           newregionID = -1;	/* New region ID */
 
+	upleftpt[1] = y;
 
-    /* Find first empty (inactive) region */
-    /* ---------------------------------- */
-    for (i = 0; i < NGRIDREGN; i++)
-    {
-	if (GDXRegion[i] == 0)
+	lat = EHconvAng(-90, HDFE_DEG_RAD);
+	errorcode = for_trans[projcode] (plon, lat, &x, &y);
+	if (errorcode != 0)
 	{
-	    /* Allocate space for new grid region entry */
-	    /* ---------------------------------------- */
-	    GDXRegion[i] = (struct gridRegion *)
-		calloc(1, sizeof(struct gridRegion));
-	    if(GDXRegion[i] == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"GDdupregion", __FILE__, __LINE__);
-		return(-1);
-	    }
-
-
-	    /* Copy old region structure data to new region */
-	    /* -------------------------------------------- */
-
-            GDXRegion[i]->fid = GDXRegion[oldregionID]->fid;
-            GDXRegion[i]->gridID = GDXRegion[oldregionID]->gridID;
-            GDXRegion[i]->xStart = GDXRegion[oldregionID]->xStart;
-            GDXRegion[i]->xCount = GDXRegion[oldregionID]->xCount;
-            GDXRegion[i]->yStart = GDXRegion[oldregionID]->yStart;
-            GDXRegion[i]->yCount = GDXRegion[oldregionID]->yCount;
-            GDXRegion[i]->upleftpt[0] = GDXRegion[oldregionID]->upleftpt[0];
-            GDXRegion[i]->upleftpt[1] = GDXRegion[oldregionID]->upleftpt[1];
-            GDXRegion[i]->lowrightpt[0] = GDXRegion[oldregionID]->lowrightpt[0];
-            GDXRegion[i]->lowrightpt[1] = GDXRegion[oldregionID]->lowrightpt[1];
-            for (j = 0; j < 8; j++)
-            {
-                GDXRegion[i]->StartVertical[j] = GDXRegion[oldregionID]->StartVertical[j];
-                GDXRegion[i]->StopVertical[j] = GDXRegion[oldregionID]->StopVertical[j];
-            }
-
-            for (j=0; j<8; j++)
-            {
-                if(GDXRegion[oldregionID]->DimNamePtr[j] != NULL)
-                {
-                    slendupregion = (int)strlen(GDXRegion[oldregionID]->DimNamePtr[j]);
-                    GDXRegion[i]->DimNamePtr[j] = (char *) malloc(slendupregion + 1);
-                    strcpy(GDXRegion[i]->DimNamePtr[j],GDXRegion[oldregionID]->DimNamePtr[j]);
-		}
-            }
-
-
-	    /* Define new region ID */
-	    /* -------------------- */
-	    newregionID = i;
-
-	    break;
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDgetdefaults", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	    return (status);
 	}
+
+	lowrightpt[1] = y;
     }
-    return (newregionID);
+    return (errorcode);
 }
-#endif
-
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: GDdefvrtregion                                                   |
+|  FUNCTION: GDll2ij                                                          |
 |                                                                             |
-|  DESCRIPTION: Finds elements of a monotonic field within a vertical subset  |
-|               region.                                                       |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  regionID       int32               Region ID                               |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  regionID       int32               Region ID                               |
-|  vertObj        char                Vertical object to subset               |
-|  range          float64             Vertical subsetting range               |
+|  projcode       int32               GCTP projection code                    |
+|  zonecode       int32               UTM zone code                           |
+|  projparm       float64             Projection parameters                   |
+|  spherecode     int32               GCTP spheriod code                      |
+|  xdimsize       int32               xdimsize from GDcreate                  |
+|  ydimsize       int32               ydimsize from GDcreate                  |
+|  upleftpt       float64             upper left corner coordinates           |
+|  lowrightpt     float64             lower right corner coordinates          |
+|  npnts          int32               number of lon-lat points                |
+|  longitude      float64             longitude array (radians)               |
+|  latitude       float64             latitude array (radians)                |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  row            int32               Row array                               |
+|  col            int32               Column array                            |
+|  xval           float64             X value array                           |
+|  yval           float64             Y value array                           |
+|                                                                             |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Aug 96   Joel Gales    Original Programmer                                 |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Feb 97   Joel Gales    Store XDim, YDim, upleftpt, lowrightpt in GDXRegion |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Return x and y values if requested                  |
+|  Jun 00   Abe Taaheri   Added support for EASE grid                         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-#define SETGRIDREG \
-\
-regionID = 0; \
-status = GDgridinfo(gridID, &xdimsize, &ydimsize, upleftpt, lowrightpt); \
-for (k = 0; k < NGRIDREGN; k++) \
-{ \
-    if (GDXRegion[k] == 0) \
-    { \
-        GDXRegion[k] = (struct gridRegion *) \
-	  calloc(1, sizeof(struct gridRegion)); \
-	GDXRegion[k]->fid = fid; \
-	GDXRegion[k]->gridID = gridID; \
-	GDXRegion[k]->xStart = 0; \
-	GDXRegion[k]->xCount = xdimsize; \
-	GDXRegion[k]->yStart = 0; \
-	GDXRegion[k]->yCount = ydimsize; \
-	GDXRegion[k]->upleftpt[0] = upleftpt[0]; \
-	GDXRegion[k]->upleftpt[1] = upleftpt[1]; \
-	GDXRegion[k]->lowrightpt[0] = lowrightpt[0]; \
-	GDXRegion[k]->lowrightpt[1] = lowrightpt[1]; \
-	regionID = k; \
-	for (j=0; j<8; j++) \
-        { \
-             GDXRegion[k]->StartVertical[j] = -1; \
-             GDXRegion[k]->StopVertical[j]  = -1; \
-        } \
-	break; \
-     } \
-}
-
-#define FILLVERTREG \
-for (j=0; j<8; j++) \
-{ \
-    if (GDXRegion[regionID]->StartVertical[j] == -1) \
-    { \
-	GDXRegion[regionID]->StartVertical[j] = i; \
-	GDXRegion[regionID]->DimNamePtr[j] = \
-	    (char *) malloc(slen + 1); \
-	memcpy(GDXRegion[regionID]->DimNamePtr[j], \
-	       dimlist, slen + 1); \
-	break; \
-    } \
-} \
+static intn
+GDll2ij(int32 projcode, int32 zonecode, float64 projparm[],
+	int32 spherecode, int32 xdimsize, int32 ydimsize,
+	float64 upleftpt[], float64 lowrightpt[],
+	int32 npnts, float64 longitude[], float64 latitude[],
+	int32 row[], int32 col[], float64 xval[], float64 yval[])
 
 
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-int32
-GDdefvrtregion(int32 gridID, int32 regionID, const char *vertObj, float64 range[])
 {
-    intn            i, j = 0, k, status;
-    uint8           found = 0;
-
-    int16           vertINT16;
-
-    int32           fid, sdInterfaceID, slen;
-    int32           gdVgrpID, rank, nt, dims[8], size;
-    int32           vertINT32;
-    int32           xdimsize;
-    int32           ydimsize;
+    intn            i;		/* Loop index */
+    intn            status = 0;	/* routine return status variable */
 
-    float32         vertFLT32;
-    float64         vertFLT64;
-    float64         upleftpt[2];
-    float64         lowrightpt[2];
+    int32           errorcode = 0;	/* GCTP error code */
+    int32(*for_trans[100]) (double, double, double*, double*);	/* GCTP function pointer */
 
-    char           *vertArr;
-    char           *dimlist;
+    float64         xVal;	/* Scaled x distance */
+    float64         yVal;	/* Scaled y distance */
+    float64         xMtr;	/* X value in meters from GCTP */
+    float64         yMtr;	/* Y value in meters from GCTP */
+    float64         lonrad0;	/* Longitude in radians of upleft point */
+    float64         latrad0 = 0;	/* Latitude in radians of upleft point */
+    float64         lonrad;	/* Longitude in radians of point */
+    float64         latrad;	/* Latitude in radians of point */
+    float64         scaleX;	/* X scale factor */
+    float64         scaleY;	/* Y scale factor */
+    float64         xMtr0 = 0, xMtr1, yMtr0 = 0, yMtr1;
+    float64         lonrad1;	/* Longitude in radians of lowright point */
 
-    /* Allocate space for dimlist */
-    /* --------------------------------- */
-    dimlist = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(dimlist == NULL)
+    /* If projection not GEO call GCTP initialization routine */
+    /* ------------------------------------------------------ */
+    if (projcode != GCTP_GEO)
     {
-	HEpush(DFE_NOSPACE,"GDdefvrtregion", __FILE__, __LINE__);
-	return(-1);
+	for_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
+		 &errorcode, for_trans);
+
+	/* Report error if any */
+	/* ------------------- */
+	if (errorcode != 0)
+	{
+	    status = -1;
+	    HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
+	    HEreport("GCTP Error: %d\n", errorcode);
+	}
     }
-    /* Check for valid grid ID */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDdefvrtregion",
-		       &fid, &sdInterfaceID, &gdVgrpID);
+
 
     if (status == 0)
     {
-	memcpy(dimlist, vertObj, 4);
-	dimlist[4] = 0;
-
-	if (strcmp(dimlist, "DIM:") == 0)
-	{
-	    slen = (int)strlen(vertObj) - 4;
-	    if (regionID == -1)
-	    {
-		SETGRIDREG;
-	    }
-	    for (j = 0; j < 8; j++)
-	    {
-		if (GDXRegion[regionID]->StartVertical[j] == -1)
-		{
-		    GDXRegion[regionID]->StartVertical[j] = (int32) range[0];
-		    GDXRegion[regionID]->StopVertical[j] = (int32) range[1];
-		    GDXRegion[regionID]->DimNamePtr[j] =
-			(char *) malloc(slen + 1);
-		    if(GDXRegion[regionID]->DimNamePtr[j] == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"GDdefvrtregion", __FILE__, __LINE__);
-			free(dimlist);
-			return(-1);
-		    }
-		    memcpy(GDXRegion[regionID]->DimNamePtr[j],
-			   vertObj + 4, slen + 1);
-		    break;
-		}
-	    }
-	}
-	else
+	/* GEO projection */
+	/* -------------- */
+	if (projcode == GCTP_GEO)
 	{
-	    status = GDfieldinfo(gridID, vertObj, &rank, dims, &nt, dimlist);
-	    if (status != 0)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDdefvrtregion", __FILE__, __LINE__);
-		HEreport("Vertical Field: \"%s\" not found.\n", vertObj);
-	    }
-	    else
-	    {
-		if (rank != 1)
-		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "GDdefvrtregion", __FILE__, __LINE__);
-		    HEreport("Vertical Field: \"%s\" must be 1-dim.\n",
-			     vertObj);
-		}
-		else
-		{
-		    slen = (int)strlen(dimlist);
-		    size = DFKNTsize(nt);
-		    vertArr = (char *) calloc(dims[0], size);
-		    if(vertArr == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"GDdefvrtregion", __FILE__, __LINE__);
-			free(dimlist);
-			return(-1);
-		    }
-
-		    status = GDreadfield(gridID, vertObj,
-					 NULL, NULL, NULL, vertArr);
+	    /* Convert upleft and lowright X coords from DMS to radians */
+	    /* -------------------------------------------------------- */
+	    lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
+	    lonrad = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
 
-		    switch (nt)
-		    {
-		    case DFNT_INT16:
+	    /* Compute x scale factor */
+	    /* ---------------------- */
+	    scaleX = (lonrad - lonrad0) / xdimsize;
 
-			for (i = 0; i < dims[0]; i++)
-			{
-			    memcpy(&vertINT16, vertArr + i * size, size);
 
-			    if (vertINT16 >= range[0] &&
-				vertINT16 <= range[1])
-			    {
-				found = 1;
-				if (regionID == -1)
-				{
-				    SETGRIDREG;
-				}
-				FILLVERTREG;
-
-				break;
-			    }
-			}
+	    /* Convert upleft and lowright Y coords from DMS to radians */
+	    /* -------------------------------------------------------- */
+	    latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
+	    latrad = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
 
-			if (found == 1)
-			{
-			    for (i = dims[0] - 1; i >= 0; i--)
-			    {
-				memcpy(&vertINT16, vertArr + i * size, size);
-
-				if (vertINT16 >= range[0] &&
-				    vertINT16 <= range[1])
-				{
-				    GDXRegion[regionID]->StopVertical[j] = i;
-				    break;
-				}
-			    }
-			}
-			else
-			{
-			    status = -1;
-			}
-			break;
 
+	    /* Compute y scale factor */
+	    /* ---------------------- */
+	    scaleY = (latrad - latrad0) / ydimsize;
+	}
 
-		    case DFNT_INT32:
+	/* BCEA projection */
+        /* -------------- */
+	else if ( projcode == GCTP_BCEA)
+	{
+	    /* Convert upleft and lowright X coords from DMS to radians */
+	    /* -------------------------------------------------------- */
 
-			for (i = 0; i < dims[0]; i++)
-			{
-			    memcpy(&vertINT32, vertArr + i * size, size);
+	    lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
+	    lonrad = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
 
-			    if (vertINT32 >= range[0] &&
-				vertINT32 <= range[1])
-			    {
-				found = 1;
-				if (regionID == -1)
-				{
-				    SETGRIDREG;
-				}
-				FILLVERTREG;
-
-				break;
-			    }
-			}
+	    /* Convert upleft and lowright Y coords from DMS to radians */
+	    /* -------------------------------------------------------- */
+	    latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
+	    latrad = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
 
-			if (found == 1)
-			{
-			    for (i = dims[0] - 1; i >= 0; i--)
-			    {
-				memcpy(&vertINT32, vertArr + i * size, size);
-
-				if (vertINT32 >= range[0] &&
-				    vertINT32 <= range[1])
-				{
-				    GDXRegion[regionID]->StopVertical[j] = i;
-				    break;
-				}
-			    }
-			}
-			else
-			{
-			    status = -1;
-			}
-			break;
+	    /* Convert from lon/lat to meters(or whatever unit is, i.e unit
+	       of r_major and r_minor) using GCTP */
+	    /* ----------------------------------------- */
+	    errorcode = for_trans[projcode] (lonrad0, latrad0, &xMtr0, &yMtr0);
 
 
-		    case DFNT_FLOAT32:
+	    /* Report error if any */
+	    /* ------------------- */
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
-			for (i = 0; i < dims[0]; i++)
-			{
-			    memcpy(&vertFLT32, vertArr + i * size, size);
+	    /* Convert from lon/lat to meters(or whatever unit is, i.e unit
+	       of r_major and r_minor) using GCTP */
+	    /* ----------------------------------------- */
+	    errorcode = for_trans[projcode] (lonrad, latrad, &xMtr1, &yMtr1);
 
-			    if (vertFLT32 >= range[0] &&
-				vertFLT32 <= range[1])
-			    {
-				found = 1;
-				if (regionID == -1)
-				{
-				    SETGRIDREG;
-				}
-				FILLVERTREG;
-
-				break;
-			    }
-			}
 
-			if (found == 1)
-			{
-			    for (i = dims[0] - 1; i >= 0; i--)
-			    {
-				memcpy(&vertFLT32, vertArr + i * size, size);
-
-				if (vertFLT32 >= range[0] &&
-				    vertFLT32 <= range[1])
-				{
-				    GDXRegion[regionID]->StopVertical[j] = i;
-				    break;
-				}
-			    }
-			}
-			else
-			{
-			    status = -1;
-			}
-			break;
+	    /* Report error if any */
+	    /* ------------------- */
+	    if (errorcode != 0)
+	    {
+		status = -1;
+		HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
+		HEreport("GCTP Error: %d\n", errorcode);
+		return (status);
+	    }
 
+	    /* Compute x scale factor */
+	    /* ---------------------- */
+	    scaleX = (xMtr1 - xMtr0) / xdimsize;
 
-		    case DFNT_FLOAT64:
+	    /* Compute y scale factor */
+	    /* ---------------------- */
+	    scaleY = (yMtr1 - yMtr0) / ydimsize;
+	}
+	else
+	{
+	    /* Non-GEO, Non_BCEA projections */
+	    /* ---------------------------- */
 
-			for (i = 0; i < dims[0]; i++)
-			{
-			    memcpy(&vertFLT64, vertArr + i * size, size);
+	    /* Compute x & y scale factors */
+	    /* --------------------------- */
+	    scaleX = (lowrightpt[0] - upleftpt[0]) / xdimsize;
+	    scaleY = (lowrightpt[1] - upleftpt[1]) / ydimsize;
+	}
 
-			    if (vertFLT64 >= range[0] &&
-				vertFLT64 <= range[1])
-			    {
-				found = 1;
-				if (regionID == -1)
-				{
-				    SETGRIDREG;
-				}
-				FILLVERTREG;
-
-				break;
-			    }
-			}
 
-			if (found == 1)
-			{
-			    for (i = dims[0] - 1; i >= 0; i--)
-			    {
-				memcpy(&vertFLT64, vertArr + i * size, size);
-
-				if (vertFLT64 >= range[0] &&
-				    vertFLT64 <= range[1])
-				{
-				    GDXRegion[regionID]->StopVertical[j] = i;
-				    break;
-				}
-			    }
-			}
-			else
-			{
-			    status = -1;
-			}
-			break;
 
-		    }
-		    free(vertArr);
-		}
-	    }
-	}
-    }
-    if (status == -1)
-    {
-	regionID = -1;
-    }
-    free(dimlist);
-    return (regionID);
-}
+	/* Loop through all points */
+	/* ----------------------- */
+	for (i = 0; i < npnts; i++)
+	{
+	    /* Convert lon & lat from decimal degrees to radians */
+	    /* ------------------------------------------------- */
+	    lonrad = EHconvAng(longitude[i], HDFE_DEG_RAD);
+	    latrad = EHconvAng(latitude[i], HDFE_DEG_RAD);
 
 
+	    /* GEO projection */
+	    /* -------------- */
+	    if (projcode == GCTP_GEO)
+	    {
+	        /* allow map to span dateline */
+	        lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
+	        lonrad1 = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
+		/* if time-line is passed */
+		if(lonrad < lonrad1)
+		  {
+		    if (lonrad < lonrad0) lonrad += 2.0 * M_PI;
+		    if (lonrad > lonrad1) lonrad -= 2.0 * M_PI;
+		  }
 
+		/* Compute scaled distance to point from origin */
+		/* -------------------------------------------- */
+		xVal = (lonrad - lonrad0) / scaleX;
+		yVal = (latrad - latrad0) / scaleY;
+	    }
+	    else
+	    {
+		/* Convert from lon/lat to meters using GCTP */
+		/* ----------------------------------------- */
+		errorcode = for_trans[projcode] (lonrad, latrad, &xMtr, &yMtr);
 
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDdeftimeperiod                                                  |
-|                                                                             |
-|  DESCRIPTION: Finds elements of the "Time" field within a given time        |
-|               period.                                                       |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  periodID       int32               Period ID                               |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  periodID       int32               Period ID                               |
-|  starttime      float64 TAI sec     Start of time period                    |
-|  stoptime       float64 TAI sec     Stop of time period                     |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Aug 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDdeftimeperiod(int32 gridID, int32 periodID, float64 starttime,
-		float64 stoptime)
-{
-    float64         timerange[2];
+		/* Report error if any */
+		/* ------------------- */
+		if (errorcode != 0)
+		{
+		  /*status = -1;
+		    HEpush(DFE_GENAPP, "GDll2ij", __FILE__, __LINE__);
+		    HEreport("GCTP Error: %d\n", errorcode);
+		    return (status); */                  /* Bruce Beaumont */
+		    xVal = -2147483648.0;	         /* Bruce Beaumont */
+		    yVal = -2147483648.0;	         /* Bruce Beaumont */
+		}/* (Note: MAXLONG is defined as 2147483647.0 in
+		    function cproj.c of GCTP) */
+		else {
+		  /* if projection is BCEA normalize x and y by cell size and
+		     measure it from the upperleft corner of the grid */
+
+		  /* Compute scaled distance to point from origin */
+		  /* -------------------------------------------- */
+		  if(  projcode == GCTP_BCEA)
+		    {
+		      xVal = (xMtr - xMtr0) / scaleX;
+		      yVal = (yMtr - yMtr0) / scaleY;
+		    }
+		  else
+		    {
+		      xVal = (xMtr - upleftpt[0]) / scaleX;
+		      yVal = (yMtr - upleftpt[1]) / scaleY;
+		    }
+		}
+	    }
 
-    timerange[0] = starttime;
-    timerange[1] = stoptime;
 
-    periodID = GDdefvrtregion(gridID, periodID, "Time", timerange);
+	    /* Compute row and col from scaled distance */
+	    /* ---------------------------------------- */
+	    col[i] = (int32) xVal;
+	    row[i] = (int32) yVal;
 
-    return (periodID);
-}
-#endif
+	    /* Store scaled distances if requested */
+	    /* ----------------------------------- */
+	    if (xval != NULL)
+	    {
+		xval[i] = xVal;
+	    }
 
+	    if (yval != NULL)
+	    {
+		yval[i] = yVal;
+	    }
+	}
+    }
+    return (status);
+}
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -9842,443 +4701,15 @@ GDgetpixvalues(int32 gridID, int32 nPixels, int32 pixRow[], int32 pixCol[],
 			for (j = 0; j < rankSDS; j++)
 			{
 			    incr[j] = 1;
-			}
-
-
-			/* Read into data buffer */
-			/* --------------------- */
-			status = SDreaddata(sdid,
-					    offset, incr, count,
-				 (VOIDP) ((uint8 *) buffer + bufOffset));
-		    }
-		}
-	    }
-	}
-    }
-
-
-    /* If successful return size of returned data in bytes */
-    /* --------------------------------------------------- */
-    if (status == 0)
-    {
-	free(dimlist);
-	return (size * nPixels);
-    }
-    else
-    {
-	free(dimlist);
-	return ((int32) status);
-    }
-}
-
-
-#ifdef UNUSED_BY_GDAL
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDinterpolate                                                    |
-|                                                                             |
-|  DESCRIPTION: Performs bilinear interpolate on a set of xy values           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nRetn*nValues*  int32               Size of data buffer                    |
-|  sizeof(float64)                                                            |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               Grid structure ID                       |
-|  nValues        int32               Number of lon/lat points to interpolate |
-|  xyValues       float64             XY values of points to interpolate      |
-|  fieldname      char                Fieldname                               |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  interpVal      float64             Interpolated Data Values                |
-|                                                                             |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Aug 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Fix array l_index problem with interpVal write        |
-|  Apr 97   Joel Gales    Trap interpolation boundary out of bounds error     |
-|  Jun 98   Abe Taaheri   changed the return value so that the Return Value   |
-|                         is size in bytes for the data buffer which is       |
-|                         float64.
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-GDinterpolate(int32 gridID, int32 nValues, float64 lonVal[], float64 latVal[],
-	      const char *fieldname, float64 interpVal[])
-{
-    intn            i;		/* Loop index */
-    intn            j;		/* Loop index */
-    intn            k;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           gdVgrpID;	/* Grid root Vgroup ID */
-    int32           xdimsize;	/* XDim size */
-    int32           ydimsize;	/* YDim size */
-    int32           projcode;	/* Projection code */
-    int32           zonecode;	/* Zone code */
-    int32           spherecode;	/* Sphere code */
-    int32           pixregcode;	/* Pixel registration code */
-    int32           origincode;	/* Origin code */
-    int32           dims[8];	/* Field dimensions */
-    int32           numsize;	/* Size in bytes of number type */
-    int32           rank;	/* Field rank */
-    int32           xdum = 0;	/* Location of "XDim" within field list */
-    int32           ydum = 0;	/* Location of "YDim" within field list */
-    int32           ntype;	/* Number type */
-    int32           dum;	/* Dummy variable */
-    int32           size;	/* Size of returned data buffer for each
-				 * value in bytes */
-    int32           pixCol[4];	/* Pixel columns for 4 nearest neighbors */
-    int32           pixRow[4];	/* Pixel rows for 4 nearest neighbors */
-    int32           tDen;	/* Interpolation denominator value 1 */
-    int32           uDen;	/* Interpolation denominator value 2 */
-    int32           nRetn = 0;	/* Number of data values returned */
-
-    float64         upleftpt[2];/* Upper left pt coordinates */
-    float64         lowrightpt[2];	/* Lower right pt coordinates */
-    float64         projparm[16];	/* Projection parameters */
-    float64         xVal = 0.0;	/* "Exact" x location of interpolated point */
-    float64         yVal = 0.0;	/* "Exact" y location of interpolated point */
-    float64         tNum = 0.0;	/* Interpolation numerator value 1 */
-    float64         uNum = 0.0;	/* Interpolation numerator value 2 */
-
-    int16           i16[4];	/* Working buffer (int16) */
-    int32           i32[4];	/* Working buffer (int132) */
-    float32         f32[4];	/* Working buffer (float32) */
-    float64         f64[4];	/* Working buffer (float64) */
-
-    char           *pixVal;	/* Nearest neighbor values */
-    char           *dimlist;	/* Dimension list */
-
-    /* Allocate space for dimlist */
-    /* --------------------------------- */
-    dimlist = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(dimlist == NULL)
-    {
-	HEpush(DFE_NOSPACE,"GDinterpolate", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check for valid grid ID */
-    /* ----------------------- */
-    status = GDchkgdid(gridID, "GDinterpolate",
-		       &fid, &sdInterfaceID, &gdVgrpID);
-
-
-    /* If no problems ... */
-    /* ------------------ */
-    if (status == 0)
-    {
-	/* Get field information */
-	/* --------------------- */
-	status = GDfieldinfo(gridID, fieldname, &rank, dims, &ntype, dimlist);
-
-
-	/* Check for "XDim" & "YDim" in dimension list */
-	/* ------------------------------------------- */
-	if (status == 0)
-	{
-	    xdum = EHstrwithin("XDim", dimlist, ',');
-	    ydum = EHstrwithin("YDim", dimlist, ',');
-
-	    if (xdum == -1)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDinterpolate", __FILE__, __LINE__);
-		HEreport(
-		     "\"XDim\" not present in dimlist for field: \"%s\".\n",
-			 fieldname);
-	    }
-
-
-	    if (ydum == -1)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDinterpolate", __FILE__, __LINE__);
-		HEreport(
-		     "\"YDim\" not present in dimlist for field: \"%s\".\n",
-			 fieldname);
-	    }
-	}
-	else
-	{
-	    /* Fieldname not found in grid */
-	    /* --------------------------- */
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDinterpolate", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" not found.\n", fieldname);
-	}
-
-
-	/* If no problems ... */
-	/* ------------------ */
-	if (status == 0)
-	{
-	    /* Compute size of data buffer for each interpolated value */
-	    /* ------------------------------------------------------- */
-	    dims[xdum] = 1;
-	    dims[ydum] = 1;
-	    size = dims[0];
-	    for (i = 1; i < rank; i++)
-	    {
-		size *= dims[i];
-	    }
-	    numsize = DFKNTsize(ntype);
-	    size *= numsize;
-
-	    nRetn = size / numsize;
-
-
-
-	    /* If interpolated values are requested ... */
-	    /* ---------------------------------------- */
-	    if (interpVal != NULL)
-	    {
-		/* Get grid info */
-		/* ------------- */
-		status = GDgridinfo(gridID, &xdimsize, &ydimsize,
-				    upleftpt, lowrightpt);
-
-
-		/* Get projection info */
-		/* ------------------- */
-		status = GDprojinfo(gridID, &projcode, &zonecode,
-				    &spherecode, projparm);
-
-
-		/* Get explicit upleftpt & lowrightpt if defaults are used */
-		/* ------------------------------------------------------- */
-		status = GDgetdefaults(projcode, zonecode, projparm,
-				       spherecode, upleftpt, lowrightpt);
-
-
-		/* Get pixel registration and origin info */
-		/* -------------------------------------- */
-		status = GDpixreginfo(gridID, &pixregcode);
-		status = GDorigininfo(gridID, &origincode);
-
-
-
-		/* Loop through all interpolated points */
-		/* ------------------------------------ */
-		for (i = 0; i < nValues; i++)
-		{
-		    /* Get row & column of point pixel */
-		    /* ------------------------------- */
-		    status = GDll2ij(projcode, zonecode, projparm, spherecode,
-				   xdimsize, ydimsize, upleftpt, lowrightpt,
-				     1, &lonVal[i], &latVal[i],
-				     pixRow, pixCol, &xVal, &yVal);
-
-
-		    /* Get diff of interp. point from pixel location */
-		    /* --------------------------------------------- */
-		    if (pixregcode == HDFE_CENTER)
-		    {
-			tNum = xVal - (pixCol[0] + 0.5);
-			uNum = yVal - (pixRow[0] + 0.5);
-		    }
-		    else if (origincode == HDFE_GD_UL)
-		    {
-			tNum = xVal - pixCol[0];
-			uNum = yVal - pixRow[0];
-		    }
-		    else if (origincode == HDFE_GD_UR)
-		    {
-			tNum = xVal - (pixCol[0] + 1);
-			uNum = yVal - pixRow[0];
-		    }
-		    else if (origincode == HDFE_GD_LL)
-		    {
-			tNum = xVal - pixCol[0];
-			uNum = yVal - (pixRow[0] + 1);
-		    }
-		    else if (origincode == HDFE_GD_LR)
-		    {
-			tNum = xVal - (pixCol[0] + 1);
-			uNum = yVal - (pixRow[0] + 1);
-		    }
-
-
-		    /* Get rows and columns of other nearest neighbor pixels */
-		    /* ----------------------------------------------------- */
-		    pixCol[1] = pixCol[0];
-		    pixRow[3] = pixRow[0];
-
-		    if (tNum >= 0)
-		    {
-			pixCol[2] = pixCol[0] + 1;
-			pixCol[3] = pixCol[0] + 1;
-		    }
-
-		    if (tNum < 0)
-		    {
-			pixCol[2] = pixCol[0] - 1;
-			pixCol[3] = pixCol[0] - 1;
-		    }
-
-		    if (uNum >= 0)
-		    {
-			pixRow[2] = pixRow[0] + 1;
-			pixRow[1] = pixRow[0] + 1;
-		    }
-
-		    if (uNum < 0)
-		    {
-			pixRow[2] = pixRow[0] - 1;
-			pixRow[1] = pixRow[0] - 1;
-		    }
-
-
-		    /* Get values of nearest neighbors  */
-		    /* -------------------------------- */
-		    pixVal = (char *) malloc(4 * size);
-		    if(pixVal == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"GDinterpolate", __FILE__, __LINE__);
-			free(dimlist);
-			return(-1);
-		    }
-		    dum = GDgetpixvalues(gridID, 4, pixRow, pixCol,
-					 fieldname, pixVal);
-
-
-		    /* Trap interpolation boundary out of range error */
-		    /* ---------------------------------------------- */
-		    if (dum == -1)
-		    {
-			status = -1;
-			HEpush(DFE_GENAPP, "GDinterpolate", __FILE__, __LINE__);
-			HEreport("Interpolation boundary outside of grid.\n");
-		    }
-		    else
-		    {
-
-			/*
-			 * Algorithm taken for Numerical Recipes in C, 2nd
-			 * edition, Section 3.6
-			 */
-
-			/* Perform bilinear interpolation */
-			/* ------------------------------ */
-			tDen = pixCol[3] - pixCol[0];
-			uDen = pixRow[1] - pixRow[0];
-
-			switch (ntype)
-			{
-			case DFNT_INT16:
-
-
-			    /* Loop through all returned data values */
-			    /* ------------------------------------- */
-			    for (j = 0; j < nRetn; j++)
-			    {
-				/* Copy 4 NN values into working array */
-				/* ----------------------------------- */
-				for (k = 0; k < 4; k++)
-				{
-				    memcpy(&i16[k],
-					   pixVal + j * numsize + k * size,
-					   sizeof(int16));
-				}
-
-				/* Compute interpolated value */
-				/* -------------------------- */
-				interpVal[i * nRetn + j] =
-				    (1 - tNum / tDen) * (1 - uNum / uDen) *
-				    i16[0] +
-				    (tNum / tDen) * (1 - uNum / uDen) *
-				    i16[3] +
-				    (tNum / tDen) * (uNum / uDen) *
-				    i16[2] +
-				    (1 - tNum / tDen) * (uNum / uDen) *
-				    i16[1];
-			    }
-			    break;
-
-
-			case DFNT_INT32:
-
-			    for (j = 0; j < nRetn; j++)
-			    {
-				for (k = 0; k < 4; k++)
-				{
-				    memcpy(&i32[k],
-					   pixVal + j * numsize + k * size,
-					   sizeof(int32));
-				}
-
-				interpVal[i * nRetn + j] =
-				    (1 - tNum / tDen) * (1 - uNum / uDen) *
-				    i32[0] +
-				    (tNum / tDen) * (1 - uNum / uDen) *
-				    i32[3] +
-				    (tNum / tDen) * (uNum / uDen) *
-				    i32[2] +
-				    (1 - tNum / tDen) * (uNum / uDen) *
-				    i32[1];
-			    }
-			    break;
-
-
-			case DFNT_FLOAT32:
-
-			    for (j = 0; j < nRetn; j++)
-			    {
-				for (k = 0; k < 4; k++)
-				{
-				    memcpy(&f32[k],
-					   pixVal + j * numsize + k * size,
-					   sizeof(float32));
-				}
-
-				interpVal[i * nRetn + j] =
-				    (1 - tNum / tDen) * (1 - uNum / uDen) *
-				    f32[0] +
-				    (tNum / tDen) * (1 - uNum / uDen) *
-				    f32[3] +
-				    (tNum / tDen) * (uNum / uDen) *
-				    f32[2] +
-				    (1 - tNum / tDen) * (uNum / uDen) *
-				    f32[1];
-			    }
-			    break;
-
+			}
 
-			case DFNT_FLOAT64:
 
-			    for (j = 0; j < nRetn; j++)
-			    {
-				for (k = 0; k < 4; k++)
-				{
-				    memcpy(&f64[k],
-					   pixVal + j * numsize + k * size,
-					   sizeof(float64));
-				}
-
-				interpVal[i * nRetn + j] =
-				    (1 - tNum / tDen) * (1 - uNum / uDen) *
-				    f64[0] +
-				    (tNum / tDen) * (1 - uNum / uDen) *
-				    f64[3] +
-				    (tNum / tDen) * (uNum / uDen) *
-				    f64[2] +
-				    (1 - tNum / tDen) * (uNum / uDen) *
-				    f64[1];
-			    }
-			    break;
-			}
+			/* Read into data buffer */
+			/* --------------------- */
+			status = SDreaddata(sdid,
+					    offset, incr, count,
+				 (VOIDP) ((uint8 *) buffer + bufOffset));
 		    }
-		    free(pixVal);
 		}
 	    }
 	}
@@ -10289,18 +4720,15 @@ GDinterpolate(int32 gridID, int32 nValues, float64 lonVal[], float64 latVal[],
     /* --------------------------------------------------- */
     if (status == 0)
     {
-	/*always return size of float64 buffer */
 	free(dimlist);
-	return (nRetn  * nValues * sizeof(float64));
+	return (size * nPixels);
     }
     else
     {
 	free(dimlist);
 	return ((int32) status);
     }
-
 }
-#endif
 
 /***********************************************
 GDwrrdtile --
@@ -10516,29 +4944,6 @@ GDtileinfo(int32 gridID, const char *fieldname, int32 * tilecode, int32 * tilera
     }
     return (status);
 }
-/***********************************************
-GDwritetile --
-     This function writes one tile to a particular field.
-
-
-Author--
-Alexis Zubrow
-
-********************************************************/
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn
-GDwritetile(int32 gridID, const char *fieldname, int32 tilecoords[],
-	    VOIDP tileData)
-{
-    char            code[] = "w";	/* write tile code */
-    intn            status = 0;	/* routine return status variable */
-
-    status = GDwrrdtile(gridID, fieldname, code, tilecoords, tileData);
-
-    return (status);
-}
-#endif
 
 /***********************************************
 GDreadtile --
@@ -10562,463 +4967,6 @@ GDreadtile(int32 gridID, const char *fieldname, int32 tilecoords[],
     return (status);
 }
 
-#ifdef UNUSED_BY_GDAL
-/***********************************************
-GDsettilecache --
-     This function sets the cache size for a tiled field.
-
-
-Author--
-Alexis Zubrow
-
-********************************************************/
-
-intn
-GDsettilecache(int32 gridID, const char *fieldname, int32 maxcache, CPL_UNUSED int32 cachecode)
-{
-
-    intn            status = 0;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           sdid;	/* SDS ID */
-
-    int32           dum;	/* Dummy variable */
-
-    int32           dims[8];	/* Field/SDS dimensions */
-
-
-    /* Check gridID */
-    status = GDchkgdid(gridID, "GDwrrdtile", &fid, &sdInterfaceID, &dum);
-    if (status == 0)
-    {
-
-	/* Get field info */
-	status = GDfieldinfo(gridID, fieldname, &dum, dims, &dum, NULL);
-
-	if (status == 0)
-	{
-
-	    /* Check whether fieldname is in SDS (multi-dim field) */
-	    /* --------------------------------------------------- */
-	    status = GDSDfldsrch(gridID, sdInterfaceID, fieldname, &sdid,
-				 &dum, &dum, &dum, dims, &dum);
-
-
-	    /* Check if maxcache is less than or equal to zero */
-	    if (maxcache <= 0)
-	    {
-		HEpush(DFE_GENAPP, "GDsettilecache", __FILE__, __LINE__);
-		HEreport("Improper maxcache \"%d\"... \n", maxcache);
-		HEreport("maxcache must be greater than zero.\n");
-		status = -1;
-		return (status);
-	    }
-
-
-	    /* Set the number of tiles to cache */
-	    /* Presently, the only cache flag allowed is 0 */
-	    status = SDsetchunkcache(sdid, maxcache, 0);
-
-
-	}
-
-	/* Non-existent fieldname */
-	else
-	{
-	    HEpush(DFE_GENAPP, "GDwrrdtile", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-	    status = -1;
-	}
-
-    }
-
-    return (status);
-}
-#endif
-
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDsettilecomp                                                    |
-|                                                                             |
-|  DESCRIPTION: Sets the tiling/compression parameters for the   specified    |
-|               field. This can be called after GDsetfillvalue and assumes    |
-|               that the field was defined with no compression/tiling  set    |
-|               by GDdeftile or GDdefcomp.                                    |
-|                                                                             |
-|               This function replaces the following sequence:                |
-|                  GDdefcomp                                                  |
-|                  GDdeftile                                                  |
-|                  GDdeffield                                                 |
-|                  GDsetfillvalue                                             |
-|               with:                                                         |
-|                  GDdeffield                                                 |
-|                  GDsetfillvalue                                             |
-|                  GDsettilecomp                                              |
-|               so that fill values will work correctly.                      |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  gridID         int32               grid structure ID                       |
-|  fieldname      char                field name                              |
-|  tilerank       int32               number of tiling dimensions             |
-|  tiledims       int32               tiling dimensions                       |
-|  compcode       int32               compression code                        |
-|  compparm       intn                compression parameters                  |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 98   MISR          Used GDsetfillvalue as a template and copied        |
-|                         tiling/comp portions of GDdeffield.(NCR15866).      |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-GDsettilecomp(int32 gridID, const char *fieldname, int32 tilerank, int32*
-               tiledims, int32 compcode, intn* compparm)
-{
-    intn            status;     /* routine return status variable */
-
-    int32           fid;        /* HDF-EOS file ID */
-    int32           sdInterfaceID;      /* HDF SDS interface ID */
-    int32           gdVgrpID;   /* Grid root Vgroup ID */
-    int             i;          /* Looping variable. */
-    int32           sdid;       /* SDS id */
-    int32           nt;         /* Number type */
-    int32           dims[8];    /* Dimensions array */
-    int32           dum;        /* Dummy variable */
-    int32           solo;       /* "Solo" (non-merged) field flag */
-    comp_info       c_info;     /* Compression parameter structure */
-    HDF_CHUNK_DEF   chunkDef;   /* Tiling structure */
-    int32           chunkFlag;  /* Chunking (Tiling) flag */
-
-    c_info.nbit.nt = 0;
-
-    /* Check for valid grid ID and get SDS interface ID */
-    status = GDchkgdid(gridID, "GDsetfillvalue",
-                       &fid, &sdInterfaceID, &gdVgrpID);
-
-    if (status == 0)
-    {
-        /* Get field info */
-        status = GDfieldinfo(gridID, fieldname, &dum, dims, &nt, NULL);
-
-        if (status == 0)
-        {
-            /* Get SDS ID and solo flag */
-            status = GDSDfldsrch(gridID, sdInterfaceID, fieldname,
-                                 &sdid, &dum, &dum, &dum,
-                                 dims, &solo);
-            if (status !=0) {
-              HEpush(DFE_GENAPP, "GDsettilecomp", __FILE__, __LINE__);
-              HEreport("GDSDfldsrch failed\n", fieldname);
-              return FAIL;
-            }
-            /* Tiling with Compression */
-            /* ----------------------- */
-
-
-            /* Setup Compression */
-            /* ----------------- */
-            if (compcode == HDFE_COMP_NBIT)
-              {
-                c_info.nbit.nt = nt;
-                c_info.nbit.sign_ext = compparm[0];
-                c_info.nbit.fill_one = compparm[1];
-                c_info.nbit.start_bit = compparm[2];
-                c_info.nbit.bit_len = compparm[3];
-              }
-            else if (compcode == HDFE_COMP_SKPHUFF)
-              {
-                c_info.skphuff.skp_size = (intn) DFKNTsize(nt);
-              }
-            else if (compcode == HDFE_COMP_DEFLATE)
-              {
-                c_info.deflate.level = compparm[0];
-              }
-
-            /* Setup chunk lengths */
-            /* ------------------- */
-            for (i = 0; i < tilerank; i++)
-              {
-                chunkDef.comp.chunk_lengths[i] = tiledims[i];
-              }
-
-            /* Setup chunk flag & chunk compression type */
-            /* ----------------------------------------- */
-            chunkFlag = HDF_CHUNK | HDF_COMP;
-            chunkDef.comp.comp_type = compcode;
-
-            /* Setup chunk compression parameters */
-            /* ---------------------------------- */
-            if (compcode == HDFE_COMP_SKPHUFF)
-              {
-                chunkDef.comp.cinfo.skphuff.skp_size =
-                  c_info.skphuff.skp_size;
-              }
-            else if (compcode == HDFE_COMP_DEFLATE)
-              {
-                chunkDef.comp.cinfo.deflate.level =
-                  c_info.deflate.level;
-              }
-            /* Call SDsetchunk routine */
-            /* ----------------------- */
-            status = SDsetchunk(sdid, chunkDef, chunkFlag);
-            if (status ==FAIL) {
-              HEpush(DFE_GENAPP, "GDsettilecomp", __FILE__, __LINE__);
-              HEreport("Fieldname \"%s\" does not exist.\n",
-                       fieldname);
-              return status;
-            }
-        }
-        else
-        {
-            HEpush(DFE_GENAPP, "GDsettilecomp", __FILE__, __LINE__);
-            HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-        }
-    }
-    return (status);
-}
-#endif
-
-#ifdef UNUSED_BY_GDAL
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDll2mm_cea                                                      |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  projcode       int32               GCTP projection code                    |
-|  zonecode       int32               UTM zone code                           |
-|  projparm       float64             Projection parameters                   |
-|  spherecode     int32               GCTP spheriod code                      |
-|  xdimsize       int32               xdimsize from GDcreate                  |
-|  ydimsize       int32               ydimsize from GDcreate                  |
-|  upleftpt       float64             upper left corner coordinates  (DMS)    |
-|  lowrightpt     float64             lower right corner coordinates (DMS)    |
-|  longitude      float64             longitude array (DMS)                   |
-|  latitude       float64             latitude array (DMS)                    |
-|  npnts          int32               number of lon-lat points                |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  x              float64             X value array                           |
-|  y              float64             Y value array                           |
-|  scaleX	  float64             X grid size                             |
-|  scaley         float64             Y grid size                             |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Oct 02   Abe Taaheri   Added support for EASE grid                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn GDll2mm_cea(int32 projcode,int32 zonecode, int32 spherecode,
-		 float64 projparm[],
-		 int32 xdimsize, int32 ydimsize,
-		 float64 upleftpt[], float64 lowrightpt[], int32 npnts,
-		 CPL_UNUSED float64 lon[],CPL_UNUSED float64 lat[],
-		 float64 x[],float64 y[], float64 *scaleX,float64 *scaleY)
-{
-    intn            status = 0;	/* routine return status variable */
-    int32           errorcode = 0;	/* GCTP error code */
-    float64         xMtr0, xMtr1, yMtr0, yMtr1;
-    float64         lonrad0;	/* Longitude in radians of upleft point */
-    float64         latrad0;     /* Latitude in radians of upleft point */
-    float64         lonrad;	/* Longitude in radians of point */
-    float64         latrad;	/* Latitude in radians of point */
-    int32(*for_trans[100]) (double, double, double*, double*);	/* GCTP function pointer */
-
-    if(npnts <= 0)
-      {
-	HEpush(DFE_GENAPP, " GDll2mm_cea", __FILE__, __LINE__);
-	HEreport("Improper npnts value\"%d\"... \n", npnts);
-	HEreport("npnts must be greater than zero.\n");
-	status = -1;
-	return (status);
-      }
-    if ( projcode == GCTP_BCEA)
-      {
-	for_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
-		 &errorcode, for_trans);
-	/* Convert upleft and lowright X coords from DMS to radians */
-	/* -------------------------------------------------------- */
-
-	lonrad0 = EHconvAng(upleftpt[0], HDFE_DMS_RAD);
-	lonrad = EHconvAng(lowrightpt[0], HDFE_DMS_RAD);
-
-	/* Convert upleft and lowright Y coords from DMS to radians */
-	/* -------------------------------------------------------- */
-	latrad0 = EHconvAng(upleftpt[1], HDFE_DMS_RAD);
-	latrad = EHconvAng(lowrightpt[1], HDFE_DMS_RAD);
-
-	/* Convert from lon/lat to meters(or whatever unit is, i.e unit
-	   of r_major and r_minor) using GCTP */
-	/* ----------------------------------------- */
-	errorcode = for_trans[projcode] (lonrad0, latrad0, &xMtr0, &yMtr0);
-	x[0] = xMtr0;
-	y[0] = yMtr0;
-
-	/* Report error if any */
-	/* ------------------- */
-	if (errorcode != 0)
-	  {
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDll2mm_cea", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	  }
-
-	/* Convert from lon/lat to meters(or whatever unit is, i.e unit
-	   of r_major and r_minor) using GCTP */
-	/* ----------------------------------------- */
-	errorcode = for_trans[projcode] (lonrad, latrad, &xMtr1, &yMtr1);
-	x[1] = xMtr1;
-	y[1] = yMtr1;
-
-	/* Report error if any */
-	/* ------------------- */
-	if (errorcode != 0)
-	  {
-	    status = -1;
-	    HEpush(DFE_GENAPP, "GDll2mm_cea", __FILE__, __LINE__);
-	    HEreport("GCTP Error: %d\n", errorcode);
-	    return (status);
-	  }
-
-	/* Compute x scale factor */
-	/* ---------------------- */
-	*scaleX = (xMtr1 - xMtr0) / xdimsize;
-
-	/* Compute y scale factor */
-	/* ---------------------- */
-	*scaleY = (yMtr1 - yMtr0) / ydimsize;
-      }
-    else
-      {
-        status = -1;
-        HEpush(DFE_GENAPP, "GDll2mm_cea", __FILE__, __LINE__);
-        HEreport("Wrong projection code; this function is only for EASE grid");
-        return (status);
-      }
-    return (0);
-}
-#endif
-
-
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: GDmm2ll_cea                                                      |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  projcode       int32               GCTP projection code                    |
-|  zonecode       int32               UTM zone code                           |
-|  projparm       float64             Projection parameters                   |
-|  spherecode     int32               GCTP spheriod code                      |
-|  xdimsize       int32               xdimsize from GDcreate                  |
-|  ydimsize       int32               ydimsize from GDcreate                  |
-|  upleftpt       float64             upper left corner coordinates (DMS)     |
-|  lowrightpt     float64             lower right corner coordinates (DMS)    |
-|  x              float64             X value array                           |
-|  y              float64             Y value array                           |
-|  npnts          int32               number of x-y points                    |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  longitude      float64             longitude array (DMS)                   |
-|  latitude       float64             latitude array (DMS)                    |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Oct 02   Abe Taaheri   Added support for EASE grid                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn GDmm2ll_cea(int32 projcode,int32 zonecode, int32 spherecode,
-		 float64 projparm[],
-		 CPL_UNUSED int32 xdimsize, CPL_UNUSED int32 ydimsize,
-		 CPL_UNUSED float64 upleftpt[], CPL_UNUSED float64 lowrightpt[], int32 npnts,
-		 float64 x[], float64 y[],
-		 float64 longitude[], float64 latitude[])
-{
-    intn            status = 0;	/* routine return status variable */
-    int32           errorcode = 0;	/* GCTP error code */
-    int32(*inv_trans[100]) (double, double, double*, double*);	/* GCTP function pointer */
-    int32 i;
-
-    if(npnts <= 0)
-      {
-	HEpush(DFE_GENAPP, " GDmm2ll_cea", __FILE__, __LINE__);
-	HEreport("Improper npnts value\"%d\"... \n", npnts);
-	HEreport("npnts must be greater than zero.\n");
-	status = -1;
-	return (status);
-      }
-    if ( projcode == GCTP_BCEA)
-      {
-	inv_init(projcode, zonecode, projparm, spherecode, NULL, NULL,
-		 &errorcode, inv_trans);
-
-	/* Convert from meters(or whatever unit is, i.e unit
-	   of r_major and r_minor) to lat/lon using GCTP */
-	/* ----------------------------------------- */
-	for(i=0; i<npnts; i++)
-	  {
-	    errorcode =
-	      inv_trans[projcode] (x[i], y[i],&longitude[i], &latitude[i]);
-	    /* Report error if any */
-	    /* ------------------- */
-	    if (errorcode != 0)
-	      {
-		status = -1;
-		HEpush(DFE_GENAPP, "GDmm2ll_cea", __FILE__, __LINE__);
-		HEreport("GCTP Error: %d\n", errorcode);
-		return (status);
-	      }
-	    longitude[i] = EHconvAng(longitude[i], HDFE_RAD_DMS);
-	    latitude[i] = EHconvAng(latitude[i], HDFE_RAD_DMS);
-	  }
-      }
-    else
-      {
-	/* Wrong projection code; this function is only for EASE grid */
-      }
-    return(status);
-}
-#endif
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
diff --git a/frmts/hdf4/hdf-eos/HdfEosDef.h b/frmts/hdf4/hdf-eos/HdfEosDef.h
index 66fe1632d48b..0c16adf190cb 100644
--- a/frmts/hdf4/hdf-eos/HdfEosDef.h
+++ b/frmts/hdf4/hdf-eos/HdfEosDef.h
@@ -130,28 +130,12 @@ extern "C" {
 
 /* Swath Prototype */
 int32 SWopen(const char *, intn);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-int32 SWcreate(int32, const char *);
-#endif
 int32 SWattach(int32, const char *);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-intn SWdefdim(int32, char *, int32);
-intn SWdefcomp(int32, int32, intn []);
-#endif
 int32 SWdiminfo(int32, const char *);
 intn SWmapinfo(int32, const char *, const char *, int32 *, int32 *);
 int32 SWidxmapinfo(int32, const char *, const char *, int32 []);
 intn SWfieldinfo(int32, const char *, int32 *, int32 [], int32 *, char *);
 intn SWcompinfo(int32, const char *, int32 *, intn []);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-intn SWdefdimmap(int32, const char *, const char *, int32, int32);
-intn SWdefidxmap(int32, const char *, const char *, int32 []);
-intn SWdefgeofield(int32, const char *, const char *, int32, int32);
-intn SWdefdatafield(int32, const char *, const char *, int32, int32);
-intn SWwritegeometa(int32, const char *, const char *, int32);
-intn SWwritedatameta(int32, const char *, const char *, int32);
-intn SWwriteattr(int32, const char *, int32, int32, VOIDP);
-#endif
 intn SWreadattr(int32, const char *, VOIDP);
 intn SWattrinfo(int32, const char *, int32 *, int32 *);
 int32 SWinqdims(int32, char *, int32 []);
@@ -162,59 +146,16 @@ int32 SWinqdatafields(int32, char *, int32 [],int32 []);
 int32 SWinqattrs(int32, char *, int32 *);
 int32 SWnentries(int32, int32, int32 *);
 int32 SWinqswath(const char *, char *, int32 *);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-intn SWwritefield(int32, const char *, int32 [], int32 [], int32 [], VOIDP);
-#endif
 intn SWreadfield(int32, const char *, int32 [], int32 [], int32 [], VOIDP);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-int32 SWdefboxregion(int32, float64 [], float64 [], int32);
-int32 SWdefscanregion(int32, const char *, float64 [], int32);
-#endif
-#ifdef UNUSED_BY_GDAL
-int32 SWregionindex(int32, float64 [], float64 [], int32, char *, int32 []);
-intn SWextractregion(int32, int32, const char *, int32, VOIDP);
-intn SWregioninfo(int32, int32, const char *, int32 *, int32 *, int32 [], int32 *);
-int32 SWdupregion(int32);
-#endif
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-int32 SWdeftimeperiod(int32, float64, float64, int32);
-#endif
-#ifdef UNUSED_BY_GDAL
-intn SWextractperiod(int32, int32, const char *, int32, VOIDP);
-intn SWperiodinfo(int32, int32, const char *, int32 *, int32 *, int32 [], int32 *);
-int32 SWdefvrtregion(int32, int32, const char *, float64 []);
-#endif
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-intn SWsetfillvalue(int32, const char *, VOIDP);
-#endif
 intn SWgetfillvalue(int32, const char *, VOIDP);
 intn SWdetach(int32);
 intn SWclose(int32);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-int32 SWupdateidxmap(int32, int32, int32 [], int32 [], int32 []);
-#endif
 intn SWgeomapinfo(int32, const char *);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-intn SWupdatescene(int32, int32);
-#endif
 intn SWsdid(int32, const char *, int32 *);
 
 /* Grid Prototypes */
 int32 GDopen(const char *, intn);
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-int32 GDcreate(int32, const char *, int32, int32, float64 [], float64 []);
-#endif
 int32 GDattach(int32, const char *);
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn GDdefdim(int32, const char *, int32);
-intn GDdefproj(int32, int32, int32, int32, float64 []);
-intn GDblkSOMoffset(int32, float32 [], int32, const char *);
-intn GDdefcomp(int32, int32, intn []);
-intn GDdeftile(int32, int32, int32, int32 []);
-intn GDsettilecomp(int32, const char *, int32, int32 *, int32, intn *);
-intn GDdeforigin(int32, int32);
-intn GDdefpixreg(int32, int32);
-#endif
 int32 GDdiminfo(int32, const char *);
 intn GDgridinfo(int32, int32 *, int32 *, float64 [], float64 []);
 intn GDprojinfo(int32, int32 *, int32 *, int32 *, float64 []);
@@ -223,23 +164,8 @@ intn GDpixreginfo(int32, int32 *);
 intn GDcompinfo(int32, const char *, int32 *, intn []);
 intn GDfieldinfo(int32, const char *, int32 *, int32 [], int32 *, char *);
 intn GDtileinfo(int32, const char *, int32 *, int32 *, int32 []);
-#ifdef UNUSED_BY_GDAL
-intn GDsettilecache(int32, const char *, int32, int32);
-#endif
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn GDwritetile(int32, const char *, int32 [], VOIDP);
-#endif
 intn GDreadtile(int32, const char *, int32 [],  VOIDP);
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn GDdeffield(int32, const char *, const char *, int32, int32);
-intn GDwritefieldmeta(int32, const char *, const char *, int32);
-intn GDwritefield(int32, const char *,
-	     int32 [], int32 [], int32 [], VOIDP);
-#endif
 intn GDreadfield(int32, const char *, int32 [], int32 [], int32 [], VOIDP);
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn GDwriteattr(int32, const char *, int32 , int32, VOIDP);
-#endif
 intn GDreadattr(int32, const char *, VOIDP);
 intn GDattrinfo(int32, const char *, int32 *, int32 *);
 int32 GDinqdims(int32, char *, int32 []);
@@ -247,74 +173,13 @@ int32 GDinqfields(int32, char *, int32 [], int32 []);
 int32 GDinqattrs(int32, char *, int32 *);
 int32 GDnentries(int32, int32, int32 *);
 int32 GDinqgrid(const char *, char *, int32 *);
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-int32 GDdefboxregion(int32, float64 [], float64 []);
-int32 GDdefvrtregion(int32, int32, const char *, float64 []);
-int32 GDdeftimeperiod(int32, int32, float64, float64);
-#endif
-#ifdef UNUSED_BY_GDAL
-intn GDextractregion(int32, int32, const char *, VOIDP);
-intn GDregioninfo(int32, int32, const char *, int32 *, int32 *, int32 [], int32 *,
-                   float64 [], float64 []);
-int32 GDdupregion(int32);
-#endif
 intn GDgetpixels(int32, int32, float64 [], float64 [], int32 [], int32 []);
 int32 GDgetpixvalues(int32, int32, int32 [], int32 [], const char *, VOIDP);
-#ifdef UNUSED_BY_GDAL
-int32 GDinterpolate(int32, int32, float64 [], float64 [], const char *, float64 []);
-#endif
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn GDsetfillvalue(int32, const char *, VOIDP);
-#endif
 intn GDgetfillvalue(int32, const char *, VOIDP);
 intn GDdetach(int32);
 intn GDclose(int32);
-#ifdef UNUSED_BY_GDAL
-intn GDrs2ll(int32, float64 [], int32, int32,
-	     float64 [], float64 [],
-	     int32, float64 [], float64 [],
-	     float64 [], float64 [], int32, int32);
-#endif
 intn GDsdid(int32, const char *, int32 *);
 
-#ifdef UNUSED_BY_GDAL
-/* Point Prototypes */
-int32 PTopen(const char *, intn);
-int32 PTcreate(int32, const char *);
-int32 PTnrecs(int32, int32);
-int32 PTnlevels(int32);
-int32 PTsizeof(int32, const char *, int32 []);
-int32 PTnfields(int32, int32, int32 *);
-int32 PTlevelindx(int32, const char *);
-int32 PTattach(int32, const char *);
-intn PTdeflevel(int32, const char *, const char *, int32 [], int32 []);
-intn PTdeflinkage(int32, const char *, const char *, const char *);
-intn PTbcklinkinfo(int32, int32, const char *);
-intn PTfwdlinkinfo(int32, int32, const char *);
-int32 PTlevelinfo(int32, int32, const char *, int32 [], int32 []);
-intn PTgetlevelname(int32, int32, const char *, int32 *);
-intn PTwritelevel(int32, int32, int32, VOIDP);
-intn PTupdatelevel(int32, int32, const char *, int32, int32 [], VOIDP);
-intn PTreadlevel(int32, int32, const char *, int32, int32 [], VOIDP);
-intn PTgetrecnums(int32, int32, int32, int32, int32 [], int32 *, int32 []);
-intn PTwriteattr(int32, const char *, int32, int32, VOIDP);
-intn PTreadattr(int32, const char *, VOIDP);
-intn PTattrinfo(int32, const char *, int32 *, int32 *);
-int32 PTinqattrs(int32, const char *, int32 *);
-int32 PTinqpoint(const char *, const char *, int32 *);
-int32 PTdefboxregion(int32, float64 [], float64 []);
-int32 PTdeftimeperiod(int32, float64, float64);
-int32 PTdefvrtregion(int32, int32, const char *, float64 []);
-intn PTregioninfo(int32, int32 regionID, int32, const char *, int32 *);
-intn PTregionrecs(int32, int32, int32, int32 *, int32 []);
-intn PTperiodrecs(int32, int32, int32, int32 *, int32 []);
-intn PTperiodinfo(int32, int32 periodID, int32, const char *, int32 *);
-intn PTextractregion(int32, int32 regionID, int32, const char *, VOIDP);
-intn PTextractperiod(int32, int32 periodID, int32, const char *, VOIDP);
-intn PTdetach(int32);
-intn PTclose(int32);
-#endif
-
 
 /* EH Utility Prototypes */
 int32 EHnumstr(const char *);
@@ -329,29 +194,14 @@ intn EHchkfid(int32, const char *, int32 *, int32 *, uint8 *);
 intn EHidinfo(int32, int32 *, int32 *);
 int32 EHgetid(int32, int32, const char *, intn, const char *);
 intn EHrevflds(const char *, char *);
-#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
-intn EHinsertmeta(int32, const char *, const char *, int32, char *, int32 []);
-#endif
 intn EHgetmetavalue(char *[], const char *, char *);
 char * EHmetagroup(int32, const char *, const char *, const char *, char *[]);
-#if defined(HDFEOS_GD_WRITE_SUPPORT) || defined(HDFEOS_SW_WRITE_SUPPORT)
-intn EHfillfld(int32, int32, int32, int32, int32, int32 [], VOIDP);
-#endif
 intn EHattr(int32, int32, const char *, int32, int32, const char *, VOIDP);
 intn EHattrinfo(int32, int32, const char *, int32 *, int32 *);
 int32 EHattrcat(int32, int32, char *, int32 *);
-#ifdef UNUSED_BY_GDAL
-intn EHfilename(int32, char *);
-int32 EHcntOBJECT(char *[]);
-int32 EHcntGROUP(char *[]);
-#endif
 /* 9/3/97 Abe changed the first argument from
    float64 (float64 []) to float64 (*) (float64 [])  for SunOS
    float64 () (float64 []) to float64 (*) (float64 [])  for all other OSs */
-#ifdef HDFEOS_GD_WRITE_SUPPORT
-intn EHbisect(float64 (*) (float64 []), float64 [], int32, float64, float64,
-	      float64, float64 *);
-#endif
 int32 EHinquire(const char *, const char *, char *, int32 *);
 intn EHclose(int32);
 
diff --git a/frmts/hdf4/hdf-eos/SWapi.c b/frmts/hdf4/hdf-eos/SWapi.c
index 27c11e3340a9..fd5bd673cd97 100644
--- a/frmts/hdf4/hdf-eos/SWapi.c
+++ b/frmts/hdf4/hdf-eos/SWapi.c
@@ -88,22 +88,6 @@ June 05, 2003 Abe Taaheri / Bruce Beaumont
 
 
 static int32 SWX1dcomb[512*3];
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-static int32 SWXSDcomb[512*5];
-#endif
-static char  SWXSDname[HDFE_NAMBUFSIZE];
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-static char  SWXSDdims[HDFE_DIMBUFSIZE];
-#endif
-
-#ifdef UNUSED_BY_GDAL
-/* This flag was added to allow the Time field to have different Dimensions
-** than Longitude and Latitude and still be used for subsetting
-** 23 June,1997  DaW
-*/
-static intn  timeflag = 0;
-#endif
-
 
 /* Added for routine that converts scanline to Lat/long
 ** for floating scene subsetting
@@ -164,9 +148,6 @@ static struct swathRegion *SWXRegion[NSWATHREGN];
 static intn SWchkswid(int32, const char *, int32 *, int32 *, int32 *);
 static int32 SWfinfo(int32, const char *, const char *, int32 *,
                      int32 [], int32 *, char *);
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-static intn SWdefinefield(int32, const char *, const char *, const char *, int32, int32);
-#endif
 static intn SWwrrdattr(int32, const char *, int32, int32, const char *, VOIDP);
 static intn SW1dfldsrch(int32, int32, const char *, const char *, int32 *,
                         int32 *, int32 *);
@@ -175,10 +156,6 @@ static intn SWSDfldsrch(int32, int32, const char *, int32 *, int32 *,
 static intn SWwrrdfield(int32, const char *, const char *,
                         int32 [], int32 [], int32 [], VOIDP);
 static int32 SWinqfields(int32, const char *, char *, int32 [], int32 []);
-#ifdef UNUSED_BY_GDAL
-static intn SWscan2longlat(int32, const char *, VOIDP, int32 [], int32 [],
-                           int32 *, int32, int32);
-#endif
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -222,251 +199,6 @@ SWopen(const char *filename, intn i_access)
     return (fid);
 }
 
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWcreate                                                         |
-|                                                                             |
-|  DESCRIPTION: Creates a new swath structure and returns swath ID            |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  swathID        int32               Swath structure ID                      |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  fid            int32               File ID                                 |
-|  swathname      char                Swath structure name                    |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Sep 96   Joel Gales    Check swath name for length                         |
-|  Mar 97   Joel Gales    Enlarge utlbuf to 512                               |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWcreate(int32 fid, const char *swathname)
-{
-    intn            i;		/* Loop index */
-    intn            nswathopen = 0;	/* # of swath structures open */
-    intn            status = 0;	/* routine return status variable */
-
-    uint8           l_access;	/* Read/Write file access code */
-
-    int32           HDFfid;	/* HDF file id */
-    int32           vgRef;	/* Vgroup reference number */
-    int32           vgid[4];	/* Vgroup ID array */
-    int32           swathID = -1;	/* HDF-EOS swath ID */
-
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           nSwath = 0;	/* Swath counter */
-
-    char            name[80];	/* Vgroup name */
-    char            class[80];	/* Vgroup class */
-    char            errbuf[256];/* Buffer for error message */
-    char            utlbuf[512];/* Utility buffer */
-    char            utlbuf2[32];/* Utility buffer 2 */
-
-    /*
-     * Check HDF-EOS file ID, get back HDF file ID, SD interface ID  and
-     * access code
-     */
-    status = EHchkfid(fid, swathname, &HDFfid, &sdInterfaceID, &l_access);
-
-
-    /* Check swathname for length */
-    /* -------------------------- */
-    if ((intn) strlen(swathname) > VGNAMELENMAX)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "SWcreate", __FILE__, __LINE__);
-	HEreport("Swathname \"%s\" must be less than %d characters.\n",
-		 swathname, VGNAMELENMAX);
-    }
-
-
-    if (status == 0)
-    {
-
-	/* Determine number of swaths currently opened */
-	/* ------------------------------------------- */
-	for (i = 0; i < NSWATH; i++)
-	{
-	    nswathopen += SWXSwath[i].active;
-	}
-
-
-	/* Setup file interface */
-	/* -------------------- */
-	if (nswathopen < NSWATH)
-	{
-
-	    /* Check that swath has not been previously opened */
-	    /* ----------------------------------------------- */
-	    vgRef = -1;
-
-	    while (1)
-	    {
-		vgRef = Vgetid(HDFfid, vgRef);
-
-		/* If no more Vgroups then exist while loop */
-		/* ---------------------------------------- */
-		if (vgRef == -1)
-		{
-		    break;
-		}
-
-		/* Get name and class of Vgroup */
-		/* ---------------------------- */
-		vgid[0] = Vattach(HDFfid, vgRef, "r");
-		Vgetname(vgid[0], name);
-		Vgetclass(vgid[0], class);
-		Vdetach(vgid[0]);
-
-		/* If SWATH then increment # swath counter */
-		/* --------------------------------------- */
-		if (strcmp(class, "SWATH") == 0)
-		{
-		    nSwath++;
-		}
-
-		/* If swath already exist, return error */
-		/* ------------------------------------ */
-		if (strcmp(name, swathname) == 0 &&
-		    strcmp(class, "SWATH") == 0)
-		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "SWcreate", __FILE__, __LINE__);
-		    HEreport("\"%s\" already exists.\n", swathname);
-		    break;
-		}
-	    }
-
-
-	    if (status == 0)
-	    {
-
-		/* Create Root Vgroup for Swath */
-		/* ---------------------------- */
-		vgid[0] = Vattach(HDFfid, -1, "w");
-
-
-		/* Set Name and Class (SWATH) */
-		/* -------------------------- */
-		Vsetname(vgid[0], swathname);
-		Vsetclass(vgid[0], "SWATH");
-
-
-
-		/* Create Geolocation Fields Vgroup */
-		/* -------------------------------- */
-		vgid[1] = Vattach(HDFfid, -1, "w");
-		Vsetname(vgid[1], "Geolocation Fields");
-		Vsetclass(vgid[1], "SWATH Vgroup");
-		Vinsert(vgid[0], vgid[1]);
-
-
-
-		/* Create Data Fields Vgroup */
-		/* ------------------------- */
-		vgid[2] = Vattach(HDFfid, -1, "w");
-		Vsetname(vgid[2], "Data Fields");
-		Vsetclass(vgid[2], "SWATH Vgroup");
-		Vinsert(vgid[0], vgid[2]);
-
-
-
-		/* Create Attributes Vgroup */
-		/* ------------------------ */
-		vgid[3] = Vattach(HDFfid, -1, "w");
-		Vsetname(vgid[3], "Swath Attributes");
-		Vsetclass(vgid[3], "SWATH Vgroup");
-		Vinsert(vgid[0], vgid[3]);
-
-
-
-		/* Establish Swath in Structural MetaData Block */
-		/* -------------------------------------------- */
-		snprintf(utlbuf, sizeof(utlbuf), "%s%ld%s%s%s",
-			"\tGROUP=SWATH_", (long)nSwath + 1,
-			"\n\t\tSwathName=\"", swathname, "\"\n");
-
-		strcat(utlbuf, "\t\tGROUP=Dimension\n");
-		strcat(utlbuf, "\t\tEND_GROUP=Dimension\n");
-		strcat(utlbuf, "\t\tGROUP=DimensionMap\n");
-		strcat(utlbuf, "\t\tEND_GROUP=DimensionMap\n");
-		strcat(utlbuf, "\t\tGROUP=IndexDimensionMap\n");
-		strcat(utlbuf, "\t\tEND_GROUP=IndexDimensionMap\n");
-		strcat(utlbuf, "\t\tGROUP=GeoField\n");
-		strcat(utlbuf, "\t\tEND_GROUP=GeoField\n");
-		strcat(utlbuf, "\t\tGROUP=DataField\n");
-		strcat(utlbuf, "\t\tEND_GROUP=DataField\n");
-		strcat(utlbuf, "\t\tGROUP=MergedFields\n");
-		strcat(utlbuf, "\t\tEND_GROUP=MergedFields\n");
-		CPLsnprintf(utlbuf2, sizeof(utlbuf2), "%s%ld%s",
-			"\tEND_GROUP=SWATH_", (long)nSwath + 1, "\n");
-		strcat(utlbuf, utlbuf2);
-
-
-		status = EHinsertmeta(sdInterfaceID, "", "s", 1001L,
-				      utlbuf, NULL);
-	    }
-	}
-	else
-	{
-	    /* Too many files opened */
-	    /* --------------------- */
-	    status = -1;
-	    strcpy(errbuf,
-		   "No more than %d swaths may be open simultaneously");
-	    strcat(errbuf, " (%s)");
-	    HEpush(DFE_DENIED, "SWcreate", __FILE__, __LINE__);
-	    HEreport(errbuf, NSWATH, swathname);
-	}
-
-
-	/* Assign swathID # & Load swath and SWXSwath table entries */
-	/* -------------------------------------------------------- */
-	if (status == 0)
-	{
-
-	    for (i = 0; i < NSWATH; i++)
-	    {
-		if (SWXSwath[i].active == 0)
-		{
-		    /*
-		     * Set swathID, Set swath entry active, Store root Vgroup
-		     * ID, Store sub Vgroup IDs, Store HDF-EOS file ID
-		     */
-		    swathID = i + idOffset;
-		    SWXSwath[i].active = 1;
-		    SWXSwath[i].IDTable = vgid[0];
-		    SWXSwath[i].VIDTable[0] = vgid[1];
-		    SWXSwath[i].VIDTable[1] = vgid[2];
-		    SWXSwath[i].VIDTable[2] = vgid[3];
-		    SWXSwath[i].fid = fid;
-		    status = 0;
-		    break;
-		}
-	    }
-
-	}
-    }
-    return (swathID);
-}
-#endif
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -881,89 +613,6 @@ SWchkswid(int32 swathID, const char *routname,
 
 
 
-
-
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWdefdim                                                         |
-|                                                                             |
-|  DESCRIPTION: Defines numerical value of dimension                          |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  dimname        char                Dimension name to define                |
-|  dim            int32               Dimension value                         |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Dec 96   Joel Gales    Check that dim value >= 0                           |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWdefdim(int32 swathID, char *dimname, int32 dim)
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file id */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-
-    char            swathname[80] /* Swath name */ ;
-
-
-    /* Check for valid swath id */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWdefdim", &fid, &sdInterfaceID, &swVgrpID);
-
-
-    /* Make sure dimension >= 0 */
-    /* ------------------------ */
-    if (dim < 0)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "SWdefdim", __FILE__, __LINE__);
-	HEreport("Dimension value for \"%s\" less than zero: %d.\n",
-		 dimname, dim);
-    }
-
-
-    /* Write Dimension to Structural MetaData */
-    /* -------------------------------------- */
-    if (status == 0)
-    {
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	Vgetname(SWXSwath[sID].IDTable, swathname);
-	int32 dimArray[1] = { dim };
-	status = EHinsertmeta(sdInterfaceID, swathname, "s", 0L,
-			      dimname, dimArray);
-    }
-    return (status);
-}
-#endif
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
@@ -1848,15 +1497,12 @@ SWfieldinfo(int32 swathID, const char *fieldname, int32 * rank, int32 dims[],
 
 
 
-
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdefdimmap                                                      |
+|  FUNCTION: SWwrrdattr                                                       |
 |                                                                             |
-|  DESCRIPTION: Defines mapping between geolocation and data dimensions       |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1865,13 +1511,14 @@ SWfieldinfo(int32 swathID, const char *fieldname, int32 * rank, int32 dims[],
 |                                                                             |
 |  INPUTS:                                                                    |
 |  swathID        int32               swath structure ID                      |
-|  geodim         char                Geolocation dimension                   |
-|  datadim        char                Data dimension                          |
-|  offset         int32               Mapping offset                          |
-|  increment      int32               Mapping increment                       |
+|  attrname       char                attribute name                          |
+|  numbertype     int32               attribute HDF numbertype                |
+|  count          int32               Number of attribute elements            |
+|  wrcode         char                Read/Write Code "w/r"                   |
+|  datbuf         void                I/O buffer                              |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  datbuf                                                                     |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -1879,87 +1526,93 @@ SWfieldinfo(int32 swathID, const char *fieldname, int32 * rank, int32 dims[],
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
+|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWdefdimmap(int32 swathID, const char *geodim, const char *datadim, int32 offset,
-	    int32 increment)
+static intn
+SWwrrdattr(int32 swathID, const char *attrname, int32 numbertype, int32 count,
+	   const char *wrcode, VOIDP datbuf)
 
 {
     intn            status;	/* routine return status variable */
 
     int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           size;	/* Size of geo dim */
+    int32           attrVgrpID;	/* Swath attribute ID */
+    int32           dum;	/* dummy variable */
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           dum;	/* Dummy variable */
-    int32           metadata[2];/* Offset & Increment (passed to metadata) */
-
-    char            mapname[80];/* Mapping name (geodim/datadim) */
-    char            swathname[80];	/* Swath name */
 
-    /* Check Swath ID */
-    status = SWchkswid(swathID, "SWdefdimmap", &fid, &sdInterfaceID, &dum);
+    /* Check Swath id */
+    status = SWchkswid(swathID, "SWwrrdattr", &fid, &dum, &dum);
 
     if (status == 0)
     {
-
-	/* Search Dimension Vdata for dimension entries */
-	/* -------------------------------------------- */
-	size = SWdiminfo(swathID, geodim);
-	if (size == -1)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWdefdimmap", __FILE__, __LINE__);
-	    HEreport("Geolocation dimension name: \"%s\" not found.\n",
-		     geodim);
-	}
-	/* Data Dimension Search */
-	/* --------------------- */
-	if (status == 0)
+	/* Get attribute Vgroup ID and call EHattr to perform I/O */
+	/* ------------------------------------------------------ */
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
 	{
-	    size = SWdiminfo(swathID, datadim);
-	    if (size == -1)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "SWdefdimmap", __FILE__, __LINE__);
-		HEreport("Data dimension name: \"%s\" not found.\n",
-			 datadim);
-	    }
+	    return -1;
 	}
+	attrVgrpID = SWXSwath[sID].VIDTable[2];
+	status = EHattr(fid, attrVgrpID, attrname, numbertype, count,
+			wrcode, datbuf);
+    }
+    return (status);
+}
 
-	/* Write Dimension Map to Structural MetaData */
-	/* ------------------------------------------ */
-	if (status == 0)
-	{
-	    snprintf(mapname, sizeof(mapname), "%s%s%s", geodim, "/", datadim);
-	    metadata[0] = offset;
-	    metadata[1] = increment;
 
-	    int sID = swathID % idOffset;
-	    if (sID >= NSWATH)
-	    {
-	        return -1;
-	    }
-	    Vgetname(SWXSwath[sID].IDTable, swathname);
-	    status = EHinsertmeta(sdInterfaceID, swathname, "s", 1L,
-				  mapname, metadata);
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: SWreadattr                                                       |
+|                                                                             |
+|  DESCRIPTION: Reads attribute from a swath.                                 |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  swathID        int32               swath structure ID                      |
+|  attrname       char                attribute name                          |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  datbuf         void                I/O buffer                              |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+intn
+SWreadattr(int32 swathID, const char *attrname, VOIDP datbuf)
+{
+    intn            status = 0;	/* routine return status variable */
+    int32           dum = 0;	/* dummy variable */
+
+    /* Call SWwrrdattr routine to read attribute */
+    /* ----------------------------------------- */
+    status = SWwrrdattr(swathID, attrname, dum, dum, "r", datbuf);
 
-	}
-    }
     return (status);
 }
 
 
 
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdefidxmap                                                      |
+|  FUNCTION: SWattrinfo                                                       |
 |                                                                             |
-|  DESCRIPTION: Defines l_indexed (non-linear) mapping between geolocation      |
-|               and data dimensions                                           |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -1968,9 +1621,12 @@ SWdefdimmap(int32 swathID, const char *geodim, const char *datadim, int32 offset
 |                                                                             |
 |  INPUTS:                                                                    |
 |  swathID        int32               swath structure ID                      |
-|  geodim         char                Geolocation dimension                   |
-|  datadim        char                Data dimension                          |
-|  l_index          int32               Index mapping array                     |
+|  attrname       char                attribute name                          |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  numbertype     int32               attribute HDF numbertype                |
+|  count          int32               Number of attribute elements            |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
 |             None                                                            |
@@ -1981,135 +1637,65 @@ SWdefdimmap(int32 swathID, const char *geodim, const char *datadim, int32 offset
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
+|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_index[])
-
+SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * count)
 {
-    intn            status;	/* routine return status variable */
+    intn            status = 0;	/* routine return status variable */
 
     int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
     int32           attrVgrpID;	/* Swath attribute ID */
-    int32           vdataID;	/* Mapping Index Vdata ID */
-    int32           gsize;	/* Size of geo dim */
-    int32           dsize;	/* Size of data dim */
+    int32           dum;	/* dummy variable */
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           dum;	/* Dummy variable */
-
-    uint8          *buf;	/* Vdata field buffer */
-
-    char            mapname[80];/* Mapping name (geodim/datadim) */
-    char            swathname[80];	/* Swath name */
-    char            utlbuf[256];/* Utility buffer */
 
+    /* Check for valid swath ID */
+    /* ------------------------ */
+    status = SWchkswid(swathID, "SWattrinfo", &fid, &dum, &dum);
 
-    /* Check Swath ID */
-    status = SWchkswid(swathID, "SWdefidxmap", &fid, &sdInterfaceID, &dum);
     if (status == 0)
     {
-	/* Search Dimension Vdata for dimension entries */
-	/* -------------------------------------------- */
-
-	/* Geo Dimension Search */
-	/* -------------------- */
-
-	gsize = SWdiminfo(swathID, geodim);
-
-	if (gsize == -1)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWdefidxmap", __FILE__, __LINE__);
-	    HEreport("Geolocation dimension name: \"%s\" not found.\n",
-		     geodim);
-	}
-	/* Data Dimension Search */
-	/* --------------------- */
-	if (status == 0)
+	/* Get attribute Vgroup ID and call EHattrinfo */
+	/* ------------------------------------------- */
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
 	{
-	    dsize = SWdiminfo(swathID, datadim);
-	    if (dsize == -1)
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "SWdefidxmap", __FILE__, __LINE__);
-		HEreport("Data dimension name: \"%s\" not found.\n",
-			 datadim);
-	    }
+	    return -1;
 	}
-	/* Define Index Vdata and Store Index Array */
-	/* ---------------------------------------- */
-	if (status == 0)
-	{
-	    /* Get attribute Vgroup ID and allocate data buffer */
-	    /* ------------------------------------------------ */
-	    int sID = swathID % idOffset;
-	    if (sID >= NSWATH)
-	    {
-	        return -1;
-	    }
-	    attrVgrpID = SWXSwath[sID].VIDTable[2];
-	    buf = (uint8 *) calloc(4 * gsize, 1);
-	    if(buf == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdefidxmap", __FILE__, __LINE__);
-		return(-1);
-	    }
-
-	    /* Name: "INDXMAP:" + geodim + "/" + datadim */
-	    snprintf(utlbuf, sizeof(utlbuf), "%s%s%s%s", "INDXMAP:", geodim, "/", datadim);
-
-	    vdataID = VSattach(fid, -1, "w");
-	    VSsetname(vdataID, utlbuf);
-
-	    /* Attribute Class */
-	    VSsetclass(vdataID, "Attr0.0");
-
-	    /* Fieldname is "Index" */
-	    VSfdefine(vdataID, "Index", DFNT_INT32, gsize);
-	    VSsetfields(vdataID, "Index");
-	    memcpy(buf, l_index, 4 * gsize);
-
-	    /* Write to vdata and free data buffer */
-	    VSwrite(vdataID, buf, 1, FULL_INTERLACE);
-	    free(buf);
+	attrVgrpID = SWXSwath[sID].VIDTable[2];
 
-	    /* Insert in Attribute Vgroup and detach Vdata */
-	    Vinsert(attrVgrpID, vdataID);
-	    VSdetach(vdataID);
+	status = EHattrinfo(fid, attrVgrpID, attrname, numbertype,
+			    count);
+    }
+    return (status);
+}
 
 
-	    /* Write to Structural Metadata */
-	    snprintf(mapname, sizeof(mapname), "%s%s%s", geodim, "/", datadim);
-	    Vgetname(SWXSwath[sID].IDTable, swathname);
-		int32 dumArray[1] = { dum };
-	    status = EHinsertmeta(sdInterfaceID, swathname, "s", 2L,
-				  mapname, dumArray);
 
-	}
-    }
-    return (status);
 
-}
 
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdefcomp                                                        |
+|  FUNCTION: SWinqattrs                                                       |
 |                                                                             |
-|  DESCRIPTION: Defines compression type and parameters                       |
+|  DESCRIPTION:                                                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nattr          int32               Number of attributes in swath struct    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  compcode       int32               compression code                        |
-|  compparm       intn                compression parameters                  |
+|  swath ID       int32               swath structure ID                      |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  attrnames      char                Attribute names in swath struct         |
+|                                     (Comma-separated list)                  |
+|  strbufsize     int32               Attributes name list string length      |
 |                                                                             |
 |  OUTPUTS:                                                                   |
 |             None                                                            |
@@ -2119,84 +1705,71 @@ SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_inde
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Sep 96   Joel Gales    Original Programmer                                 |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Oct 96   Joel Gales    Initialize nattr                                    |
+|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWdefcomp(int32 swathID, int32 compcode, intn compparm[])
+int32
+SWinqattrs(int32 swathID, char *attrnames, int32 * strbufsize)
 {
-    intn            status = 0;	/* routine return status variable */
+    intn            status;	/* routine return status variable */
 
-    int32           fid;	/* HDF-EOS file id */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
+    int32           fid;	/* HDF-EOS file ID */
+    int32           attrVgrpID;	/* Swath attribute ID */
+    int32           dum;	/* dummy variable */
+    int32           nattr = 0;	/* Number of attributes */
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           sID;	/* swathID - offset */
 
-
-    /* Check for valid swath id */
-    status = SWchkswid(swathID, "SWdefcomp", &fid, &sdInterfaceID, &swVgrpID);
+    /* Check Swath id */
+    status = SWchkswid(swathID, "SWinqattrs", &fid, &dum, &dum);
 
     if (status == 0)
     {
-	sID = swathID % idOffset;
+	/* Get attribute Vgroup ID and call EHattrcat */
+	/* ------------------------------------------ */
+	int sID = swathID % idOffset;
 	if (sID >= NSWATH)
 	{
 	    return -1;
 	}
+	attrVgrpID = SWXSwath[sID].VIDTable[2];
 
-	/* Set compression code in compression external array */
-	SWXSwath[sID].compcode = compcode;
-
-	switch (compcode)
-	{
-	    /* Set NBIT compression parameters in compression external array */
-	case HDFE_COMP_NBIT:
-
-	    SWXSwath[sID].compparm[0] = compparm[0];
-	    SWXSwath[sID].compparm[1] = compparm[1];
-	    SWXSwath[sID].compparm[2] = compparm[2];
-	    SWXSwath[sID].compparm[3] = compparm[3];
-
-	    break;
-
-	    /* Set GZIP compression parameter in compression external array */
-	case HDFE_COMP_DEFLATE:
-
-	    SWXSwath[sID].compparm[0] = compparm[0];
-
-	    break;
-
-	}
+	nattr = EHattrcat(fid, attrVgrpID, attrnames, strbufsize);
     }
 
-    return (status);
+    return (nattr);
 }
 
+#define REMQUOTE(x) do { \
+    char* l_x = x; \
+    const size_t l_x_len = strlen(l_x); \
+    if (l_x_len >= 2 && l_x[0] == '"' && l_x[l_x_len - 1] == '"') {\
+        memmove(l_x, l_x + 1, l_x_len - 2); \
+        l_x[l_x_len - 2] = 0; \
+    } \
+  } while(0)
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdefinefield                                                    |
+|  FUNCTION: SWinqdims                                                        |
 |                                                                             |
-|  DESCRIPTION: Defines geolocation or data field within swath structure      |
+|  DESCRIPTION: Returns dimension names and values defined in swath structure |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nDim           int32               Number of defined dimensions            |
 |                                                                             |
 |  INPUTS:                                                                    |
 |  swathID        int32               swath structure ID                      |
-|  fieldtype      char                geo/data fieldtype                      |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|  merge          int32               merge code                              |
-|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  dimnames       char                Dimension names (comma-separated)       |
+|  dims           int32               Dimension values                        |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -2204,675 +1777,169 @@ SWdefcomp(int32 swathID, int32 compcode, intn compparm[])
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Check name for length                               |
-|  Sep 96   Joel Gales    Make string array "dimbuf" dynamic                  |
-|  Oct 96   Joel Gales    Make sure total length of "merged" Vdata < 64       |
-|  Jun 03   Abe Taaheri   Supplied cast comp_coder_t in call to SDsetcompress |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nDim to -1 if status = -1                       |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-static intn
-SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const char *dimlist,
-	      int32 numbertype, int32 merge)
+int32
+SWinqdims(int32 swathID, char *dimnames, int32 dims[])
 
 {
-    intn            i;		/* Loop index */
     intn            status;	/* routine return status variable */
-    intn            found;	/* utility found flag */
-    intn            foundNT = 0;/* found number type flag */
-    intn            foundAllDim = 1;	/* found all dimensions flag */
-    intn            first = 1;	/* first entry flag */
-    intn            fac;	/* Geo (-1), Data (+1) field factor */
-    int32           cnt = 0;
 
     int32           fid;	/* HDF-EOS file ID */
-    int32           vdataID = 0;	/* Vdata ID */
-    int32           vgid;	/* Geo/Data field Vgroup ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           sdid;	/* SDS object ID */
-    int32           dimid;	/* SDS dimension ID */
-    int32           recSize;	/* Vdata record size */
     int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           dims[8];	/* Dimension size array */
-    int32           dimsize;	/* Dimension size */
-    int32           rank = 0;	/* Field rank */
-    int32           slen[32];	/* String length array */
+    int32           size;	/* Dimension size */
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           compcode;	/* Compression code */
-    int32           sID;	/* SwathID - offset */
-
-    uint8          *oneDbuf;	/* Vdata record buffer */
-    char           *dimbuf;	/* Dimension buffer */
-    char           *comma;	/* Pointer to comma */
-    char           *dimcheck;	/* Dimension check buffer */
-    char            utlbuf[512];/* Utility buffer */
-    char            utlbuf2[256];	/* Utility buffer 2 */
-    char           *ptr[32];	/* String pointer array */
-    char            swathname[80];	/* Swath name */
-    char            errbuf1[128];	/* Error message buffer 1 */
-    char            errbuf2[128];	/* Error message buffer 2 */
-    char            compparmbuf[128];	/* Compression parameter string buffer */
-
-    const char           *HDFcomp[5] = {"HDFE_COMP_NONE", "HDFE_COMP_RLE",
-	"HDFE_COMP_NBIT", "HDFE_COMP_SKPHUFF",
-    "HDFE_COMP_DEFLATE"};
-    /* Compression code names */
-
-    uint16          good_number[10] = {3, 4, 5, 6, 20, 21, 22, 23, 24, 25};
-    /* Valid number types */
-    comp_info       c_info;	/* Compression parameter structure */
-
-
-
-    /* Setup error message strings */
-    /* --------------------------- */
-    strcpy(errbuf1, "SWXSDname array too small.\nPlease increase ");
-    strcat(errbuf1, "size of HDFE_NAMBUFSIZE in \"HdfEosDef.h\".\n");
-    strcpy(errbuf2, "SWXSDdims array too small.\nPlease increase ");
-    strcat(errbuf2, "size of HDFE_DIMBUFSIZE in \"HdfEosDef.h\".\n");
+    int32           nDim = 0;	/* Number of dimensions */
 
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            swathname[80];	/* Swath Name */
+    char           *utlstr;     /* Utility string */
 
 
-    /*
-     * Check for proper swath ID and return HDF-EOS file ID, SDinterface ID,
-     * and swath root Vgroup ID
-     */
-    status = SWchkswid(swathID, "SWdefinefield",
-		       &fid, &sdInterfaceID, &swVgrpID);
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"SWinqdims", __FILE__, __LINE__);
+	return(-1);
+    }
 
+    /* Check for valid swath id */
+    status = SWchkswid(swathID, "SWinqdims", &fid, &sdInterfaceID, &swVgrpID);
 
     if (status == 0)
     {
-	/* Remove offset from swath ID & get swathname */
-	sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	Vgetname(swVgrpID, swathname);
-
-	/* Allocate space for dimbuf, copy dimlist into it, & append comma */
-	dimbuf = (char *) calloc(strlen(dimlist) + 64, 1);
-	if(dimbuf == NULL)
+	/* If dimension names or sizes are desired ... */
+	/* ------------------------------------------- */
+	if (dimnames != NULL || dims != NULL)
 	{
-	    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
-	    return(-1);
-	}
-	strcpy(dimbuf, dimlist);
-	strcat(dimbuf, ",");
-
-	/* Find comma */
-	comma = strchr(dimbuf, ',');
-
+	    /* Get swath name */
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
-	/*
-	 * Loop through entries in dimension list to make sure they are
-	 * defined in swath
-	 */
-	while (comma != NULL)
-	{
-	    /* Copy dimension list entry to dimcheck */
-	    dimcheck = (char *) calloc(comma - dimbuf + 1, 1);
-	    if(dimcheck == NULL)
+	    /* Get pointers to "Dimension" section within SM */
+	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					   "Dimension", metaptrs);
+	    if(metabuf == NULL)
 	    {
-		HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
-		free(dimbuf);
+		free(utlstr);
 		return(-1);
 	    }
-	    memcpy(dimcheck, dimbuf, comma - dimbuf);
-
-	    /* Get dimension size */
-	    dimsize = SWdiminfo(swathID, dimcheck);
-
-	    /* if != -1 then sent found flag, store size and increment rank */
-	    if (dimsize != -1)
+	    /* If dimension names are desired then "clear" name buffer */
+	    if (dimnames != NULL)
 	    {
-		dims[rank] = dimsize;
-		rank++;
+		dimnames[0] = 0;
 	    }
-	    else
+
+
+	    /* Begin loop through dimension entries in metadata */
+	    /* ------------------------------------------------ */
+	    while (1)
 	    {
-		/*
-		 * If dimension list entry not found - set error return
-		 * status, append name to utility buffer for error report
-		 */
-		status = -1;
-		foundAllDim = 0;
-		if (first == 1)
-		{
-		    strcpy(utlbuf, dimcheck);
-		}
-		else
-		{
-		    strcat(utlbuf, ",");
-		    strcat(utlbuf, dimcheck);
-		}
-		first = 0;
-	    }
-
-	    /*
-	     * Go to next dimension entry, find next comma, & free up
-	     * dimcheck buffer
-	     */
-            *comma = '\0';  /* zero out first comma  */
-            comma++;
-            comma = strchr(comma, ',');
-            if (comma != NULL)
-            {
-               for (i=0; i<(intn)strlen(dimcheck) + 1; i++)
-               {
-                  dimbuf++;
-                  cnt++;
-               }
-            }
-	    free(dimcheck);
-	}
-        for(i=0; i<cnt; i++)
-           dimbuf--;
-
-	free(dimbuf);
-
-
-	/* Check that UNLIMITED dimension is first dimension if present */
-	/* ------------------------------------------------------------ */
-	if (status == 0)
-	{
-	    for (i = 0; i < rank; i++)
-	    {
-		if (dims[i] == 0 && i != 0)
-		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "SWdefinefield", __FILE__, __LINE__);
-		    HEreport("UNLIMITED dimension must be first dimension.\n");
-		}
-	    }
-	}
-
-	/* Check fieldname length */
-	/* ---------------------- */
-	if (status == 0)
-	{
-/* ((intn) strlen(fieldname) > MAX_NC_NAME - 7)
-** this was changed because HDF4.1r3 made a change in the
-** hlimits.h file.  We have notified NCSA and asked to have
-** it made the same as in previous versions of HDF
-** see ncr 26314.  DaW  Apr 2000
-*/
-
-	    if (((intn) strlen(fieldname) > VSNAMELENMAX && rank == 1) ||
-		((intn) strlen(fieldname) > (256 - 7) && rank > 1))
-	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "SWdefinefield", __FILE__, __LINE__);
-		HEreport("Fieldname \"%s\" too long.\n", fieldname);
-	    }
-	}
-
-	/* Check for valid numbertype */
-	/* -------------------------- */
-	if (status == 0)
-	{
-	    for (i = 0; i < 10; i++)
-	    {
-		if (numbertype == good_number[i])
-		{
-		    foundNT = 1;
-		}
-	    }
-
-	    if (foundNT == 0)
-	    {
-		HEpush(DFE_BADNUMTYPE, "SWdefinefield", __FILE__, __LINE__);
-		HEreport("Invalid number type: %d (%s).\n",
-			 numbertype, fieldname);
-		status = -1;
-	    }
-	}
-
-
-	/* Define Field */
-	/* ------------ */
-	if (status == 0)
-	{
-	    /* Set factor & get Field Vgroup id */
-	    /* -------------------------------- */
-	    if (strcmp(fieldtype, "Geolocation Fields") == 0)
-	    {
-		fac = -1;
-		vgid = SWXSwath[sID].VIDTable[0];
-	    }
-	    else
-	    {
-		fac = +1;
-		vgid = SWXSwath[sID].VIDTable[1];
-	    }
-	    /*
-	     * Note: "fac" is used to distinguish geo fields from data fields
-	     * so that they are not merged together
-	     */
-
-
-	    /* One D Fields */
-	    /* ------------ */
-	    if (rank == 1)
-	    {
-		/* No Compression for 1D (Vdata) fields */
-		compcode = HDFE_COMP_NONE;
-
+		/* Search for OBJECT string */
+		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
 
-		/* If field non-appendable and merge set to AUTOMERGE ... */
-		if (dims[0] != 0 && merge == HDFE_AUTOMERGE)
+		/* If found within "Dimension" metadata section ... */
+		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 		{
-		    i = 0;
-		    found = 0;
-
-		    /* Loop through previous entries in 1d combination array */
-		    while (SWX1dcomb[3 * i] != 0)
-		    {
-			/* Get name of previous 1d combined field */
-			vdataID = SWX1dcomb[3 * i + 2];
-			VSgetname(vdataID, utlbuf);
-
-			/*
-			 * If dimension, field type (geo/data), and swath
-			 * structure if current entry match a previous entry
-			 * and combined name is less than max allowed then
-			 * set "found" flag and exit loop
-			 */
-			if (SWX1dcomb[3 * i] == fac * dims[0] &&
-			    SWX1dcomb[3 * i + 1] == swVgrpID &&
-			    (intn) strlen(utlbuf) +
-			    (intn) strlen(fieldname) + 1 <=
-			    VSNAMELENMAX)
-			{
-			    found = 1;
-			    break;
-			}
-			/* Increment loop index */
-			i++;
-		    }
-
-
-		    if (found == 0)
-		    {
-			/*
-			 * If no matching entry found then start new Vdata
-			 * and store dimension size, swath root Vgroup ID,
-			 * field Vdata and fieldname in external array
-			 * "SWX1dcomb"
-			 */
-			vdataID = VSattach(fid, -1, "w");
-			SWX1dcomb[3 * i] = fac * dims[0];
-			SWX1dcomb[3 * i + 1] = swVgrpID;
-			SWX1dcomb[3 * i + 2] = vdataID;
-			VSsetname(vdataID, fieldname);
-		    }
-		    else
+		    /* Get Dimension Name (if desired) */
+		    if (dimnames != NULL)
 		    {
-			/*
-			 * If match then concatenate current fieldname to
-			 * previous matching fieldnames.
-			 */
-			strcat(utlbuf, ",");
-			strcat(utlbuf, fieldname);
-			VSsetname(vdataID, utlbuf);
-		    }
-
-		    /* Define field as field within Vdata */
-		    VSfdefine(vdataID, fieldname, numbertype, 1);
-		    Vinsert(vgid, vdataID);
-
-		}
-		else
-		{
-		    /* 1d No Merge Section */
-
-		    /* Get new vdata ID and establish field within Vdata */
-		    vdataID = VSattach(fid, -1, "w");
-		    VSsetname(vdataID, fieldname);
-		    VSfdefine(vdataID, fieldname, numbertype, 1);
-		    VSsetfields(vdataID, fieldname);
+			/* Check 1st for old meta data then new */
+			/* ------------------------------------ */
+			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
 
-		    recSize = VSsizeof(vdataID, (char*) fieldname);
-		    if (dims[0] == 0)
-		    {
-			/*
-			 * If appendable field then write single record
-			 * filled with 255
-			 */
-			oneDbuf = (uint8 *) calloc(recSize, 1);
-			if(oneDbuf == NULL)
-			{
-			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
-			    return(-1);
-			}
-			for (i = 0; i < recSize; i++)
-			    oneDbuf[i] = 255;
-			VSwrite(vdataID, oneDbuf, 1, FULL_INTERLACE);
-		    }
-		    else
-		    {
 			/*
-			 * If non-appendable then write entire field with
-			 * blank records
+			 * If OBJECT value begins with double quote then old
+			 * metadata, dimension name is OBJECT value.
+			 * Otherwise search for "DimensionName" string
 			 */
-			oneDbuf = (uint8 *) calloc(recSize, dims[0]);
-			if(oneDbuf == NULL)
+			if (utlstr[0] != '"')
 			{
-			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
-			    return(-1);
+			    metaptrs[0] =
+				strstr(metaptrs[0], "\t\t\t\tDimensionName=");
+			    EHgetmetavalue(metaptrs, "DimensionName", utlstr);
 			}
-			VSwrite(vdataID, oneDbuf, dims[0], FULL_INTERLACE);
-		    }
-		    free(oneDbuf);
-
-		    /* Insert Vdata into field Vgroup & detach */
-		    Vinsert(vgid, vdataID);
-		    VSdetach(vdataID);
-
-		}		/* End No Merge Section */
-
-	    }			/* End 1d field Section */
-	    else
-	    {
-		/* SDS Interface (Multi-dim fields) */
-		/* -------------------------------- */
-
-		/* Get current compression code */
-		compcode = SWXSwath[sID].compcode;
-
-		/*
-		 * If rank is less than or equal to 3 (and greater than 1)
-		 * and AUTOMERGE is set and the first dimension is not
-		 * appendable and the compression code is set to none then
-		 * ...
-		 */
-		if (rank <= 3 && merge == HDFE_AUTOMERGE && dims[0] != 0
-		    && compcode == HDFE_COMP_NONE)
-		{
-		    /* Find first empty slot in external combination array */
-		    /* --------------------------------------------------- */
-		    i = 0;
-		    while (SWXSDcomb[5 * i] != 0)
-		    {
-			i++;
-		    }
-
-		    /*
-		     * Store dimensions (with geo/data factor), swath root
-		     * Vgroup ID, and number type in external combination
-		     * array "SWXSDcomb"
-		     */
-
-		    if (rank == 2)
-		    {
-			/* If 2-dim field then set lowest dimension to +/- 1 */
-			SWXSDcomb[5 * i] = fac;
-			SWXSDcomb[5 * i + 1] = fac * dims[0];
-			SWXSDcomb[5 * i + 2] = fac * dims[1];
-		    }
-		    else
-		    {
-			SWXSDcomb[5 * i] = fac * dims[0];
-			SWXSDcomb[5 * i + 1] = fac * dims[1];
-			SWXSDcomb[5 * i + 2] = fac * dims[2];
-		    }
-
-		    SWXSDcomb[5 * i + 3] = swVgrpID;
-		    SWXSDcomb[5 * i + 4] = numbertype;
-
-
-		    /* Concatenate fieldname with combined name string */
-		    /* ----------------------------------------------- */
-		    if ((intn) strlen(SWXSDname) +
-			(intn) strlen(fieldname) + 2 < HDFE_NAMBUFSIZE)
-		    {
-			strcat(SWXSDname, fieldname);
-			strcat(SWXSDname, ",");
-		    }
-		    else
-		    {
-			/* SWXSDname array too small! */
-			/* -------------------------- */
-			HEpush(DFE_GENAPP, "SWdefinefield",
-			       __FILE__, __LINE__);
-			HEreport(errbuf1);
-			status = -1;
-			return (status);
-		    }
-
 
+			/* Strip off double quotes */
+			/* ----------------------- */
+			REMQUOTE(utlstr);
 
-		    /*
-		     * If 2-dim field then set lowest dimension (in 3-dim
-		     * array) to "ONE"
-		     */
-		    if (rank == 2)
-		    {
-			if ((intn) strlen(SWXSDdims) + 5 < HDFE_DIMBUFSIZE)
-			{
-			    strcat(SWXSDdims, "ONE,");
-			}
-			else
+			/* If not first name then add comma delimiter */
+			    if (nDim > 0)
 			{
-			    /* SWXSDdims array too small! */
-			    /* -------------------------- */
-			    HEpush(DFE_GENAPP, "SWdefinefield",
-				   __FILE__, __LINE__);
-			    HEreport(errbuf2);
-			    status = -1;
-			    return (status);
+			    strcat(dimnames, ",");
 			}
-
+			/* Add dimension name to dimension list */
+			strcat(dimnames, utlstr);
 		    }
 
-		    /*
-		     * Concatenate field dimlist to merged dimlist and
-		     * separate fields with semi-colon.
-		     */
-		    if ((intn) strlen(SWXSDdims) +
-			(intn) strlen(dimlist) + 2 < HDFE_DIMBUFSIZE)
-		    {
-			strcat(SWXSDdims, dimlist);
-			strcat(SWXSDdims, ";");
-		    }
-		    else
+		    /* Get Dimension Size (if desired) */
+		    if (dims != NULL)
 		    {
-			/* SWXSDdims array too small! */
-			/* -------------------------- */
-			HEpush(DFE_GENAPP, "SWdefinefield",
-			       __FILE__, __LINE__);
-			HEreport(errbuf2);
-			status = -1;
-			return (status);
+			EHgetmetavalue(metaptrs, "Size", utlstr);
+			size = atoi(utlstr);
+			dims[nDim] = size;
 		    }
-
-		}		/* End Multi-Dim Merge Section */
+		    /* Increment number of dimensions */
+		    nDim++;
+		}
 		else
+		    /* No more dimensions found */
 		{
-		    /* Multi-Dim No Merge Section */
-		    /* ========================== */
-
-		    /* Create SDS dataset */
-		    /* ------------------ */
-		    sdid = SDcreate(sdInterfaceID, fieldname,
-				    numbertype, rank, dims);
-
-
-		    /* Store Dimension Names in SDS */
-		    /* ---------------------------- */
-		    rank = EHparsestr(dimlist, ',', ptr, slen);
-		    for (i = 0; i < rank; i++)
-		    {
-			/* Dimension name = Swathname:Dimname */
-			memcpy(utlbuf, ptr[i], slen[i]);
-			utlbuf[slen[i]] = 0;
-			strcat(utlbuf, ":");
-			strcat(utlbuf, swathname);
-
-			dimid = SDgetdimid(sdid, i);
-			SDsetdimname(dimid, utlbuf);
-		    }
-
-
-		    /* Setup compression parameters */
-		    if (compcode == HDFE_COMP_NBIT)
-		    {
-			c_info.nbit.nt = numbertype;
-			c_info.nbit.sign_ext = SWXSwath[sID].compparm[0];
-			c_info.nbit.fill_one = SWXSwath[sID].compparm[1];
-			c_info.nbit.start_bit = SWXSwath[sID].compparm[2];
-			c_info.nbit.bit_len = SWXSwath[sID].compparm[3];
-		    }
-		    else if (compcode == HDFE_COMP_SKPHUFF)
-		    {
-			c_info.skphuff.skp_size = (intn) DFKNTsize(numbertype);
-		    }
-		    else if (compcode == HDFE_COMP_DEFLATE)
-		    {
-			c_info.deflate.level = SWXSwath[sID].compparm[0];
-		    }
-
-		    /* If field is compressed then call SDsetcompress */
-		    /* ---------------------------------------------- */
-		    if (compcode != HDFE_COMP_NONE)
-		    {
-                        /* status = */ SDsetcompress(sdid, (comp_coder_t) compcode, &c_info);
-		    }
-
-
-		    /* Attach to Vgroup */
-		    /* ---------------- */
-		    Vaddtagref(vgid, DFTAG_NDG, SDidtoref(sdid));
-
-
-		    /* Store SDS dataset IDs */
-		    /* --------------------- */
-		    if (SWXSwath[sID].nSDS > 0)
-		    {
-			SWXSwath[sID].sdsID = (int32 *)
-			    realloc((void *) SWXSwath[sID].sdsID,
-				    (SWXSwath[sID].nSDS + 1) * 4);
-			if(SWXSwath[sID].sdsID == NULL)
-			{
-			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
-			    return(-1);
-			}
-
-		    }
-		    else
-		    {
-			SWXSwath[sID].sdsID = (int32 *) calloc(1, 4);
-			if(SWXSwath[sID].sdsID == NULL)
-			{
-			    HEpush(DFE_NOSPACE,"SWdefinefield", __FILE__, __LINE__);
-			    return(-1);
-			}
-		    }
-		    SWXSwath[sID].sdsID[SWXSwath[sID].nSDS] = sdid;
-		    SWXSwath[sID].nSDS++;
-
-		}		/* End Multi-Dim No Merge Section */
-
-	    }			/* End Multi-Dim Section */
-
-
-
-	    /* Setup metadata string */
-	    /* --------------------- */
-	    snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
-
-
-	    /* Setup compression metadata */
-	    /* -------------------------- */
-	    if (compcode != HDFE_COMP_NONE)
-	    {
-		snprintf(utlbuf2, sizeof(utlbuf2),
-			"%s%s",
-			":\n\t\t\t\tCompressionType=", HDFcomp[compcode]);
-
-		switch (compcode)
-		{
-		case HDFE_COMP_NBIT:
-
-		    snprintf(compparmbuf, sizeof(compparmbuf),
-			    "%s%d,%d,%d,%d%s",
-			    "\n\t\t\t\tCompressionParams=(",
-			    SWXSwath[sID].compparm[0],
-			    SWXSwath[sID].compparm[1],
-			    SWXSwath[sID].compparm[2],
-			    SWXSwath[sID].compparm[3], ")");
-		    strcat(utlbuf2, compparmbuf);
-		    break;
-
-
-		case HDFE_COMP_DEFLATE:
-
-		    snprintf(compparmbuf, sizeof(compparmbuf),
-			    "%s%d",
-			    "\n\t\t\t\tDeflateLevel=",
-			    SWXSwath[sID].compparm[0]);
-		    strcat(utlbuf2, compparmbuf);
 		    break;
 		}
-
-		/* Concatenate compression parameters with compression code */
-		strcat(utlbuf, utlbuf2);
-	    }
-
-
-	    /* Insert field metadata within File Structural Metadata */
-	    /* ----------------------------------------------------- */
-	    if (strcmp(fieldtype, "Geolocation Fields") == 0)
-	    {
-		status = EHinsertmeta(sdInterfaceID, swathname, "s", 3L,
-				      utlbuf, &numbertype);
-	    }
-	    else
-	    {
-		status = EHinsertmeta(sdInterfaceID, swathname, "s", 4L,
-				      utlbuf, &numbertype);
 	    }
-
+	    free(metabuf);
 	}
     }
 
-    /* If all dimensions not found then report error */
-    /* --------------------------------------------- */
-    if (foundAllDim == 0)
+
+    /* Set nDim to -1 if error status exists */
+    /* ------------------------------------- */
+    if (status == -1)
     {
-	HEpush(DFE_GENAPP, "SWdefinefield", __FILE__, __LINE__);
-	HEreport("Dimension(s): \"%s\" not found (%s).\n",
-		 utlbuf, fieldname);
-	status = -1;
+	nDim = -1;
     }
+    free(utlstr);
 
-    return (status);
+    return (nDim);
 }
 
 
 
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdefgeofield                                                    |
+|  FUNCTION: SWinqmaps                                                        |
 |                                                                             |
-|  DESCRIPTION: Defines geolocation field within swath structure (wrapper)    |
+|  DESCRIPTION: Returns dimension mappings and offsets and increments         |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nMap           int32               Number of dimension mappings            |
 |                                                                             |
 |  INPUTS:                                                                    |
 |  swathID        int32               swath structure ID                      |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|  merge          int32               merge code                              |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  dimmaps        char                dimension mappings (comma-separated)    |
+|  offset         int32               array of offsets                        |
+|  increment      int32               array of increments                     |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -2880,168 +1947,172 @@ SWdefinefield(int32 swathID, const char *fieldtype, const char *fieldname, const
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nMap to -1 if status = -1                       |
+|                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWdefgeofield(int32 swathID, const char *fieldname, const char *dimlist,
-	      int32 numbertype, int32 merge)
+int32
+SWinqmaps(int32 swathID, char *dimmaps, int32 offset[], int32 increment[])
+
 {
     intn            status;	/* routine return status variable */
 
-    /* Call SWdefinefield routine */
-    /* -------------------------- */
-    status = SWdefinefield(swathID, "Geolocation Fields", fieldname, dimlist,
-			   numbertype, merge);
+    int32           fid;	/* HDF-EOS file ID */
+    int32           sdInterfaceID;	/* HDF SDS interface ID */
+    int32           swVgrpID;	/* Swath root Vgroup ID */
+    int32           off;	/* Mapping Offset */
+    int32           incr;	/* Mapping Increment */
+    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
+    int32           nMap = 0;	/* Number of mappings */
 
-    return (status);
-}
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            swathname[80];	/* Swath Name */
+    char           *utlstr;     /* Utility string */
 
 
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"SWinqmaps", __FILE__, __LINE__);
+	return(-1);
+    }
 
+    /* Check for valid swath id */
+    status = SWchkswid(swathID, "SWinqmaps", &fid, &sdInterfaceID, &swVgrpID);
+    if (status == 0)
+    {
+	/* If mapping names or offsets or increments desired ... */
+	/* ----------------------------------------------------- */
+	if (dimmaps != NULL || offset != NULL || increment != NULL)
+	{
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWdefdatafield                                                   |
-|                                                                             |
-|  DESCRIPTION: Defines data field within swath structure (wrapper)           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|  merge          int32               merge code                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWdefdatafield(int32 swathID, const char *fieldname, const char *dimlist,
-	       int32 numbertype, int32 merge)
-{
-    intn            status;	/* routine return status variable */
+	    /* Get swath name */
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
-    /* Call SWdefinefield routine */
-    /* -------------------------- */
-    status = SWdefinefield(swathID, "Data Fields", fieldname, dimlist,
-			   numbertype, merge);
+	    /* Get pointers to "DimensionMap" section within SM */
+	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					   "DimensionMap", metaptrs);
+	    if(metabuf == NULL)
+	    {
+		free(utlstr);
+		return(-1);
+	    }
+	    /* If mapping names are desired then "clear" name buffer */
+	    if (dimmaps != NULL)
+	    {
+		dimmaps[0] = 0;
+	    }
 
-    return (status);
-}
+	    /* Begin loop through mapping entries in metadata */
+	    /* ---------------------------------------------- */
+	    while (1)
+	    {
+		/* Search for OBJECT string */
+		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
 
+		/* If found within "DimensionMap" metadata section ... */
+		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
+		{
+		    /* Get Geo & Data Dimensions (if desired) */
+		    if (dimmaps != NULL)
+		    {
+			/* Get Geo Dim, remove quotes, add "/" */
+			EHgetmetavalue(metaptrs, "GeoDimension", utlstr);
+			REMQUOTE(utlstr);
+			strcat(utlstr, "/");
 
+			/* If not first map then add comma delimiter. */
+			if (nMap > 0)
+			{
+			    strcat(dimmaps, ",");
+			}
 
+			/* Add to map list */
+			strcat(dimmaps, utlstr);
 
+			/* Get Data Dim, remove quotes */
+			EHgetmetavalue(metaptrs, "DataDimension", utlstr);
+			REMQUOTE(utlstr);
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWwritegeometa                                                   |
-|                                                                             |
-|  DESCRIPTION: Defines structural metadata for pre-existing geolocation      |
-|               field within swath structure                                  |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWwritegeometa(int32 swathID, const char *fieldname, const char *dimlist,
-	       int32 numbertype)
-{
-    intn            status = 0;	/* routine return status variable */
+			/* Add to map list */
+			    strcat(dimmaps, utlstr);
+		    }
 
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           dum;	/* dummy variable */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
+		    /* Get Offset (if desired) */
+		    if (offset != NULL)
+		    {
+			EHgetmetavalue(metaptrs, "Offset", utlstr);
+			off = atoi(utlstr);
+			offset[nMap] = off;
+		    }
 
-    char            utlbuf[256];/* Utility buffer */
-    char            swathname[80];	/* Swath name */
+		    /* Get Increment (if desired) */
+		    if (increment != NULL)
+		    {
+			EHgetmetavalue(metaptrs, "Increment", utlstr);
+			incr = atoi(utlstr);
+			increment[nMap] = incr;
+		    }
+
+		    /* Increment number of maps */
+		    nMap++;
+		}
+		else
+		    /* No more mappings found */
+		{
+		    break;
+		}
+	    }
+	    free(metabuf);
+	}
+    }
 
-    status = SWchkswid(swathID, "SWwritegeometa", &dum, &sdInterfaceID,
-		       &dum);
 
-    if (status == 0)
+    /* Set nMap to -1 if error status exists */
+    /* ------------------------------------- */
+    if (status == -1)
     {
-	/* Setup and write field metadata */
-	/* ------------------------------ */
-	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
-
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	Vgetname(SWXSwath[sID].IDTable, swathname);
-	int32 numbertypeArray[1] = { numbertype };
-	status = EHinsertmeta(sdInterfaceID, swathname, "s", 3L,
-			      utlbuf, numbertypeArray);
+	nMap = -1;
     }
+    free(utlstr);
 
-    return (status);
+    return (nMap);
 }
 
 
 
 
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWwritedatameta                                                  |
+|  FUNCTION: SWinqidxmaps                                                     |
 |                                                                             |
-|  DESCRIPTION: Defines structural metadata for pre-existing data             |
-|               field within swath structure                                  |
+|  DESCRIPTION: Returns l_indexed mappings and l_index sizes                      |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nMap           int32               Number of l_indexed dimension mappings    |
 |                                                                             |
 |  INPUTS:                                                                    |
 |  swathID        int32               swath structure ID                      |
-|  fieldname      char                fieldname                               |
-|  dimlist        char                Dimension list (comma-separated list)   |
-|  numbertype     int32               field type                              |
-|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  idxmaps        char                l_indexed dimension mappings              |
+|                                     (comma-separated)                       |
+|  idxsizes       int32               Number of elements in each mapping      |
+|                                                                             |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -3049,3921 +2120,166 @@ SWwritegeometa(int32 swathID, const char *fieldname, const char *dimlist,
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nMap to -1 if status = -1                       |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWwritedatameta(int32 swathID, const char *fieldname, const char *dimlist,
-		int32 numbertype)
+int32
+SWinqidxmaps(int32 swathID, char *idxmaps, int32 idxsizes[])
+
 {
-    intn            status = 0;	/* routine return status variable */
+    intn            status;	/* routine return status variable */
 
+    int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           dum;	/* dummy variable */
+    int32           swVgrpID;	/* Swath root Vgroup ID */
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
+    int32           nMap = 0;	/* Number of mappings */
 
-    char            utlbuf[256];/* Utility buffer */
-    char            swathname[80];	/* Swath name */
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            swathname[80];	/* Swath Name */
+    char           *utlstr;     /* Utility string */
+    char           *slash;	/* Pointer to slash */
 
-    status = SWchkswid(swathID, "SWwritedatameta", &dum, &sdInterfaceID,
-		       &dum);
 
-    if (status == 0)
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
     {
-	/* Setup and write field metadata */
-	/* ------------------------------ */
-	snprintf(utlbuf, sizeof(utlbuf), "%s%s%s", fieldname, ":", dimlist);
-
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	Vgetname(SWXSwath[sID].IDTable, swathname);
-	int32 numbertypeArray[1] = { numbertype };
-	status = EHinsertmeta(sdInterfaceID, swathname, "s", 4L,
-			      utlbuf, numbertypeArray);
+	HEpush(DFE_NOSPACE,"SWinqidxmaps", __FILE__, __LINE__);
+	return(-1);
     }
-    return (status);
-}
-#endif
-
+    /* Check for valid swath id */
+    status = SWchkswid(swathID, "SWinqidxmaps", &fid,
+		       &sdInterfaceID, &swVgrpID);
 
+    if (status == 0)
+    {
+	/* If mapping names or l_index sizes desired ... */
+	/* ------------------------------------------- */
+	if (idxmaps != NULL || idxsizes != NULL)
+	{
+	    /* Get swath name */
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
+	    {
+	        free(utlstr);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWwrrdattr                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  attrname       char                attribute name                          |
-|  numbertype     int32               attribute HDF numbertype                |
-|  count          int32               Number of attribute elements            |
-|  wrcode         char                Read/Write Code "w/r"                   |
-|  datbuf         void                I/O buffer                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  datbuf                                                                     |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-SWwrrdattr(int32 swathID, const char *attrname, int32 numbertype, int32 count,
-	   const char *wrcode, VOIDP datbuf)
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           attrVgrpID;	/* Swath attribute ID */
-    int32           dum;	/* dummy variable */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-
-    /* Check Swath id */
-    status = SWchkswid(swathID, "SWwrrdattr", &fid, &dum, &dum);
-
-    if (status == 0)
-    {
-	/* Get attribute Vgroup ID and call EHattr to perform I/O */
-	/* ------------------------------------------------------ */
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	attrVgrpID = SWXSwath[sID].VIDTable[2];
-	status = EHattr(fid, attrVgrpID, attrname, numbertype, count,
-			wrcode, datbuf);
-    }
-    return (status);
-}
-
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWwriteattr                                                      |
-|                                                                             |
-|  DESCRIPTION: Writes/updates attribute in a swath.                          |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  attrname       char                attribute name                          |
-|  numbertype     int32               attribute HDF numbertype                |
-|  count          int32               Number of attribute elements            |
-|  datbuf         void                I/O buffer                              |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWwriteattr(int32 swathID, const char *attrname, int32 numbertype, int32 count,
-	    VOIDP datbuf)
-{
-    intn            status = 0;	/* routine return status variable */
-
-    /* Call SWwrrdattr routine to write attribute */
-    /* ------------------------------------------ */
-    status = SWwrrdattr(swathID, attrname, numbertype, count, "w", datbuf);
-
-    return (status);
-}
-#endif
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWreadattr                                                       |
-|                                                                             |
-|  DESCRIPTION: Reads attribute from a swath.                                 |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  attrname       char                attribute name                          |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  datbuf         void                I/O buffer                              |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWreadattr(int32 swathID, const char *attrname, VOIDP datbuf)
-{
-    intn            status = 0;	/* routine return status variable */
-    int32           dum = 0;	/* dummy variable */
-
-    /* Call SWwrrdattr routine to read attribute */
-    /* ----------------------------------------- */
-    status = SWwrrdattr(swathID, attrname, dum, dum, "r", datbuf);
-
-    return (status);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWattrinfo                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  attrname       char                attribute name                          |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  numbertype     int32               attribute HDF numbertype                |
-|  count          int32               Number of attribute elements            |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * count)
-{
-    intn            status = 0;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           attrVgrpID;	/* Swath attribute ID */
-    int32           dum;	/* dummy variable */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWattrinfo", &fid, &dum, &dum);
-
-    if (status == 0)
-    {
-	/* Get attribute Vgroup ID and call EHattrinfo */
-	/* ------------------------------------------- */
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	attrVgrpID = SWXSwath[sID].VIDTable[2];
-
-	status = EHattrinfo(fid, attrVgrpID, attrname, numbertype,
-			    count);
-    }
-    return (status);
-}
-
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqattrs                                                       |
-|                                                                             |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nattr          int32               Number of attributes in swath struct    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swath ID       int32               swath structure ID                      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  attrnames      char                Attribute names in swath struct         |
-|                                     (Comma-separated list)                  |
-|  strbufsize     int32               Attributes name list string length      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Initialize nattr                                    |
-|  Oct 96   Joel Gales    Get Attribute Vgroup ID from external array         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqattrs(int32 swathID, char *attrnames, int32 * strbufsize)
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           attrVgrpID;	/* Swath attribute ID */
-    int32           dum;	/* dummy variable */
-    int32           nattr = 0;	/* Number of attributes */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-
-    /* Check Swath id */
-    status = SWchkswid(swathID, "SWinqattrs", &fid, &dum, &dum);
-
-    if (status == 0)
-    {
-	/* Get attribute Vgroup ID and call EHattrcat */
-	/* ------------------------------------------ */
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	attrVgrpID = SWXSwath[sID].VIDTable[2];
-
-	nattr = EHattrcat(fid, attrVgrpID, attrnames, strbufsize);
-    }
-
-    return (nattr);
-}
-
-#define REMQUOTE(x) do { \
-    char* l_x = x; \
-    const size_t l_x_len = strlen(l_x); \
-    if (l_x_len >= 2 && l_x[0] == '"' && l_x[l_x_len - 1] == '"') {\
-        memmove(l_x, l_x + 1, l_x_len - 2); \
-        l_x[l_x_len - 2] = 0; \
-    } \
-  } while(0)
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqdims                                                        |
-|                                                                             |
-|  DESCRIPTION: Returns dimension names and values defined in swath structure |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nDim           int32               Number of defined dimensions            |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  dimnames       char                Dimension names (comma-separated)       |
-|  dims           int32               Dimension values                        |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nDim to -1 if status = -1                       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqdims(int32 swathID, char *dimnames, int32 dims[])
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           size;	/* Dimension size */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           nDim = 0;	/* Number of dimensions */
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            swathname[80];	/* Swath Name */
-    char           *utlstr;     /* Utility string */
-
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWinqdims", __FILE__, __LINE__);
-	return(-1);
-    }
-
-    /* Check for valid swath id */
-    status = SWchkswid(swathID, "SWinqdims", &fid, &sdInterfaceID, &swVgrpID);
-
-    if (status == 0)
-    {
-	/* If dimension names or sizes are desired ... */
-	/* ------------------------------------------- */
-	if (dimnames != NULL || dims != NULL)
-	{
-	    /* Get swath name */
-	    int sID = swathID % idOffset;
-	    if (sID >= NSWATH)
-	    {
-	        free(utlstr);
-	        return -1;
-	    }
-	    Vgetname(SWXSwath[sID].IDTable, swathname);
-
-	    /* Get pointers to "Dimension" section within SM */
-	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					   "Dimension", metaptrs);
-	    if(metabuf == NULL)
-	    {
-		free(utlstr);
-		return(-1);
-	    }
-	    /* If dimension names are desired then "clear" name buffer */
-	    if (dimnames != NULL)
-	    {
-		dimnames[0] = 0;
-	    }
-
-
-	    /* Begin loop through dimension entries in metadata */
-	    /* ------------------------------------------------ */
-	    while (1)
-	    {
-		/* Search for OBJECT string */
-		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
-
-		/* If found within "Dimension" metadata section ... */
-		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-		{
-		    /* Get Dimension Name (if desired) */
-		    if (dimnames != NULL)
-		    {
-			/* Check 1st for old meta data then new */
-			/* ------------------------------------ */
-			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
-
-			/*
-			 * If OBJECT value begins with double quote then old
-			 * metadata, dimension name is OBJECT value.
-			 * Otherwise search for "DimensionName" string
-			 */
-			if (utlstr[0] != '"')
-			{
-			    metaptrs[0] =
-				strstr(metaptrs[0], "\t\t\t\tDimensionName=");
-			    EHgetmetavalue(metaptrs, "DimensionName", utlstr);
-			}
-
-			/* Strip off double quotes */
-			/* ----------------------- */
-			REMQUOTE(utlstr);
-
-			/* If not first name then add comma delimiter */
-			    if (nDim > 0)
-			{
-			    strcat(dimnames, ",");
-			}
-			/* Add dimension name to dimension list */
-			strcat(dimnames, utlstr);
-		    }
-
-		    /* Get Dimension Size (if desired) */
-		    if (dims != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "Size", utlstr);
-			size = atoi(utlstr);
-			dims[nDim] = size;
-		    }
-		    /* Increment number of dimensions */
-		    nDim++;
-		}
-		else
-		    /* No more dimensions found */
-		{
-		    break;
-		}
-	    }
-	    free(metabuf);
-	}
-    }
-
-
-    /* Set nDim to -1 if error status exists */
-    /* ------------------------------------- */
-    if (status == -1)
-    {
-	nDim = -1;
-    }
-    free(utlstr);
-
-    return (nDim);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqmaps                                                        |
-|                                                                             |
-|  DESCRIPTION: Returns dimension mappings and offsets and increments         |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nMap           int32               Number of dimension mappings            |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  dimmaps        char                dimension mappings (comma-separated)    |
-|  offset         int32               array of offsets                        |
-|  increment      int32               array of increments                     |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nMap to -1 if status = -1                       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqmaps(int32 swathID, char *dimmaps, int32 offset[], int32 increment[])
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           off;	/* Mapping Offset */
-    int32           incr;	/* Mapping Increment */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           nMap = 0;	/* Number of mappings */
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            swathname[80];	/* Swath Name */
-    char           *utlstr;     /* Utility string */
-
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWinqmaps", __FILE__, __LINE__);
-	return(-1);
-    }
-
-    /* Check for valid swath id */
-    status = SWchkswid(swathID, "SWinqmaps", &fid, &sdInterfaceID, &swVgrpID);
-    if (status == 0)
-    {
-	/* If mapping names or offsets or increments desired ... */
-	/* ----------------------------------------------------- */
-	if (dimmaps != NULL || offset != NULL || increment != NULL)
-	{
-
-	    /* Get swath name */
-	    int sID = swathID % idOffset;
-	    if (sID >= NSWATH)
-	    {
-	        free(utlstr);
-	        return -1;
-	    }
-	    Vgetname(SWXSwath[sID].IDTable, swathname);
-
-	    /* Get pointers to "DimensionMap" section within SM */
-	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					   "DimensionMap", metaptrs);
-	    if(metabuf == NULL)
-	    {
-		free(utlstr);
-		return(-1);
-	    }
-	    /* If mapping names are desired then "clear" name buffer */
-	    if (dimmaps != NULL)
-	    {
-		dimmaps[0] = 0;
-	    }
-
-	    /* Begin loop through mapping entries in metadata */
-	    /* ---------------------------------------------- */
-	    while (1)
-	    {
-		/* Search for OBJECT string */
-		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
-
-		/* If found within "DimensionMap" metadata section ... */
-		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-		{
-		    /* Get Geo & Data Dimensions (if desired) */
-		    if (dimmaps != NULL)
-		    {
-			/* Get Geo Dim, remove quotes, add "/" */
-			EHgetmetavalue(metaptrs, "GeoDimension", utlstr);
-			REMQUOTE(utlstr);
-			strcat(utlstr, "/");
-
-			/* If not first map then add comma delimiter. */
-			if (nMap > 0)
-			{
-			    strcat(dimmaps, ",");
-			}
-
-			/* Add to map list */
-			strcat(dimmaps, utlstr);
-
-			/* Get Data Dim, remove quotes */
-			EHgetmetavalue(metaptrs, "DataDimension", utlstr);
-			REMQUOTE(utlstr);
-
-			/* Add to map list */
-			    strcat(dimmaps, utlstr);
-		    }
-
-		    /* Get Offset (if desired) */
-		    if (offset != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "Offset", utlstr);
-			off = atoi(utlstr);
-			offset[nMap] = off;
-		    }
-
-		    /* Get Increment (if desired) */
-		    if (increment != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "Increment", utlstr);
-			incr = atoi(utlstr);
-			increment[nMap] = incr;
-		    }
-
-		    /* Increment number of maps */
-		    nMap++;
-		}
-		else
-		    /* No more mappings found */
-		{
-		    break;
-		}
-	    }
-	    free(metabuf);
-	}
-    }
-
-
-    /* Set nMap to -1 if error status exists */
-    /* ------------------------------------- */
-    if (status == -1)
-    {
-	nMap = -1;
-    }
-    free(utlstr);
-
-    return (nMap);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqidxmaps                                                     |
-|                                                                             |
-|  DESCRIPTION: Returns l_indexed mappings and l_index sizes                      |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nMap           int32               Number of l_indexed dimension mappings    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  idxmaps        char                l_indexed dimension mappings              |
-|                                     (comma-separated)                       |
-|  idxsizes       int32               Number of elements in each mapping      |
-|                                                                             |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nMap to -1 if status = -1                       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqidxmaps(int32 swathID, char *idxmaps, int32 idxsizes[])
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           nMap = 0;	/* Number of mappings */
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            swathname[80];	/* Swath Name */
-    char           *utlstr;     /* Utility string */
-    char           *slash;	/* Pointer to slash */
-
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWinqidxmaps", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check for valid swath id */
-    status = SWchkswid(swathID, "SWinqidxmaps", &fid,
-		       &sdInterfaceID, &swVgrpID);
-
-    if (status == 0)
-    {
-	/* If mapping names or l_index sizes desired ... */
-	/* ------------------------------------------- */
-	if (idxmaps != NULL || idxsizes != NULL)
-	{
-	    /* Get swath name */
-	    int sID = swathID % idOffset;
-	    if (sID >= NSWATH)
-	    {
-	        free(utlstr);
-	        return -1;
-	    }
-	    Vgetname(SWXSwath[sID].IDTable, swathname);
-
-	    /* Get pointers to "IndexDimensionMap" section within SM */
-	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					   "IndexDimensionMap", metaptrs);
-	    if(metabuf == NULL)
-	    {
-		free(utlstr);
-		return(-1);
-	    }
-	    /* If mapping names are desired then "clear" name buffer */
-	    if (idxmaps != NULL)
-	    {
-		idxmaps[0] = 0;
-	    }
-
-	    /* Begin loop through mapping entries in metadata */
-	    /* ---------------------------------------------- */
-	    while (1)
-	    {
-		/* Search for OBJECT string */
-		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
-
-		/* If found within "IndexDimensionMap" metadata section ... */
-		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-		{
-		    /* Get Geo & Data Dimensions and # of indices */
-		    if (idxmaps != NULL)
-		    {
-			/* Get Geo Dim, remove quotes, add "/" */
-			EHgetmetavalue(metaptrs, "GeoDimension", utlstr);
-			REMQUOTE(utlstr);
-			strcat(utlstr, "/");
-
-			/* If not first map then add comma delimiter. */
-			if (nMap > 0)
-			{
-			    strcat(idxmaps, ",");
-			}
-
-			/* Add to map list */
-			strcat(idxmaps, utlstr);
-
-
-			/* Get Index size (if desired) */
-			if (idxsizes != NULL)
-			{
-			    /* Parse off geo dimension and find its size */
-			    slash = strchr(utlstr, '/');
-			    if (slash) *slash = 0;
-			    idxsizes[nMap] = SWdiminfo(swathID, utlstr);
-			}
-
-
-			/* Get Data Dim, remove quotes */
-			EHgetmetavalue(metaptrs, "DataDimension", utlstr);
-			REMQUOTE(utlstr);
-
-			/* Add to map list */
-			    strcat(idxmaps, utlstr);
-		    }
-
-		    /* Increment number of maps */
-		    nMap++;
-		}
-		else
-		    /* No more mappings found */
-		{
-		    break;
-		}
-	    }
-	    free(metabuf);
-	}
-    }
-
-
-    /* Set nMap to -1 if error status exists */
-    /* ------------------------------------- */
-    if (status == -1)
-    {
-	nMap = -1;
-    }
-    free(utlstr);
-
-    return (nMap);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqfields                                                      |
-|                                                                             |
-|  DESCRIPTION: Returns fieldnames, ranks and numbertypes defined in swath.   |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nFld           int32               Number of (geo/data) fields in swath    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldtype      char                field type (geo or data)                |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  fieldlist      char                Field names (comma-separated)           |
-|  rank           int32               Array of ranks                          |
-|  numbertype     int32               Array of HDF number types               |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nFld to -1 if status = -1                       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static int32
-SWinqfields(int32 swathID, const char *fieldtype, char *fieldlist, int32 rank[],
-	    int32 numbertype[])
-
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           nFld = 0;	/* Number of mappings */
-    int32           slen[8];	/* String length array */
-
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char            swathname[80];	/* Swath Name */
-    char           *utlstr;	/* Utility string */
-    char           *utlstr2;	/* Utility string 2 */
-    char           *ptr[8];	/* String pointer array */
-
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWinqfields", __FILE__, __LINE__);
-	return(-1);
-    }
-
-    utlstr2 = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr2 == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWinqfields", __FILE__, __LINE__);
-	free(utlstr);
-	return(-1);
-    }
-
-    /* Check for valid swath id */
-    status = SWchkswid(swathID, "SWinqfields",
-		       &fid, &sdInterfaceID, &swVgrpID);
-
-    if (status == 0)
-    {
-	/* If field names, ranks,  or number types desired ... */
-	/* --------------------------------------------------- */
-	if (fieldlist != NULL || rank != NULL || numbertype != NULL)
-	{
-	    /* Get swath name */
-	    int sID = swathID % idOffset;
-	    if (sID >= NSWATH)
-	    {
-	        free(utlstr);
-	        free(utlstr2);
-	        return -1;
-	    }
-	    Vgetname(SWXSwath[sID].IDTable, swathname);
-
-	    /* Get pointers to "GeoField" or "DataField" section within SM */
-	    if (strcmp(fieldtype, "Geolocation Fields") == 0)
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "GeoField", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    free(utlstr2);
-		    return(-1);
-		}
-		strcpy(utlstr2, "GeoFieldName");
-	    }
-	    else
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "DataField", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    free(utlstr2);
-		    return(-1);
-		}
-		strcpy(utlstr2, "DataFieldName");
-	    }
-
-
-	    /* If field names are desired then "clear" name buffer */
-	    if (fieldlist != NULL)
-	    {
-		fieldlist[0] = 0;
-	    }
-
-
-	    /* Begin loop through mapping entries in metadata */
-	    /* ---------------------------------------------- */
-	    while (1)
-	    {
-		/* Search for OBJECT string */
-		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
-
-		/* If found within "Geo" or "Data" Field metadata section .. */
-		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-		{
-		    /* Get Fieldnames (if desired) */
-		    if (fieldlist != NULL)
-		    {
-			/* Check 1st for old meta data then new */
-			/* ------------------------------------ */
-			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
-
-			/*
-			 * If OBJECT value begins with double quote then old
-			 * metadata, field name is OBJECT value. Otherwise
-			 * search for "GeoFieldName" or "DataFieldName"
-			 * string
-			 */
-
-			if (utlstr[0] != '"')
-			{
-			    strcpy(utlstr, "\t\t\t\t");
-			    strcat(utlstr, utlstr2);
-			    strcat(utlstr, "=");
-			    metaptrs[0] = strstr(metaptrs[0], utlstr);
-			    EHgetmetavalue(metaptrs, utlstr2, utlstr);
-			}
-
-			/* Strip off double quotes */
-			/* ----------------------- */
-			REMQUOTE(utlstr);
-
-
-			/* Add to fieldlist */
-			/* ---------------- */
-			    if (nFld > 0)
-			{
-			    strcat(fieldlist, ",");
-			}
-			strcat(fieldlist, utlstr);
-
-		    }
-		    /* Get Numbertype */
-		    if (numbertype != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "DataType", utlstr);
-			numbertype[nFld] = EHnumstr(utlstr);
-		    }
-		    /*
-		     * Get Rank (if desired) by counting # of dimensions in
-		     * "DimList" string
-		     */
-		    if (rank != NULL)
-		    {
-			EHgetmetavalue(metaptrs, "DimList", utlstr);
-			rank[nFld] = EHparsestr(utlstr, ',', ptr, slen);
-		    }
-		    /* Increment number of fields */
-		    nFld++;
-		}
-		else
-		    /* No more fields found */
-		{
-		    break;
-		}
-	    }
-	    free(metabuf);
-	}
-    }
-
-    /* Set nFld to -1 if error status exists */
-    /* ------------------------------------- */
-    if (status == -1)
-    {
-	nFld = -1;
-    }
-
-    free(utlstr);
-    free(utlstr2);
-
-    return (nFld);
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqgeofields                                                   |
-|                                                                             |
-|  DESCRIPTION: Inquires about geo fields in swath                            |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nflds          int32               Number of geo fields in swath           |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  fieldlist      char                Field names (comma-separated)           |
-|  rank           int32               Array of ranks                          |
-|  numbertype     int32               Array of HDF number types               |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqgeofields(int32 swathID, char *fieldlist, int32 rank[],
-	       int32 numbertype[])
-{
-
-    int32           nflds;	/* Number of Geolocation fields */
-
-    /* Call "SWinqfields" routine */
-    /* -------------------------- */
-    nflds = SWinqfields(swathID, "Geolocation Fields", fieldlist, rank,
-			numbertype);
-
-    return (nflds);
-
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqdatafields                                                  |
-|                                                                             |
-|  DESCRIPTION: Inquires about data fields in swath                           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nflds          int32               Number of data fields in swath          |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  fieldlist      char                Field names (comma-separated)           |
-|  rank           int32               Array of ranks                          |
-|  numbertype     int32               Array of HDF number types               |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqdatafields(int32 swathID, char *fieldlist, int32 rank[],
-		int32 numbertype[])
-{
-
-    int32           nflds;	/* Number of Data fields */
-
-    /* Call "SWinqfields" routine */
-    /* -------------------------- */
-    nflds = SWinqfields(swathID, "Data Fields", fieldlist, rank,
-			numbertype);
-
-    return (nflds);
-
-}
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWnentries                                                       |
-|                                                                             |
-|  DESCRIPTION: Returns number of entries and string buffer size              |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nEntries       int32               Number of entries                       |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  entrycode      int32               Entry code                              |
-|	                              HDFE_NENTDIM  (0)                       |
-|	                              HDFE_NENTMAP  (1)                       |
-|	                              HDFE_NENTIMAP (2)                       |
-|	                              HDFE_NENTGFLD (3)                       |
-|	                              HDFE_NENTDFLD (4)                       |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  strbufsize     int32               Length of comma-separated list          |
-|                                     (Does not include null-terminator       |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|  Feb 97   Joel Gales    Set nEntries to -1 if status = -1                   |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWnentries(int32 swathID, int32 entrycode, int32 * strbufsize)
-
-{
-    intn            status;	    /* routine return status variable */
-    intn            i;		    /* Loop index */
-
-    int32           fid;	    /* HDF-EOS file ID */
-    int32           sdInterfaceID;  /* HDF SDS interface ID */
-    int32           swVgrpID;	    /* Swath root Vgroup ID */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           nEntries = 0;   /* Number of entries */
-    int32           metaflag;	    /* Old (0), New (1) metadata flag) */
-    int32           nVal = 0;	    /* Number of strings to search for */
-
-    char           *metabuf = NULL; /* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];    /* Pointers to begin and end of SM section */
-    char            swathname[80];  /* Swath Name */
-    char           *utlstr;	    /* Utility string */
-    char            valName[2][32]; /* Strings to search for */
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWnemtries", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Check for valid swath id */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWnentries", &fid, &sdInterfaceID, &swVgrpID);
-
-    if (status == 0)
-    {
-	/* Get swath name */
-	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    free(utlstr);
-	    return -1;
-	}
-	Vgetname(SWXSwath[sID].IDTable, swathname);
-
-	/* Zero out string buffer size */
-	*strbufsize = 0;
-
-
-	/*
-	 * Get pointer to relevant section within SM and Get names of
-	 * metadata strings to inquire about
-	 */
-	switch (entrycode)
-	{
-	case HDFE_NENTDIM:
-	    /* Dimensions */
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "Dimension", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-		nVal = 1;
-		strcpy(&valName[0][0], "DimensionName");
-	    }
-	    break;
-
-	case HDFE_NENTMAP:
-	    /* Dimension Maps */
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "DimensionMap", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-		nVal = 2;
-		strcpy(&valName[0][0], "GeoDimension");
-		strcpy(&valName[1][0], "DataDimension");
-	    }
-	    break;
-
-	case HDFE_NENTIMAP:
-	    /* Indexed Dimension Maps */
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					     "IndexDimensionMap", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-		nVal = 2;
-		strcpy(&valName[0][0], "GeoDimension");
-		strcpy(&valName[1][0], "DataDimension");
-	    }
-	    break;
-
-	case HDFE_NENTGFLD:
-	    /* Geolocation Fields */
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "GeoField", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-		nVal = 1;
-		strcpy(&valName[0][0], "GeoFieldName");
-	    }
-	    break;
-
-	case HDFE_NENTDFLD:
-	    /* Data Fields */
-	    {
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "DataField", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-		nVal = 1;
-		strcpy(&valName[0][0], "DataFieldName");
-	    }
-	    break;
-	}
-
-
-	/*
-	 * Check for presence of 'GROUP="' string If found then old metadata,
-	 * search on OBJECT string
-	 */
-        if (metabuf)
-        {
-            metaflag = (strstr(metabuf, "GROUP=\"") == NULL) ? 1 : 0;
-            if (metaflag == 0)
-            {
-                nVal = 1;
-                strcpy(&valName[0][0], "\t\tOBJECT");
-            }
-
-
-            /* Begin loop through entries in metadata */
-            /* -------------------------------------- */
-            while (1)
-            {
-                /* Search for first string */
-                strcpy(utlstr, &valName[0][0]);
-                strcat(utlstr, "=");
-                metaptrs[0] = strstr(metaptrs[0], utlstr);
-
-                /* If found within relevant metadata section ... */
-                if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
-                {
-                    for (i = 0; i < nVal; i++)
-                    {
-                        /*
-                         * Get all string values Don't count quotes
-                         */
-                        EHgetmetavalue(metaptrs, &valName[i][0], utlstr);
-                        *strbufsize += (int32)strlen(utlstr) - 2;
-                    }
-                    /* Increment number of entries */
-                    nEntries++;
-
-                    /* Go to end of OBJECT */
-                    metaptrs[0] = strstr(metaptrs[0], "END_OBJECT");
-                }
-                else
-                    /* No more entries found */
-                {
-                    break;
-                }
-            }
-            free(metabuf);
-        }
-
-
-	/* Count comma separators & slashes (if mappings) */
-	/* ---------------------------------------------- */
-	if (nEntries > 0)
-	{
-	    *strbufsize += nEntries - 1;
-	    *strbufsize += (nVal - 1) * nEntries;
-	}
-    }
-
-
-    /* Set nEntries to -1 if error status exists */
-    /* ----------------------------------------- */
-    if (status == -1)
-	nEntries = -1;
-
-    free(utlstr);
-
-    return (nEntries);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWinqswath                                                       |
-|                                                                             |
-|  DESCRIPTION: Returns number and names of swath structures in file          |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nSwath         int32               Number of swath structures in file      |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  filename       char                HDF-EOS filename                        |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  swathlist      char                List of swath names (comma-separated)   |
-|  strbufsize     int32               Length of swathlist                     |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWinqswath(const char *filename, char *swathlist, int32 * strbufsize)
-{
-    int32           nSwath;	/* Number of swath structures in file */
-
-    /* Call "EHinquire" routine */
-    /* ------------------------ */
-    nSwath = EHinquire(filename, "SWATH", swathlist, strbufsize);
-
-    return (nSwath);
-}
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SW1dfldsrch                                                      |
-|                                                                             |
-|  DESCRIPTION: Retrieves information about a 1D field                        |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  fid            int32               HDF-EOS file ID                         |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      const char          field name                              |
-|  access         const char          Access code (w/r)                       |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  vgidout        int32               Field (geo/data) vgroup ID              |
-|  vdataIDout     int32               Field Vdata ID                          |
-|  fldtype        int32               Field type                              |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-SW1dfldsrch(int32 fid, int32 swathID, const char *fieldname, const char *i_access,
-	    int32 * vgidout, int32 * vdataIDout, int32 * fldtype)
-
-{
-    intn            status = 0;	/* routine return status variable */
-
-    int32           sID;	/* SwathID - offset */
-    int32           vgid;	/* Swath Geo or Data Vgroup ID */
-    int32           vdataID;	/* 1d field vdata */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-
-
-    /* Compute "reduced" swath ID */
-    /* -------------------------- */
-    sID = swathID % idOffset;
-    if (sID >= NSWATH)
-    {
-        return -1;
-    }
-
-    /* Get Geolocation Vgroup id and 1D field name Vdata id */
-    /* ---------------------------------------------------- */
-    vgid = SWXSwath[sID].VIDTable[0];
-    vdataID = EHgetid(fid, vgid, fieldname, 1, i_access);
-    *fldtype = 0;
-
-
-    /*
-     * If name not found in Geolocation Vgroup then detach Geolocation Vgroup
-     * and search in Data Vgroup
-     */
-    if (vdataID == -1)
-    {
-	vgid = SWXSwath[sID].VIDTable[1];;
-	vdataID = EHgetid(fid, vgid, fieldname, 1, i_access);
-	*fldtype = 1;
-
-	/* If field also not found in Data Vgroup then set error status */
-	/* ------------------------------------------------------------ */
-	if (vdataID == -1)
-	{
-	    status = -1;
-	    vgid = -1;
-	    vdataID = -1;
-	}
-    }
-    *vgidout = vgid;
-    *vdataIDout = vdataID;
-
-    return (status);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWSDfldsrch                                                      |
-|                                                                             |
-|  DESCRIPTION: Retrieves information SDS field                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  sdInterfaceID  int32               SD interface ID                         |
-|  fieldname      const char          field name                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  sdid           int32               SD element ID                           |
-|  rankSDS        int32               Rank of SDS                             |
-|  rankFld        int32               True rank of field (merging)            |
-|  offset         int32               Offset of field within merged field     |
-|  dims           int32               Dimensions of field                     |
-|  solo           int32               Solo field flag                         |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-SWSDfldsrch(int32 swathID, int32 sdInterfaceID, const char *fieldname,
-            int32 * sdid, int32 * rankSDS, int32 * rankFld, int32 * offset,
-            int32 dims[], int32 * solo)
-{
-    intn            i;		/* Loop index */
-    intn            status = -1;/* routine return status variable */
-
-    int32           sID;	/* SwathID - offset */
-    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
-    int32           dum;	/* Dummy variable */
-    int32           dums[128];	/* Dummy array */
-    int32           attrIndex;	/* Attribute l_index */
-
-    char            name[2048];	/* Merged-Field Names */
-    char            swathname[80];	/* Swath Name */
-    char           *utlstr;	/* Utility string */
-    char           *metabuf;	/* Pointer to structural metadata (SM) */
-    char           *metaptrs[2];/* Pointers to begin and end of SM section */
-    char           *oldmetaptr;	/* Pointer within SM section */
-
-
-    /* Allocate space for utility string */
-    /* --------------------------------- */
-    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
-    if(utlstr == NULL)
-    {
-	HEpush(DFE_NOSPACE,"SWSDfldsrch", __FILE__, __LINE__);
-	return(-1);
-    }
-    /* Set solo flag to 0 (no) */
-    /* ----------------------- */
-    *solo = 0;
-
-
-    /* Compute "reduced" swath ID */
-    /* -------------------------- */
-    sID = swathID % idOffset;
-    if (sID >= NSWATH)
-    {
-        return -1;
-    }
-
-    /* Loop through all SDSs in swath */
-    /* ------------------------------ */
-    for (i = 0; i < SWXSwath[sID].nSDS; i++)
-    {
-	/* If active SDS ... */
-	/* ----------------- */
-	if (SWXSwath[sID].sdsID[i] != 0)
-	{
-	    /* Get SDS ID, name, rankSDS, and dimensions */
-	    /* ----------------------------------------- */
-	    *sdid = SWXSwath[sID].sdsID[i];
-	    SDgetinfo(*sdid, name, rankSDS, dims, &dum, &dum);
-	    *rankFld = *rankSDS;
-
-	    /* If merged field ... */
-	    /* ------------------- */
-	    if (strstr(name, "MRGFLD_") == &name[0])
-	    {
-		/* Get swath name */
-		/* -------------- */
-		Vgetname(SWXSwath[sID].IDTable, swathname);
-
-
-		/* Get pointers to "MergedFields" section within SM */
-		/* ------------------------------------------------ */
-		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
-					       "MergedFields", metaptrs);
-		if(metabuf == NULL)
-		{
-		    free(utlstr);
-		    return(-1);
-		}
-
-		/* Store metaptr in order to recover */
-		/* --------------------------------- */
-		oldmetaptr = metaptrs[0];
-
-
-		/* Search for Merged field name */
-		/* ---------------------------- */
-		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%.480s%s", "MergedFieldName=\"",
-			name, "\"\n");
-		metaptrs[0] = strstr(metaptrs[0], utlstr);
-
-
-		/* If not found check for old metadata */
-		/* ----------------------------------- */
-		if (metaptrs[0] == NULL)
-		{
-		    snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%.480s%s", "OBJECT=\"", name, "\"\n");
-		    metaptrs[0] = strstr(oldmetaptr, utlstr);
-		}
-
-
-		/* Get field list and strip off leading and trailing quotes */
-		EHgetmetavalue(metaptrs, "FieldList", name);  /* not return status --xhua */
-		memmove(name, name + 1, strlen(name) - 2);
-		name[strlen(name) - 2] = 0;
-
-		/* Search for desired field within merged field list */
-		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"");
-		dum = EHstrwithin(utlstr, name, ',');
-
-		free(metabuf);
-	    }
-	    else
-	    {
-		/* If solo (unmerged) check if SDS name matches fieldname */
-		/* ------------------------------------------------------ */
-		dum = EHstrwithin(fieldname, name, ',');
-		if (dum != -1)
-		{
-		    *solo = 1;
-		    *offset = 0;
-		}
-	    }
-
-
-	    /* If field found ... */
-	    /* ------------------ */
-	    if (dum != -1)
-	    {
-		status = 0;
-
-		/* If merged field ... */
-		/* ------------------- */
-		if (*solo == 0)
-		{
-		    /* Get "Field Offsets" SDS attribute l_index */
-		    /* --------------------------------------- */
-		    attrIndex = SDfindattr(*sdid, "Field Offsets");
-
-		    /*
-		     * If attribute exists then get offset of desired field
-		     * within merged field
-		     */
-		    if (attrIndex != -1)
-		    {
-			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
-			*offset = dums[dum];
-		    }
-
-
-		    /* Get "Field Dims" SDS attribute l_index */
-		    /* ------------------------------------ */
-		    attrIndex = SDfindattr(*sdid, "Field Dims");
-
-		    /*
-		     * If attribute exists then get 0th dimension of desired
-		     * field within merged field
-		     */
-		    if (attrIndex != -1)
-		    {
-			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
-			dims[0] = dums[dum];
-
-			/* If this dimension = 1 then field is really 2 dim */
-			/* ------------------------------------------------ */
-			if (dums[dum] == 1)
-			{
-			    *rankFld = 2;
-			}
-		    }
-		}
-
-
-		/* Break out of SDS loop */
-		/* --------------------- */
-		break;
-	    }			/* End of found field section */
-	}
-	else
-	{
-	    /* First non-active SDS signifies no more, break out of SDS loop */
-	    /* ------------------------------------------------------------- */
-	    break;
-	}
-    }
-
-    free(utlstr);
-
-    return (status);
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWwrrdfield                                                      |
-|                                                                             |
-|  DESCRIPTION: Writes/Reads fields                                           |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      const char          fieldname                               |
-|  code           const char          Write/Read code (w/r)                   |
-|  start          int32               start array                             |
-|  stride         int32               stride array                            |
-|  edge           int32               edge array                              |
-|  datbuf         void                data buffer for read                    |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  datbuf         void                data buffer for write                   |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Feb 97   Joel Gales    Stride = 1 HDF compression workaround               |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-static intn
-SWwrrdfield(int32 swathID, const char *fieldname, const char *code,
-	    int32 start[], int32 stride[], int32 edge[], VOIDP datbuf)
-
-{
-    intn            i;		/* Loop index */
-    intn            status = 0;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           vgid;	/* Swath Geo or Data Vgroup ID */
-    int32           sdid;	/* SDS ID */
-    int32           dum;	/* Dummy variable */
-    int32           rankSDS;	/* Rank of SDS */
-    int32           rankFld;	/* Rank of field */
-
-    int32           vdataID;	/* 1d field vdata */
-    int32           recsize;	/* Vdata record size */
-    int32           fldsize;	/* Field size */
-    int32           nrec;	/* Number of records in Vdata */
-
-    int32           offset[8];	/* I/O offset (start) */
-    int32           incr[8];	/* I/O increment (stride) */
-    int32           count[8];	/* I/O count (edge) */
-    int32           dims[8];	/* Field/SDS dimensions */
-    int32           mrgOffset;	/* Merged field offset */
-    int32           nflds;	/* Number of fields in Vdata */
-    int32           strideOne;	/* Strides = 1 flag */
-
-    uint8          *buf;	/* I/O (transfer) buffer */
-    uint8          *fillbuf;	/* Fill value buffer */
-
-    char            attrName[80];	/* Name of fill value attribute */
-    char           *ptr[64];	/* String pointer array */
-    char            fieldlist[256];	/* Vdata field list */
-
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWwrrdfield", &fid, &sdInterfaceID, &dum);
-
-
-    if (status == 0)
-    {
-
-	/* Check whether fieldname is in SDS (multi-dim field) */
-	/* --------------------------------------------------- */
-	status = SWSDfldsrch(swathID, sdInterfaceID, fieldname, &sdid,
-			     &rankSDS, &rankFld, &mrgOffset, dims, &dum);
-
-	/* Multi-Dimensional Field Section */
-	/* ------------------------------- */
-	if (status != -1)
-	{
-	    /* Set I/O offset Section */
-	    /* ---------------------- */
-
-	    /*
-	     * If start == NULL (default) set I/O offset of 0th field to
-	     * offset within merged field (if any) and the rest to 0
-	     */
-	    if (start == NULL)
-	    {
-		for (i = 0; i < rankSDS; i++)
-		{
-		    offset[i] = 0;
-		}
-		offset[0] = mrgOffset;
-	    }
-	    else
-	    {
-		/*
-		 * ... otherwise set I/O offset to user values, adjusting the
-		 * 0th field with the merged field offset (if any)
-		 */
-		if (rankFld == rankSDS)
-		{
-		    for (i = 0; i < rankSDS; i++)
-		    {
-			offset[i] = start[i];
-		    }
-		    offset[0] += mrgOffset;
-		}
-		else
-		{
-		    /*
-		     * If field really 2-dim merged in 3-dim field then set
-		     * 0th field offset to merge offset and then next two to
-		     * the user values
-		     */
-		    for (i = 0; i < rankFld; i++)
-		    {
-			offset[i + 1] = start[i];
-		    }
-		    offset[0] = mrgOffset;
-		}
-	    }
-
-
-
-	    /* Set I/O stride Section */
-	    /* ---------------------- */
-
-	    /*
-	     * If stride == NULL (default) set I/O stride to 1
-	     */
-	    if (stride == NULL)
-	    {
-		for (i = 0; i < rankSDS; i++)
-		{
-		    incr[i] = 1;
-		}
-	    }
-	    else
-	    {
-		/*
-		 * ... otherwise set I/O stride to user values
-		 */
-		if (rankFld == rankSDS)
-		{
-		    for (i = 0; i < rankSDS; i++)
-		    {
-			incr[i] = stride[i];
-		    }
-		}
-		else
-		{
-		    /*
-		     * If field really 2-dim merged in 3-dim field then set
-		     * 0th field stride to 1 and then next two to the user
-		     * values.
-		     */
-		    for (i = 0; i < rankFld; i++)
-		    {
-			incr[i + 1] = stride[i];
-		    }
-		    incr[0] = 1;
-		}
-	    }
-
-
-
-	    /* Set I/O count Section */
-	    /* --------------------- */
-
-	    /*
-	     * If edge == NULL (default) set I/O count to number of remaining
-	     * entries (dims - start) / increment.  Note that 0th field
-	     * offset corrected for merged field offset (if any).
-	     */
-	    if (edge == NULL)
-	    {
-		for (i = 1; i < rankSDS; i++)
-		{
-		    count[i] = (dims[i] - offset[i]) / incr[i];
-		}
-		count[0] = (dims[0] - (offset[0] - mrgOffset)) / incr[0];
-	    }
-	    else
-	    {
-		/*
-		 * ... otherwise set I/O count to user values
-		 */
-		if (rankFld == rankSDS)
-		{
-		    for (i = 0; i < rankSDS; i++)
-		    {
-			count[i] = edge[i];
-		    }
-		}
-		else
-		{
-		    /*
-		     * If field really 2-dim merged in 3-dim field then set
-		     * 0th field count to 1 and then next two to the user
-		     * values.
-		     */
-		    for (i = 0; i < rankFld; i++)
-		    {
-			count[i + 1] = edge[i];
-		    }
-		    count[0] = 1;
-		}
-	    }
-
-	    /* Perform I/O with relevant HDF I/O routine */
-	    /* ----------------------------------------- */
-	    if (strcmp(code, "w") == 0)
-	    {
-		/* Set strideOne to true (1) */
-		/* ------------------------- */
-		strideOne = 1;
-
-
-		/* If incr[i] != 1 set strideOne to false (0) */
-		/* ------------------------------------------ */
-		for (i = 0; i < rankSDS; i++)
-		{
-		    if (incr[i] != 1)
-		    {
-			strideOne = 0;
-			break;
-		    }
-		}
-
-
-		/*
-		 * If strideOne is true use NULL parameter for stride. This
-		 * is a work-around to HDF compression problem
-		 */
-		if (strideOne == 1)
-		{
-		    status = SDwritedata(sdid, offset, NULL, count,
-					 (VOIDP) datbuf);
-		}
-		else
-		{
-		    status = SDwritedata(sdid, offset, incr, count,
-					 (VOIDP) datbuf);
-		}
-	    }
-	    else
-	    {
-		status = SDreaddata(sdid, offset, incr, count,
-				    (VOIDP) datbuf);
-	    }
-	}			/* End of Multi-Dimensional Field Section */
-	else
-	{
-
-	    /* One-Dimensional Field Section */
-	    /* ----------------------------- */
-
-	    /* Check fieldname within 1d field Vgroups */
-	    /* --------------------------------------- */
-	    status = SW1dfldsrch(fid, swathID, fieldname, code,
-				 &vgid, &vdataID, &dum);
-
-	    if (status != -1)
-	    {
-
-		/* Get number of records */
-		/* --------------------- */
-		nrec = VSelts(vdataID);
-
-
-		/* Set offset, increment, & count */
-		/* ------------------------------ */
-		offset[0] = (start == NULL) ? 0 : start[0];
-		incr[0] = (stride == NULL) ? 1 : stride[0];
-		count[0] = (edge == NULL)
-		    ? (nrec - offset[0]) / incr[0]
-		    : edge[0];
-
-
-
-		/* Write Section */
-		/* ------------- */
-		if (strcmp(code, "w") == 0)
-		{
-		    /* Get size of field and setup fill buffer */
-		    /* --------------------------------------- */
-		    fldsize = VSsizeof(vdataID, (char *)fieldname);
-		    fillbuf = (uint8 *) calloc(fldsize, 1);
-		    if(fillbuf == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
-			return(-1);
-		    }
-
-		    /* Get size of record in Vdata and setup I/O buffer */
-		    /* ------------------------------------------------ */
-		    VSQueryvsize(vdataID, &recsize);
-		    buf = (uint8 *) calloc(recsize, count[0] * incr[0]);
-		    if(buf == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
-			free(fillbuf);
-			return(-1);
-		    }
-
-
-		    /* Get names and number of fields in each record  */
-		    /* ---------------------------------------------- */
-		    VSgetfields(vdataID, fieldlist);
-		    dum = EHstrwithin(fieldname, fieldlist, ',');
-		    nflds = EHparsestr(fieldlist, ',', ptr, NULL);
-
-
-		    /* Get Merged Field Offset (if any) */
-		    /* -------------------------------- */
-		    if (nflds > 1)
-		    {
-			if (dum > 0)
-			{
-			    *(ptr[dum] - 1) = 0;
-			    mrgOffset = VSsizeof(vdataID, fieldlist);
-			    *(ptr[dum] - 1) = ',';
-			}
-			else
-			{
-			    mrgOffset = 0;
-			}
-
-			/* Read records to recover previously written data */
-			/* status = */ VSsetfields(vdataID, fieldlist);
-			/* status = */ VSseek(vdataID, offset[0]);
-			nrec = VSread(vdataID, buf, count[0] * incr[0],
-				      FULL_INTERLACE);
-		    }
-		    else
-		    {
-			mrgOffset = 0;
-		    }
-
-
-
-		    /* Fill buffer with "Fill" value (if any) */
-		    /* -------------------------------------- */
-                    snprintf( attrName, sizeof(attrName), "_FV_%s", fieldname);
-
-		    status = SWreadattr(swathID, attrName, (char *) fillbuf);
-		    if (status == 0)
-		    {
-			for (i = 0; i < count[0] * incr[0]; i++)
-			{
-			    memcpy(buf + i * recsize + mrgOffset,
-				   fillbuf, fldsize);
-			}
-		    }
-
-
-		    /* Write new data into buffer */
-		    /* -------------------------- */
-		    if (incr[0] == 1 && nflds == 1)
-		    {
-			memcpy(buf, datbuf, count[0] * recsize);
-		    }
-		    else
-		    {
-			for (i = 0; i < count[0]; i++)
-			{
-			    memcpy(buf + i * recsize * incr[0] + mrgOffset,
-				   (uint8 *) datbuf + i * fldsize, fldsize);
-			}
-		    }
-
-
-		    /* If append read last record */
-		    /* -------------------------- */
-		    if (offset[0] == nrec)
-		    {
-			/* abe added "status =" to next line 8/8/97 */
-			status = VSseek(vdataID, offset[0] - 1);
-			VSread(vdataID, fillbuf, 1, FULL_INTERLACE);
-		    }
-		    else
-		    {
-			status = VSseek(vdataID, offset[0]);
-		    }
-
-
-		    /* Write data into Vdata */
-		    /* --------------------- */
-		    nrec = VSwrite(vdataID, buf, count[0] * incr[0],
-				   FULL_INTERLACE);
-
-		    free(fillbuf);
-                    if (status > 0)
-                       status = 0;
-
-		}		/* End Write Section */
-		else
-		{
-		    /* Read Section */
-		    /* ------------ */
-		    status = VSsetfields(vdataID, fieldname);
-		    fldsize = VSsizeof(vdataID, (char *)fieldname);
-		    buf = (uint8 *) calloc(fldsize, count[0] * incr[0]);
-		    if(buf == NULL)
-		    {
-			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
-			return(-1);
-		    }
-
-		    (void) VSseek(vdataID, offset[0]);
-		    (void) VSread(vdataID, buf, count[0] * incr[0],
-			   FULL_INTERLACE);
-
-
-		    /* Copy from input buffer to returned data buffer */
-		    /* ---------------------------------------------- */
-		    if (incr[0] == 1)
-		    {
-			memcpy(datbuf, buf, count[0] * fldsize);
-		    }
-		    else
-		    {
-			for (i = 0; i < count[0]; i++)
-			{
-			    memcpy((uint8 *) datbuf + i * fldsize,
-				   buf + i * fldsize * incr[0], fldsize);
-			}
-		    }
-
-		}		/* End Read Section */
-
-		free(buf);
-		VSdetach(vdataID);
-	    }
-	    else
-	    {
-		HEpush(DFE_GENAPP, "SWwrrdfield", __FILE__, __LINE__);
-		HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-	    }
-	}			/* End One-D Field Section */
-
-    }
-    return (status);
-}
-
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWwritefield                                                     |
-|                                                                             |
-|  DESCRIPTION: Writes data to field                                          |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      char                fieldname                               |
-|  start          int32               start array                             |
-|  stride         int32               stride array                            |
-|  edge           int32               edge array                              |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  data           void                data buffer for write                   |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWwritefield(int32 swathID, const char *fieldname,
-	     int32 start[], int32 stride[], int32 edge[], VOIDP data)
-
-{
-    intn            status = 0;	/* routine return status variable */
-
-    status = SWwrrdfield(swathID, fieldname, "w", start, stride, edge,
-			 data);
-    return (status);
-}
-#endif
-
-
-
-
-
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWreadfield                                                      |
-|                                                                             |
-|  DESCRIPTION: Reads data from field                                         |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      const char          fieldname                               |
-|  start          int32               start array                             |
-|  stride         int32               stride array                            |
-|  edge           int32               edge array                              |
-|  buffer         void                data buffer for read                    |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|     None                                                                    |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWreadfield(int32 swathID, const char *fieldname,
-	    int32 start[], int32 stride[], int32 edge[], VOIDP buffer)
-
-{
-    intn            status = 0;	/* routine return status variable */
-
-    status = SWwrrdfield(swathID, fieldname, "r", start, stride, edge,
-			 buffer);
-    return (status);
-}
-
-
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWdefboxregion                                                   |
-|                                                                             |
-|  DESCRIPTION: Finds swath cross tracks within area of interest and returns  |
-|               region ID                                                     |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  regionID       int32               Region ID                               |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  cornerlon      float64  dec deg    Longitude of opposite corners of box    |
-|  cornerlat      float64  dec deg    Latitude of opposite corners of box     |
-|  mode           int32               Search mode                             |
-|                                     HDFE_MIDPOINT - Use midpoint of Xtrack  |
-|                                     HDFE_ENDPOINT - Use endpoints of Xtrack |
-|                                     HDFE_ANYPOINT - Use all points of Xtrack|
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Add ability to handle regions crossing date line    |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Jul 98   Abe Taaheri   Fixed core dump in SWregioninfo associated with     |
-|                         SWXRegion[k]->nRegions exceeding MAXNREGIONS in     |
-|                         this function                                       |
-|  Aug 99   Abe Taaheri   Fixed the code so that all cross tracks or all      |
-|                         points on the along track that fall inside the box  |
-|                         are identified. At the same time added code to      |
-|                         function "updatescene" to reject cases where there  |
-|                         is single cross track in the box (for LANDSAT)      |
-|  Jun 03   Abe Taaheri   Added a few lines to report error and return -1 if  |
-|                         regionID exceeded NSWATHREGN                        |
-|  Mar 04   Abe Taaheri   Added recognition for GeodeticLatitude              |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWdefboxregion(int32 swathID, float64 cornerlon[], float64 cornerlat[],
-	       int32 mode)
-{
-    intn            i;		/* Loop index */
-    intn            j = 0;		/* Loop index */
-    intn            k;		/* Loop index */
-
-    intn            status;	/* routine return status variable */
-    intn            statLon;	/* Status from SWfieldinfo for longitude */
-    intn            statLat;	/* Status from SWfieldinfo for latitude */
-    intn            statCoLat = -1;	/* Status from SWfieldinfo for
-					 * Colatitude */
-    intn            statGeodeticLat = -1; /* Status from SWfieldinfo for
-					 * GeodeticLatitude */
-
-    uint8           found = 0;	/* Found flag */
-    uint8          *flag;	/* Pointer to track flag array */
-    intn           validReg = -1; /* -1 is invalid validReg */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath Vgroup ID */
-    int32           rank;	/* Rank of geolocation fields */
-    int32           nt;		/* Number type of geolocation fields */
-    int32           dims[8];	/* Dimensions of geolocation fields */
-    int32           nElem;	/* Number of elements to read */
-    int32           bndflag;	/* +/-180 longitude boundary flag */
-    int32           lonTest;	/* Longitude test flag */
-    int32           latTest;	/* Latitude test flag */
-    int32           start[2];	/* Start array (read) */
-    int32           stride[2] = {1, 1};	/* Stride array (read) */
-    int32           edge[2];	/* Edge array (read) */
-    int32           regionID = -1;	/* Region ID (return) */
-    int32           anyStart[2];/* ANYPOINT start array (read) */
-    int32           anyEdge[2];	/* ANYPOINT edge array (read) */
-
-    float32         temp32;	/* Temporary float32 variable */
-
-    float64         lonTestVal;	/* Longitude test value */
-    float64         latTestVal;	/* Latitude test value */
-    float64         temp64;	/* Temporary float64 variable */
-
-    char           *lonArr;	/* Longitude data array */
-    char           *latArr;	/* Latitude data array */
-    char            dimlist[256];	/* Dimension list (geolocation
-					 * fields) */
-    char            latName[17];/* Latitude field name */
-
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWdefboxregion", &fid, &sdInterfaceID,
-		       &swVgrpID);
-
-
-    /* Inclusion mode must be between 0 and 2 */
-    /* -------------------------------------- */
-    if (mode < 0 || mode > 2)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
-	HEreport("Improper Inclusion Mode: %d.\n", mode);
-    }
-
-
-    if (status == 0)
-    {
-	/* Get "Longitude" field info */
-	/* -------------------------- */
-	statLon = SWfieldinfo(swathID, "Longitude", &rank, dims, &nt, dimlist);
-	if (statLon != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
-	    HEreport("\"Longitude\" field not found.\n");
-	}
-
-	/* Get "Latitude" field info */
-	/* -------------------------- */
-	statLat = SWfieldinfo(swathID, "Latitude", &rank, dims, &nt, dimlist);
-	if (statLat != 0)
-	{
-	    /* If not found check for "Colatitude" field info */
-	    /* ---------------------------------------------- */
-	    statCoLat = SWfieldinfo(swathID, "Colatitude", &rank, dims, &nt,
-				    dimlist);
-	    if (statCoLat != 0)
-	    {
-	      /* Check again for Geodeticlatitude */
-	      statGeodeticLat = SWfieldinfo(swathID,
-					    "GeodeticLatitude", &rank,
-					    dims, &nt, dimlist);
-	      if (statGeodeticLat != 0)
-		{
-		  /* Neither "Latitude" nor "Colatitude" nor
-		     "GeodeticLatitude" field found */
-		  /* ----------------------------------------------- */
-		  status = -1;
-		  HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
-		  HEreport(
-			   "Neither \"Latitude\" nor \"Colatitude\" nor \"GeodeticLatitude\" fields found.\n");
-		}
-	      else
-		{
-		  /* Latitude field is "GeodeticLatitude" */
-		  /* ------------------------------ */
-		  strcpy(latName, "GeodeticLatitude");
-		}
-	    }
-	    else
-	    {
-		/* Latitude field is "Colatitude" */
-		/* ------------------------------ */
-		strcpy(latName, "Colatitude");
-	    }
-	}
-	else
-	{
-	    /* Latitude field is "Latitude" */
-	    /* ---------------------------- */
-	    strcpy(latName, "Latitude");
-	}
-
-
-	if (status == 0)
-	{
-	    /* Search along entire "Track" dimension from beginning to end */
-	    /* ----------------------------------------------------------- */
-	    start[0] = 0;
-	    edge[0] = dims[0];
-
-
-	    /* If 1D geolocation fields then set mode to MIDPOINT */
-	    /* -------------------------------------------------- */
-	    if (rank == 1)
-	    {
-		mode = HDFE_MIDPOINT;
-	    }
-
-
-	    switch (mode)
-	    {
-		/* If MIDPOINT search single point in middle of "CrossTrack" */
-		/* --------------------------------------------------------- */
-	    case HDFE_MIDPOINT:
-
-		start[1] = dims[1] / 2;
-		edge[1] = 1;
-
-		break;
-
-		/* If ENDPOINT search 2 points at either end of "CrossTrack" */
-		/* --------------------------------------------------------- */
-	    case HDFE_ENDPOINT:
-
-		start[1] = 0;
-		stride[1] = dims[1] - 1;
-		edge[1] = 2;
-
-		break;
-
-		/* If ANYPOINT do initial MIDPOINT search */
-		/* -------------------------------------- */
-	    case HDFE_ANYPOINT:
-
-		start[1] = dims[1] / 2;
-		edge[1] = 1;
-
-		break;
-	    }
-
-
-	    /* Compute number of elements */
-	    /* -------------------------- */
-	    nElem = edge[0] * edge[1];
-
-
-	    /* Allocate space for longitude and latitude (float64) */
-	    /* --------------------------------------------------- */
-	    lonArr = (char *) calloc(nElem, sizeof(float64));
-	    if(lonArr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
-		return(-1);
-	    }
-
-	    latArr = (char *) calloc(nElem, sizeof(float64));
-	    if(latArr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
-		free(lonArr);
-		return(-1);
-	    }
-
-
-	    /* Allocate space for flag array (uint8) */
-	    /* ------------------------------------- */
-	    flag = (uint8 *) calloc(edge[0] + 1, 1);
-	    if(flag == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
-		free(lonArr);
-		free(latArr);
-		return(-1);
-	    }
-
-
-	    /* Read Longitude and Latitude fields */
-	    /* ---------------------------------- */
-	    status = SWreadfield(swathID, "Longitude",
-				 start, stride, edge, lonArr);
-	    status = SWreadfield(swathID, latName,
-				 start, stride, edge, latArr);
-
-
-
-	    /*
-	     * If geolocation fields are FLOAT32 then cast each entry as
-	     * FLOAT64
-	     */
-	    if (nt == DFNT_FLOAT32)
-	    {
-		for (i = nElem - 1; i >= 0; i--)
-		{
-		    memcpy(&temp32, lonArr + 4 * i, 4);
-		    temp64 = (float64) temp32;
-		    memcpy(lonArr + 8 * i, &temp64, 8);
-
-		    memcpy(&temp32, latArr + 4 * i, 4);
-		    temp64 = (float64) temp32;
-		    memcpy(latArr + 8 * i, &temp64, 8);
-		}
-	    }
-
-
-	    /* Set boundary flag */
-	    /* ----------------- */
-
-	    /*
-	     * This variable is set to 1 if the region of interest crosses
-	     * the +/- 180 longitude boundary
-	     */
-	    bndflag = (cornerlon[0] < cornerlon[1]) ? 0 : 1;
-
-
-
-	    /* Main Search Loop */
-	    /* ---------------- */
-
-	    /* For each track ... */
-	    /* ------------------ */
-
-	    for (i = 0; i < edge[0]; i++)
-	    {
-		/* For each value from Cross Track ... */
-		/* ----------------------------------- */
-		for (j = 0; j < edge[1]; j++)
-		{
-		    /* Read in single lon & lat values from data buffers */
-		    /* ------------------------------------------------- */
-		    memcpy(&lonTestVal, &lonArr[8 * (i * edge[1] + j)], 8);
-		    memcpy(&latTestVal, &latArr[8 * (i * edge[1] + j)], 8);
-
-
-		    /* If longitude value > 180 convert to -180 to 180 range */
-		    /* ----------------------------------------------------- */
-		    if (lonTestVal > 180)
-		    {
-			lonTestVal = lonTestVal - 360;
-		    }
-
-		    /* If Colatitude value convert to latitude value */
-		    /* --------------------------------------------- */
-		    if (statCoLat == 0)
-		    {
-			latTestVal = 90 - latTestVal;
-		    }
-
-
-		    /* Test if lat value is within range */
-		    /* --------------------------------- */
-		    latTest = (latTestVal >= cornerlat[0] &&
-			       latTestVal <= cornerlat[1]);
-
-
-		    if (bndflag == 1)
-		    {
-			/*
-			 * If boundary flag set test whether longitude value
-			 * is outside region and then flip
-			 */
-			lonTest = (lonTestVal >= cornerlon[1] &&
-				   lonTestVal <= cornerlon[0]);
-			lonTest = 1 - lonTest;
-		    }
-		    else
-		    {
-			lonTest = (lonTestVal >= cornerlon[0] &&
-				   lonTestVal <= cornerlon[1]);
-		    }
-
-
-		    /*
-		     * If both longitude and latitude are within region set
-		     * flag on for this track
-		     */
-		    if (lonTest + latTest == 2)
-		    {
-			flag[i] = 1;
-			found = 1;
-			break;
-		    }
-		}
-	    }
-
-
-
-	    /* ANYPOINT search */
-	    /* --------------- */
-	    if (mode == HDFE_ANYPOINT && rank > 1)
-	    {
-		free(lonArr);
-		free(latArr);
-
-		/* Allocate space for an entire single cross track */
-		/* ----------------------------------------------- */
-		lonArr = (char *) calloc(dims[1], sizeof(float64));
-		if(lonArr == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
-		    free(flag);
-		    return(-1);
-		}
-
-		latArr = (char *) calloc(dims[1], sizeof(float64));
-		if(latArr == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
-		    free(lonArr);
-		    free(flag);
-		    return(-1);
-		}
-
-
-		/* Setup start and edge */
-		/* -------------------- */
-		anyStart[1] = 0;
-		anyEdge[0] = 1;
-		anyEdge[1] = dims[1];
-
-
-		/* For each track starting from 0 */
-		/* ------------------------------ */
-		for (i = 0; i < edge[0]; i++)
-		{
-
-		    /* If cross track not in region (with MIDPOINT search ... */
-		    /* ------------------------------------------------------ */
-		    if (flag[i] == 0)
-		    {
-			/* Setup track start */
-			/* ----------------- */
-			anyStart[0] = i;
-
-
-			/* Read in lon and lat values for cross track */
-			/* ------------------------------------------ */
-			status = SWreadfield(swathID, "Longitude",
-					   anyStart, NULL, anyEdge, lonArr);
-			status = SWreadfield(swathID, latName,
-					   anyStart, NULL, anyEdge, latArr);
-
-
-
-			/*
-			 * If geolocation fields are FLOAT32 then cast each
-			 * entry as FLOAT64
-			 */
-			if (nt == DFNT_FLOAT32)
-			{
-			    for (j = dims[1] - 1; j >= 0; j--)
-			    {
-				memcpy(&temp32, lonArr + 4 * j, 4);
-				temp64 = (float64) temp32;
-				memcpy(lonArr + 8 * j, &temp64, 8);
-
-				memcpy(&temp32, latArr + 4 * j, 4);
-				temp64 = (float64) temp32;
-				memcpy(latArr + 8 * j, &temp64, 8);
-			    }
-			}
-
-
-			/* For each value from Cross Track ... */
-			/* ----------------------------------- */
-			for (j = 0; j < dims[1]; j++)
-			{
-			    /* Read in single lon & lat values from buffers */
-			    /* -------------------------------------------- */
-			    memcpy(&lonTestVal, &lonArr[8 * j], 8);
-			    memcpy(&latTestVal, &latArr[8 * j], 8);
-
-
-			    /* If lon value > 180 convert to -180 - 180 range */
-			    /* ---------------------------------------------- */
-			    if (lonTestVal > 180)
-			    {
-				lonTestVal = lonTestVal - 360;
-			    }
-
-			    /* If Colatitude value convert to latitude value */
-			    /* --------------------------------------------- */
-			    if (statCoLat == 0)
-			    {
-				latTestVal = 90 - latTestVal;
-			    }
-
-
-			    /* Test if lat value is within range */
-			    /* --------------------------------- */
-			    latTest = (latTestVal >= cornerlat[0] &&
-				       latTestVal <= cornerlat[1]);
-
-
-			    if (bndflag == 1)
-			    {
-				/*
-				 * If boundary flag set test whether
-				 * longitude value is outside region and then
-				 * flip
-				 */
-				lonTest = (lonTestVal >= cornerlon[1] &&
-					   lonTestVal <= cornerlon[0]);
-				lonTest = 1 - lonTest;
-			    }
-			    else
-			    {
-				lonTest = (lonTestVal >= cornerlon[0] &&
-					   lonTestVal <= cornerlon[1]);
-			    }
-
-
-			    /*
-			     * If both longitude and latitude are within
-			     * region set flag on for this track
-			     */
-			    if (lonTest + latTest == 2)
-			    {
-				flag[i] = 1;
-				found = 1;
-				break;
-			    }
-			}
-		    }
-		}
-            }
-
-	    /* If within region setup Region Structure */
-	    /* --------------------------------------- */
-	    if (found == 1)
-	    {
-		/* For all entries in SWXRegion array ... */
-		/* -------------------------------------- */
-		for (k = 0; k < NSWATHREGN; k++)
-		{
-		    /* If empty region ... */
-		    /* ------------------- */
-		    if (SWXRegion[k] == 0)
-		    {
-			/* Allocate space for region entry */
-			/* ------------------------------- */
-			SWXRegion[k] = (struct swathRegion *)
-			    calloc(1, sizeof(struct swathRegion));
-			if(SWXRegion[k] == NULL)
-			{
-			    HEpush(DFE_NOSPACE,"SWdefboxregion", __FILE__, __LINE__);
-			    free(lonArr);
-			    free(latArr);
-			    free(flag);
-			    return(-1);
-			}
-
-			/* Store file and swath ID */
-			/* ----------------------- */
-			SWXRegion[k]->fid = fid;
-			SWXRegion[k]->swathID = swathID;
-
-
-			/* Set Start & Stop Vertical arrays to -1 */
-			/* -------------------------------------- */
-			for (j = 0; j < 8; j++)
-			{
-			    SWXRegion[k]->StartVertical[j] = -1;
-			    SWXRegion[k]->StopVertical[j] = -1;
-			    SWXRegion[k]->StartScan[j] = -1;
-			    SWXRegion[k]->StopScan[j] = -1;
-			}
-
-
-			/* Set region ID */
-			/* ------------- */
-			regionID = k;
-			break;
-		    }
-		}
-		if (k >= NSWATHREGN)
-		  {
-		    HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
-		    HEreport("regionID exceeded NSWATHREGN.\n");
-		    free(lonArr);
-		    free(latArr);
-		    free(flag);
-		    return (-1);
-		  }
-
-		/* Find start and stop of regions */
-		/* ------------------------------ */
-
-		/* Subtract previous flag value from current one */
-		/* --------------------------------------------- */
-
-		/*
-		 * Transition points will have flag value (+1) start or
-		 * (255 = (uint8) -1) stop of region
-		 */
-		for (i = edge[0]; i > 0; i--)
-		{
-		    flag[i] -= flag[i - 1];
-		}
-
-
-		for (i = 0; i <= edge[0]; i++)
-		{
-		    /* Start of region */
-		    /* --------------- */
-		    if (flag[i] == 1)
-		    {
-			/* Increment (multiple) region counter */
-			/* ----------------------------------- */
-			j = ++SWXRegion[k]->nRegions;
-
-			/* if SWXRegion[k]->nRegions greater than MAXNREGIONS */
-			/* free allocated memory and return FAIL */
-
-			if ((SWXRegion[k]->nRegions) > MAXNREGIONS)
-			{
-			    HEpush(DFE_GENAPP, "SWdefboxregion", __FILE__, __LINE__);
-			    HEreport("SWXRegion[%d]->nRegions exceeds MAXNREGIONS= %d.\n", k, MAXNREGIONS);
-			    free(lonArr);
-			    free(latArr);
-			    free(flag);
-			    return(-1);
-			}
-
-			SWXRegion[k]->StartRegion[j - 1] = i;
-		    }
-
-		    /* End of region */
-		    /* ------------- */
-		    if (flag[i] == 255)
-		    {
-			SWXRegion[k]->StopRegion[j - 1] = i - 1;
-			validReg = 0;
-		    }
-		}
-	    }
-	    free(lonArr);
-	    free(latArr);
-	    free(flag);
-	}
-    }
-    if(validReg==0)
-    {
-	return (regionID);
-    }
-    else
-    {
-	return (-1);
-    }
-
-}
-#endif
-
-
-
-#ifdef UNUSED_BY_GDAL
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWregionl_index                                                    |
-|                                                                             |
-|  DESCRIPTION: Finds swath cross tracks within area of interest and returns  |
-|               region l_index and region ID                                    |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  regionID       int32               Region ID                               |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  cornerlon      float64  dec deg    Longitude of opposite corners of box    |
-|  cornerlat      float64  dec deg    Latitude of opposite corners of box     |
-|  mode           int32               Search mode                             |
-|                                     HDFE_MIDPOINT - Use midpoint of Xtrack  |
-|                                     HDFE_ENDPOINT - Use endpoints of Xtrack |
-|                                     HDFE_ANYPOINT - Use all points of Xtrack|
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  geodim	  char		      geolocation track dimension             |
-|  idxrange	  int32		      indices of region for along track dim.  |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Oct 96   Joel Gales    Add ability to handle regions crossing date line    |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Nov 97   Daw           Add multiple vertical subsetting capability         |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWregionindex(int32 swathID, float64 cornerlon[], float64 cornerlat[],
-	       int32 mode, char *geodim, int32 idxrange[])
-{
-    intn            i;		/* Loop index */
-    intn            j;		/* Loop index */
-    intn            k;		/* Loop index */
-
-    intn            l=0;	/* Loop index */
-    intn            tmpVal = 0;     /* temp value for start region Delyth Jones*/
-  /*intn            j1;  */     /* Loop index */
-    intn            status;	/* routine return status variable */
-    intn	    mapstatus;	/* status for type of mapping */
-    intn            statLon;	/* Status from SWfieldinfo for longitude */
-    intn            statLat;	/* Status from SWfieldinfo for latitude */
-    intn            statCoLat = -1;	/* Status from SWfieldinfo for
-					 * Colatitude */
-    intn            statGeodeticLat = -1; /* Status from SWfieldinfo for
-					 * GeodeticLatitude */
-
-    uint8           found = 0;	/* Found flag */
-    uint8          *flag;	/* Pointer to track flag array */
-    intn           validReg = -1; /* -1 is invalid validReg */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath Vgroup ID */
-    int32           rank;	/* Rank of geolocation fields */
-    int32           nt;		/* Number type of geolocation fields */
-    int32           dims[8];	/* Dimensions of geolocation fields */
-    int32           nElem;	/* Number of elements to read */
-    int32           bndflag;	/* +/-180 longitude boundary flag */
-    int32           lonTest;	/* Longitude test flag */
-    int32           latTest;	/* Latitude test flag */
-    int32           start[2];	/* Start array (read) */
-    int32           stride[2] = {1, 1};	/* Stride array (read) */
-    int32           edge[2];	/* Edge array (read) */
-    int32           regionID = -1;	/* Region ID (return) */
-    int32           anyStart[2];/* ANYPOINT start array (read) */
-    int32           anyEdge[2];	/* ANYPOINT edge array (read) */
-
-    float32         temp32;	/* Temporary float32 variable */
-
-    float64         lonTestVal;	/* Longitude test value */
-    float64         latTestVal;	/* Latitude test value */
-    float64         temp64;	/* Temporary float64 variable */
-
-    char           *lonArr;	/* Longitude data array */
-    char           *latArr;	/* Latitude data array */
-    char            dimlist[256];	/* Dimension list (geolocation
-					 * fields) */
-    char            latName[17];/* Latitude field name */
-
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWregionl_index", &fid, &sdInterfaceID,
-		       &swVgrpID);
-
-
-    /* Inclusion mode must be between 0 and 2 */
-    /* -------------------------------------- */
-    if (mode < 0 || mode > 2)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "SWregionl_index", __FILE__, __LINE__);
-	HEreport("Improper Inclusion Mode: %d.\n", mode);
-    }
-
-
-    if (status == 0)
-    {
-	/* Get "Longitude" field info */
-	/* -------------------------- */
-	statLon = SWfieldinfo(swathID, "Longitude", &rank, dims, &nt, dimlist);
-	if (statLon != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWregionl_index", __FILE__, __LINE__);
-	    HEreport("\"Longitude\" field not found.\n");
-	}
-
-	/* Get "Latitude" field info */
-	/* -------------------------- */
-	statLat = SWfieldinfo(swathID, "Latitude", &rank, dims, &nt, dimlist);
-	if (statLat != 0)
-	{
-	    /* If not found check for "Colatitude" field info */
-	    /* ---------------------------------------------- */
-	    statCoLat = SWfieldinfo(swathID, "Colatitude", &rank, dims, &nt,
-				    dimlist);
-	    if (statCoLat != 0)
-	    {
-	      /* Check again for Geodeticlatitude */
-	      statGeodeticLat = SWfieldinfo(swathID,
-					    "GeodeticLatitude", &rank,
-					    dims, &nt, dimlist);
-	      if (statGeodeticLat != 0)
-	        {
-		  /* Neither "Latitude" nor "Colatitude" field found */
-		  /* ----------------------------------------------- */
-		  status = -1;
-		  HEpush(DFE_GENAPP, "SWregionl_index", __FILE__, __LINE__);
-		  HEreport(
-			   "Neither \"Latitude\" nor \"Colatitude\" fields found.\n");
-		}
-	      else
-		{
-		     /* Latitude field is "Colatitude" */
-		     /* ------------------------------ */
-		     strcpy(latName, "GeodeticLatitude");
-		}
-	    }
-	    else
-	    {
-		/* Latitude field is "Colatitude" */
-		/* ------------------------------ */
-		strcpy(latName, "Colatitude");
-	    }
-	}
-	else
-	{
-	    /* Latitude field is "Latitude" */
-	    /* ---------------------------- */
-	    strcpy(latName, "Latitude");
-	}
-
-        /* This line modifies the dimlist variable so only the along-track */
-        /* dimension remains.                                              */
-        /* --------------------------------------------------------------- */
-        (void) strtok(dimlist,",");
-        mapstatus = SWgeomapinfo(swathID,dimlist);
-        (void) strcpy(geodim,dimlist);
-
-	if (status == 0)
-	{
-	    /* Search along entire "Track" dimension from beginning to end */
-	    /* ----------------------------------------------------------- */
-	    start[0] = 0;
-	    edge[0] = dims[0];
-
-
-	    /* If 1D geolocation fields then set mode to MIDPOINT */
-	    /* -------------------------------------------------- */
-	    if (rank == 1)
-	    {
-		mode = HDFE_MIDPOINT;
-	    }
-
-
-	    switch (mode)
-	    {
-		/* If MIDPOINT search single point in middle of "CrossTrack" */
-		/* --------------------------------------------------------- */
-	    case HDFE_MIDPOINT:
-
-		start[1] = dims[1] / 2;
-		edge[1] = 1;
-
-		break;
-
-		/* If ENDPOINT search 2 points at either end of "CrossTrack" */
-		/* --------------------------------------------------------- */
-	    case HDFE_ENDPOINT:
-
-		start[1] = 0;
-		stride[1] = dims[1] - 1;
-		edge[1] = 2;
-
-		break;
-
-		/* If ANYPOINT do initial MIDPOINT search */
-		/* -------------------------------------- */
-	    case HDFE_ANYPOINT:
-
-		start[1] = dims[1] / 2;
-		edge[1] = 1;
-
-		break;
-	    }
-
-
-	    /* Compute number of elements */
-	    /* -------------------------- */
-	    nElem = edge[0] * edge[1];
-
-
-	    /* Allocate space for longitude and latitude (float64) */
-	    /* --------------------------------------------------- */
-	    lonArr = (char *) calloc(nElem, sizeof(float64));
-	    if(lonArr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
-		return(-1);
-	    }
-
-	    latArr = (char *) calloc(nElem, sizeof(float64));
-	    if(latArr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
-		free(lonArr);
-		return(-1);
-	    }
-
-
-	    /* Allocate space for flag array (uint8) */
-	    /* ------------------------------------- */
-	    flag = (uint8 *) calloc(edge[0] + 1, 1);
-	    if(flag == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
-		free(lonArr);
-		free(latArr);
-		return(-1);
-	    }
-
-
-	    /* Read Longitude and Latitude fields */
-	    /* ---------------------------------- */
-	    status = SWreadfield(swathID, "Longitude",
-				 start, stride, edge, lonArr);
-	    status = SWreadfield(swathID, latName,
-				 start, stride, edge, latArr);
-
-
-
-	    /*
-	     * If geolocation fields are FLOAT32 then cast each entry as
-	     * FLOAT64
-	     */
-	    if (nt == DFNT_FLOAT32)
-	    {
-		for (i = nElem - 1; i >= 0; i--)
-		{
-		    memcpy(&temp32, lonArr + 4 * i, 4);
-		    temp64 = (float64) temp32;
-		    memcpy(lonArr + 8 * i, &temp64, 8);
-
-		    memcpy(&temp32, latArr + 4 * i, 4);
-		    temp64 = (float64) temp32;
-		    memcpy(latArr + 8 * i, &temp64, 8);
-		}
+	    /* Get pointers to "IndexDimensionMap" section within SM */
+	    metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					   "IndexDimensionMap", metaptrs);
+	    if(metabuf == NULL)
+	    {
+		free(utlstr);
+		return(-1);
 	    }
-
-
-	    /* Set boundary flag */
-	    /* ----------------- */
-
-	    /*
-	     * This variable is set to 1 if the region of interest crosses
-	     * the +/- 180 longitude boundary
-	     */
-	    bndflag = (cornerlon[0] < cornerlon[1]) ? 0 : 1;
-
-
-
-	    /* Main Search Loop */
-	    /* ---------------- */
-
-	    /* For each track ... */
-	    /* ------------------ */
-	    for (i = 0; i < edge[0]; i++)
+	    /* If mapping names are desired then "clear" name buffer */
+	    if (idxmaps != NULL)
 	    {
-		/* For each value from Cross Track ... */
-		/* ----------------------------------- */
-		for (j = 0; j < edge[1]; j++)
-		{
-		    /* Read in single lon & lat values from data buffers */
-		    /* ------------------------------------------------- */
-		    memcpy(&lonTestVal, &lonArr[8 * (i * edge[1] + j)], 8);
-		    memcpy(&latTestVal, &latArr[8 * (i * edge[1] + j)], 8);
-
-
-		    /* If longitude value > 180 convert to -180 to 180 range */
-		    /* ----------------------------------------------------- */
-		    if (lonTestVal > 180)
-		    {
-			lonTestVal = lonTestVal - 360;
-		    }
-
-		    /* If Colatitude value convert to latitude value */
-		    /* --------------------------------------------- */
-		    if (statCoLat == 0)
-		    {
-			latTestVal = 90 - latTestVal;
-		    }
-
-
-		    /* Test if lat value is within range */
-		    /* --------------------------------- */
-		    latTest = (latTestVal >= cornerlat[0] &&
-			       latTestVal <= cornerlat[1]);
-
-
-		    if (bndflag == 1)
-		    {
-			/*
-			 * If boundary flag set test whether longitude value
-			 * is outside region and then flip
-			 */
-			lonTest = (lonTestVal >= cornerlon[1] &&
-				   lonTestVal <= cornerlon[0]);
-			lonTest = 1 - lonTest;
-		    }
-		    else
-		    {
-			lonTest = (lonTestVal >= cornerlon[0] &&
-				   lonTestVal <= cornerlon[1]);
-		    }
-
-
-		    /*
-		     * If both longitude and latitude are within region set
-		     * flag on for this track
-		     */
-		    if (lonTest + latTest == 2)
-		    {
-			flag[i] = 1;
-			found = 1;
-			break;
-		    }
-		}
+		idxmaps[0] = 0;
 	    }
 
-
-
-	    /* ANYPOINT search */
-	    /* --------------- */
-	    if (mode == HDFE_ANYPOINT && rank > 1)
+	    /* Begin loop through mapping entries in metadata */
+	    /* ---------------------------------------------- */
+	    while (1)
 	    {
-		free(lonArr);
-		free(latArr);
-
-		/* Allocate space for an entire single cross track */
-		/* ----------------------------------------------- */
-		lonArr = (char *) calloc(dims[1], sizeof(float64));
-		if(lonArr == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
-		    return(-1);
-		}
-		latArr = (char *) calloc(dims[1], sizeof(float64));
-		if(latArr == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
-		    free(lonArr);
-		    return(-1);
-		}
-
-		/* Setup start and edge */
-		/* -------------------- */
-		anyStart[1] = 0;
-		anyEdge[0] = 1;
-		anyEdge[1] = dims[1];
-
+		/* Search for OBJECT string */
+		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
 
-		/* For each track ... */
-		/* ------------------ */
-		for (i = 0; i < edge[0]; i++)
+		/* If found within "IndexDimensionMap" metadata section ... */
+		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 		{
-
-		    /* If cross track not in region (with MIDPOINT search ... */
-		    /* ------------------------------------------------------ */
-		    if (flag[i] == 0)
+		    /* Get Geo & Data Dimensions and # of indices */
+		    if (idxmaps != NULL)
 		    {
-			/* Setup track start */
-			/* ----------------- */
-			anyStart[0] = i;
-
-
-			/* Read in lon and lat values for cross track */
-			/* ------------------------------------------ */
-			status = SWreadfield(swathID, "Longitude",
-					   anyStart, NULL, anyEdge, lonArr);
-			status = SWreadfield(swathID, latName,
-					   anyStart, NULL, anyEdge, latArr);
-
-
-
-			/*
-			 * If geolocation fields are FLOAT32 then cast each
-			 * entry as FLOAT64
-			 */
-			if (nt == DFNT_FLOAT32)
-			{
-			    for (j = dims[1] - 1; j >= 0; j--)
-			    {
-				memcpy(&temp32, lonArr + 4 * j, 4);
-				temp64 = (float64) temp32;
-				memcpy(lonArr + 8 * j, &temp64, 8);
-
-				memcpy(&temp32, latArr + 4 * j, 4);
-				temp64 = (float64) temp32;
-				memcpy(latArr + 8 * j, &temp64, 8);
-			    }
-			}
-
-
-			/* For each value from Cross Track ... */
-			/* ----------------------------------- */
-			for (j = 0; j < dims[1]; j++)
-			{
-			    /* Read in single lon & lat values from buffers */
-			    /* -------------------------------------------- */
-			    memcpy(&lonTestVal, &lonArr[8 * j], 8);
-			    memcpy(&latTestVal, &latArr[8 * j], 8);
-
-
-			    /* If lon value > 180 convert to -180 - 180 range */
-			    /* ---------------------------------------------- */
-			    if (lonTestVal > 180)
-			    {
-				lonTestVal = lonTestVal - 360;
-			    }
-
-			    /* If Colatitude value convert to latitude value */
-			    /* --------------------------------------------- */
-			    if (statCoLat == 0)
-			    {
-				latTestVal = 90 - latTestVal;
-			    }
-
-
-			    /* Test if lat value is within range */
-			    /* --------------------------------- */
-			    latTest = (latTestVal >= cornerlat[0] &&
-				       latTestVal <= cornerlat[1]);
-
-
-			    if (bndflag == 1)
-			    {
-				/*
-				 * If boundary flag set test whether
-				 * longitude value is outside region and then
-				 * flip
-				 */
-				lonTest = (lonTestVal >= cornerlon[1] &&
-					   lonTestVal <= cornerlon[0]);
-				lonTest = 1 - lonTest;
-			    }
-			    else
-			    {
-				lonTest = (lonTestVal >= cornerlon[0] &&
-					   lonTestVal <= cornerlon[1]);
-			    }
-
+			/* Get Geo Dim, remove quotes, add "/" */
+			EHgetmetavalue(metaptrs, "GeoDimension", utlstr);
+			REMQUOTE(utlstr);
+			strcat(utlstr, "/");
 
-			    /*
-			     * If both longitude and latitude are within
-			     * region set flag on for this track
-			     */
-			    if (lonTest + latTest == 2)
-			    {
-				flag[i] = 1;
-				found = 1;
-				break;
-			    }
-			}
-		    }
-		}
-	    }
-	    /*
-	    for (j1 = 0; j1 < edge[0]; j1++)
-	      {
-		idxrange[j1] = (int32) flag[j1];
-	      }
-	    */
-	    /* If within region setup Region Structure */
-	    /* --------------------------------------- */
-	    if (found == 1)
-	    {
-		/* For all entries in SWXRegion array ... */
-		/* -------------------------------------- */
-		for (k = 0; k < NSWATHREGN; k++)
-		{
-		    /* If empty region ... */
-		    /* ------------------- */
-		    if (SWXRegion[k] == 0)
-		    {
-			/* Allocate space for region entry */
-			/* ------------------------------- */
-			SWXRegion[k] = (struct swathRegion *)
-			    calloc(1, sizeof(struct swathRegion));
-			if(SWXRegion[k] == NULL)
+			/* If not first map then add comma delimiter. */
+			if (nMap > 0)
 			{
-			    HEpush(DFE_NOSPACE,"SWregionl_index", __FILE__, __LINE__);
-			    free(lonArr);
-			    free(latArr);
-			    free(flag);
-			    return(-1);
+			    strcat(idxmaps, ",");
 			}
 
-			/* Store file and swath ID */
-			/* ----------------------- */
-			SWXRegion[k]->fid = fid;
-			SWXRegion[k]->swathID = swathID;
+			/* Add to map list */
+			strcat(idxmaps, utlstr);
 
 
-			/* Set Start & Stop Vertical arrays to -1 */
-			/* -------------------------------------- */
-			for (j = 0; j < 8; j++)
+			/* Get Index size (if desired) */
+			if (idxsizes != NULL)
 			{
-			    SWXRegion[k]->StartVertical[j] = -1;
-			    SWXRegion[k]->StopVertical[j] = -1;
-			    SWXRegion[k]->StartScan[j] = -1;
-			    SWXRegion[k]->StopScan[j] = -1;
+			    /* Parse off geo dimension and find its size */
+			    slash = strchr(utlstr, '/');
+			    if (slash) *slash = 0;
+			    idxsizes[nMap] = SWdiminfo(swathID, utlstr);
 			}
 
 
-			/* Set region ID */
-			/* ------------- */
-			regionID = k;
-			break;
-		    }
-		}
-		if (k >= NSWATHREGN)
-		  {
-		    HEpush(DFE_GENAPP, "SWregionl_index", __FILE__, __LINE__);
-		    HEreport(
-			     "regionID exceeded NSWATHREGN.\n");
-                    return (-1);
-		  }
-
-		/* Find start and stop of regions */
-		/* ------------------------------ */
-
-		/* Subtract previous flag value from current one */
-		/* --------------------------------------------- */
-
-		/*
-		 * Transition points will have flag value (+1) start or
-		 * (255 = (uint8) -1) stop of region
-		 */
-		for (i = edge[0]; i > 0; i--)
-		{
-		    flag[i] -= flag[i - 1];
-		}
-
-
-		for (i = 0; i <= edge[0]; i++)
-		{
-		    /* Start of region */
-		    /* --------------- */
-		    if (flag[i] == 1)
-		    {
-			/* Delyth Jones Moved the increment of the region down
-			   to next if statement j = ++SWXRegion[k]->nRegions; */
-
-			/* using temp value, if not equal to stop region
-			   invalid region otherwise ok Delyth Jones */
-			tmpVal = i+1;
-		    }
+			/* Get Data Dim, remove quotes */
+			EHgetmetavalue(metaptrs, "DataDimension", utlstr);
+			REMQUOTE(utlstr);
 
-		    /* End of region */
-		    /* ------------- */
-		    if (flag[i] == 255)
-		    {
-			if( tmpVal!=i )
-			{
-			    /* Increment (multiple) region counter */
-			    /* ----------------------------------- */
-			    j = ++SWXRegion[k]->nRegions;
-
-                            if (mapstatus == 2)
-                            {
-                               l = i;
-                               if ((tmpVal-1) % 2 == 1)
-                               {
-                                  tmpVal = tmpVal + 1;
-                               }
-
-                               if ((l-1) % 2 == 0)
-                               {
-                                  l = l - 1;
-                               }
-                            }
-			    SWXRegion[k]->StartRegion[j - 1] = tmpVal-1;
-                            idxrange[0] = tmpVal - 1;
-			    SWXRegion[k]->StopRegion[j - 1] = l - 1;
-                            idxrange[1] = l - 1;
-			    validReg = 0;
-			}
+			/* Add to map list */
+			    strcat(idxmaps, utlstr);
 		    }
 
+		    /* Increment number of maps */
+		    nMap++;
 		}
-
-	    }
-	    free(lonArr);
-	    free(latArr);
-	    free(flag);
-	}
-    }
-    if(validReg==0)
-    {
-	return (regionID);
-    }
-    else
-    {
-	return (-1);
-    }
-
-}
-#endif
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWdeftimeperiod                                                  |
-|                                                                             |
-|  DESCRIPTION: Finds swath cross tracks observed during time period and      |
-|               returns  period ID                                            |
-|                                                                             |
-|               region ID                                                     |
-|  DESCRIPTION:                                                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  periodID       int32               (Period ID) or (-1) if failed           |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  starttime      float64 TAI sec     Start of time period                    |
-|  stoptime       float64 TAI sec     Stop of time period                     |
-|  mode           int32               Search mode                             |
-|                                     HDFE_MIDPOINT - Use midpoint of Xtrack  |
-|                                     HDFE_ENDPOINT - Use endpoints of Xtrack |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|             None                                                            |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
-		int32 mode)
-{
-
-    intn            i;		    /* Loop index */
-    intn            j;		    /* Loop index */
-    intn            k = 0;		    /* Loop index */
-    intn            status;	    /* routine return status variable */
-    intn            statTime;	    /* Status from SWfieldinfo for time */
-
-    uint8           found = 0;	    /* Found flag */
-
-    int32           fid;	    /* HDF-EOS file ID */
-    int32           sdInterfaceID;  /* HDF SDS interface ID */
-    int32           swVgrpID;	    /* Swath Vgroup ID */
-    int32           rank;	    /* Rank of geolocation fields */
-    int32           nt;		    /* Number type of geolocation fields */
-    int32           dims[8];	    /* Dimensions of geolocation fields */
-    int32           start[2];	    /* Start array (read) */
-    int32           stride[2] = {1, 1};	/* Stride array (read) */
-    int32           edge[2];	    /* Edge array (read) */
-    int32           periodID = -1;  /* Period ID (return) */
-    int32           dum;	    /* Dummy (loop) variable */
-
-    float64         time64Test;	    /* Time test value */
-    float64        *time64 = NULL;  /* Time data array */
-
-    char            dimlist[256];   /* Dimension list (geolocation fields) */
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWdeftimeperiod", &fid, &sdInterfaceID,
-		       &swVgrpID);
-
-    if (status == 0)
-    {
-	/* Get "Time" field info */
-	/* --------------------- */
-	statTime = SWfieldinfo(swathID, "Time", &rank, dims, &nt, dimlist);
-	if (statTime != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWdeftimeperiod", __FILE__, __LINE__);
-	    HEreport("\"Time\" field not found.\n");
-	}
-
-	if (status == 0)
-	{
-	    /* Search along entire "Track" dimension from beginning to end */
-	    /* ----------------------------------------------------------- */
-	    start[0] = 0;
-	    edge[0] = dims[0];
-
-
-	    /* If 1D geolocation fields then set mode to MIDPOINT */
-	    /* -------------------------------------------------- */
-	    if (rank == 1)
-	    {
-		mode = HDFE_MIDPOINT;
-	    }
-
-
-	    switch (mode)
-	    {
-
-		/* If MIDPOINT search single point in middle of "CrossTrack" */
-		/* --------------------------------------------------------- */
-	    case HDFE_MIDPOINT:
-
-		start[1] = dims[1] / 2;
-		edge[1] = 1;
-
-
-		/* Allocate space for time data */
-		/* ---------------------------- */
-		time64 = (float64 *) calloc(edge[0], 8);
-		if(time64 == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdeftimeperiod", __FILE__, __LINE__);
-		    return(-1);
-		}
-
-
-		/* Read "Time" field */
-		/* ----------------- */
-		status = SWreadfield(swathID, "Time",
-				     start, NULL, edge, time64);
-		break;
-
-
-		/* If ENDPOINT search 2 points at either end of "CrossTrack" */
-		/* --------------------------------------------------------- */
-	    case HDFE_ENDPOINT:
-		start[1] = 0;
-		stride[1] = dims[1] - 1;
-		edge[1] = 2;
-
-
-		/* Allocate space for time data */
-		/* ---------------------------- */
-		time64 = (float64 *) calloc(edge[0] * 2, 8);
-		if(time64 == NULL)
+		else
+		    /* No more mappings found */
 		{
-		    HEpush(DFE_NOSPACE,"SWdeftimeperiod", __FILE__, __LINE__);
-		    return(-1);
-		}
-
-		/* Read "Time" field */
-		/* ----------------- */
-		status = SWreadfield(swathID, "Time",
-				     start, stride, edge, time64);
-		break;
-
-	    }
-
-            if (time64)
-            {
-                /* For each track (from top) ... */
-                /* ----------------------------- */
-                for (i = 0; i < edge[0]; i++)
-                {
-                    /* For each value from Cross Track ... */
-                    /* ----------------------------------- */
-                    for (j = 0; j < edge[1]; j++)
-                    {
-
-                        /* Get time test value */
-                        /* ------------------- */
-                        time64Test = time64[i * edge[1] + j];
-
-
-                        /* If within time period ... */
-                        /* ------------------------- */
-                        if (time64Test >= starttime &&
-                            time64Test <= stoptime)
-                        {
-                            /* Set found flag */
-                            /* -------------- */
-                            found = 1;
-
-
-                            /* For all entries in SWXRegion array ... */
-                            /* -------------------------------------- */
-                            for (k = 0; k < NSWATHREGN; k++)
-                            {
-                                /* If empty region ... */
-                                /* ------------------- */
-                                if (SWXRegion[k] == 0)
-                                {
-                                    /* Allocate space for region entry */
-                                    /* ------------------------------- */
-                                    SWXRegion[k] = (struct swathRegion *)
-                                        calloc(1, sizeof(struct swathRegion));
-                                    if(SWXRegion[k] == NULL)
-                                    {
-                                        HEpush(DFE_NOSPACE,"SWdeftimeperiod", __FILE__, __LINE__);
-                                        return(-1);
-                                    }
-
-                                    /* Store file and swath ID */
-                                    /* ----------------------- */
-                                    SWXRegion[k]->fid = fid;
-                                    SWXRegion[k]->swathID = swathID;
-
-
-                                    /* Set number of isolated regions to 1 */
-                                    /* ----------------------------------- */
-                                    SWXRegion[k]->nRegions = 1;
-
-
-                                    /* Set start of region to first track found */
-                                    /* ---------------------------------------- */
-                                    SWXRegion[k]->StartRegion[0] = i;
-
-
-                                    /* Set Start & Stop Vertical arrays to -1 */
-                                    /* -------------------------------------- */
-                                    for (dum = 0; dum < 8; dum++)
-                                    {
-                                        SWXRegion[k]->StartVertical[dum] = -1;
-                                        SWXRegion[k]->StopVertical[dum] = -1;
-                                        SWXRegion[k]->StartScan[dum] = -1;
-                                        SWXRegion[k]->StopScan[dum] = -1;
-                                    }
-
-
-                                    /* Set period ID */
-                                    /* ------------- */
-                                    periodID = k;
-
-                                    break;	/* Break from "k" loop */
-                                }
-                            }
-                        }
-                        if (found == 1)
-                        {
-                            break;	/* Break from "j" loop */
-                        }
-                    }
-                    if (found == 1)
-                    {
-                        break;	/* Break from "i" loop */
-                    }
-                }
+		    break;
+		}
+	    }
+	    free(metabuf);
+	}
+    }
 
 
-                if (periodID >= 0)
-                {
-                    /* Clear found flag */
-                    /* ---------------- */
-                    found = 0;
+    /* Set nMap to -1 if error status exists */
+    /* ------------------------------------- */
+    if (status == -1)
+    {
+	nMap = -1;
+    }
+    free(utlstr);
 
+    return (nMap);
+}
 
-                    /* For each track (from bottom) ... */
-                    /* -------------------------------- */
-                    for (i = edge[0] - 1; i >= 0; i--)
-                    {
-                        /* For each value from Cross Track ... */
-                        /* ----------------------------------- */
-                        for (j = 0; j < edge[1]; j++)
-                        {
-
-                            /* Get time test value */
-                            /* ------------------- */
-                            time64Test = time64[i * edge[1] + j];
-
-
-                            /* If within time period ... */
-                            /* ------------------------- */
-                            if (time64Test >= starttime &&
-                                time64Test <= stoptime)
-                            {
-                                /* Set found flag */
-                                /* -------------- */
-                                found = 1;
-
-                                /* Set start of region to first track found */
-                                /* ---------------------------------------- */
-                                SWXRegion[periodID]->StopRegion[0] = i;
-
-                                break;	/* Break from "j" loop */
-                            }
-                        }
-                        if (found == 1)
-                        {
-                            break;	/* Break from "i" loop */
-                        }
-                    }
-                }
 
-                free(time64);
-            }
-	}
-    }
 
-    return (periodID);
-}
-#endif
 
-#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWextractregion                                                  |
+|  FUNCTION: SWinqfields                                                      |
 |                                                                             |
-|  DESCRIPTION: Retrieves data from specified region.                         |
+|  DESCRIPTION: Returns fieldnames, ranks and numbertypes defined in swath.   |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nFld           int32               Number of (geo/data) fields in swath    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  regionID       int32               Region ID                               |
-|  fieldname      char                Fieldname                               |
-|  externalflag   int32               External geolocation fields flag        |
-|                                     HDFE_INTERNAL (0)                       |
-|                                     HDFE_EXTERNAL (1)                       |
+|  swathID        int32               swath structure ID                      |
+|  fieldtype      char                field type (geo or data)                |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  buffer         void                Data buffer containing subsetted region |
+|  fieldlist      char                Field names (comma-separated)           |
+|  rank           int32               Array of ranks                          |
+|  numbertype     int32               Array of HDF number types               |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -6971,1181 +2287,553 @@ SWdeftimeperiod(int32 swathID, float64 starttime, float64 stoptime,
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Add vertical subsetting                             |
-|  Oct 96   Joel Gales    Mapping offset value not read from SWmapinfo        |
-|  Dec 96   Joel Gales    Vert Subset overwriting data buffer                 |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Mar 97   Joel Gales    Add support for l_index mapping                       |
-|  Jul 99   DaW 	  Add support for floating scene subsetting 	      |
-|  Feb 03   Terry Haran/                                                      |
-|           Abe Taaheri   Forced map offset to 0 so that data is extracted    |
-|                         without offset consideration. This will preserve    |
-|                         original mapping between geofields and the data     |
-|                         field.                                              |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nFld to -1 if status = -1                       |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWextractregion(int32 swathID, int32 regionID, const char *fieldname,
-		int32 externalflag, VOIDP buffer)
+static int32
+SWinqfields(int32 swathID, const char *fieldtype, char *fieldlist, int32 rank[],
+	    int32 numbertype[])
 
 {
-    intn            i;		/* Loop index */
-    intn            j;		/* Loop index */
-    intn            k;		/* Loop index */
-    intn            l;		/* Loop index */
     intn            status;	/* routine return status variable */
-    intn            long_status = 3;	/* routine return status variable    */
-                                        /* for longitude                     */
-    intn	    land_status = 3;	/* Used for L7 float scene sub.      */
-    intn            statMap = -1;	/* Status from SWmapinfo  */
-
-    uint8           found = 0;		/* Found flag */
-    uint8           vfound = 0;		/* Found flag for vertical subsetting*/
-                                        /*  --- xhua                         */
-    uint8	    scene_cnt = 0;	/* Used for L7 float scene sub.      */
-    uint8           detect_cnt = 0;     /* Used to convert scan to scanline  */
-                                        /*  L7 float scene sub.              */
 
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath Vgroup ID */
-
-    int32	    numtype = 0; /* Used for L7 float scene sub. */
-    int32	    count = 0;   /* Used for L7 float scene sub. */
-    int32           l_index = 0;	/* Geo Dim Index */
-    int32           nDim;	/* Number of dimensions */
-    int32           slen[64];	/* String length array */
-    int32           dum;	/* Dummy variable */
-    int32           offset = 0;	/* Mapping offset */
-    int32           incr = 0;	/* Mapping increment */
-    int32           nXtrk;	/* Number of cross tracks */
-    int32           scan_shift = 0; /* Used to take out partial scans */
-    int32           dumdims[8];	/* Dimensions from SWfieldinfo */
-    int32           start[8];	/* Start array for data read */
-    int32           edge[8];	/* Edge array for data read */
-    int32           dims[8];	/* Dimensions */
-    int32           rank = 0;	/* Field rank */
-    int32           rk = 0;	/* Field rank */
-    int32           ntype = 0;	/* Field number type */
-    int32           bufOffset = 0;	/* Output buffer offset */
-    int32           size;	/* Size of data buffer */
-    int32           idxMapElem = -1;	/* Number of l_index map elements  */
-    int32          *idxmap = NULL;	/* Pointer to l_index mapping array */
-
-    int32	startscanline = 0;
-    int32	stopscanline = 0;
-    char	*dfieldlist = (char *)NULL;
-    int32	strbufsize = 0;
-    int32	dfrank[8];
-    int32	numtype2[8];
-    uint16	*buffer2 = (uint16 *)NULL;
-    uint16	*tbuffer = (uint16 *)NULL;
-    int32	dims2[8];
-    int32	nt = 0;
-    int32	startscandim = -1;
-    int32	stopscandim = -1;
-    int32	rank2 = 0;
-
-    char            dimlist[256];	/* Dimension list */
-    char            geodim[256];/* Geolocation field dimension list */
-    char            tgeodim[256];/* Time field dimension list */
-    char            dgeodim[256];/* Data field dimension list for subsetting */
-    char            utlbuf[256];/* Utility buffer */
-    char           *ptr[64];	/* String pointer array */
-
-
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWextractregion", &fid, &sdInterfaceID,
-		       &swVgrpID);
-
-
-    /* Check for valid region ID */
-    /* ------------------------- */
-    if (status == 0)
-    {
-	if (regionID < 0 || regionID >= NSWATHREGN)
-	{
-	    status = -1;
-	    HEpush(DFE_RANGE, "SWextractregion", __FILE__, __LINE__);
-	    HEreport("Invalid Region id: %d.\n", regionID);
-	}
-    }
-
-
-
-    /* Check for active region ID */
-    /* -------------------------- */
-    if (status == 0)
-    {
-	if (SWXRegion[regionID] == 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-	    HEreport("Inactive Region ID: %d.\n", regionID);
-	}
-    }
-
-
-   /* This code checks for the attribute detector_count */
-   /* which is found in Landsat 7 files.  It is used    */
-   /* for some of the loops.                            */
-   /* ================================================= */
-   if (status == 0 && SWXRegion[regionID]->scanflag == 1)
-   {
-      land_status = SWattrinfo(swathID, "detector_count", &numtype, &count);
-      if (land_status == 0)
-         land_status = SWreadattr(swathID, "detector_count", &detect_cnt);
-   }
-
-    /* Check that geo file and data file are same for INTERNAL subsetting */
-    /* ------------------------------------------------------------------ */
-    if (status == 0)
-    {
-	if (SWXRegion[regionID]->fid != fid && externalflag != HDFE_EXTERNAL)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-	    HEreport("Region is not defined for this file.\n");
-	}
-    }
+    int32           swVgrpID;	/* Swath root Vgroup ID */
+    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
+    int32           nFld = 0;	/* Number of mappings */
+    int32           slen[8];	/* String length array */
 
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char            swathname[80];	/* Swath Name */
+    char           *utlstr;	/* Utility string */
+    char           *utlstr2;	/* Utility string 2 */
+    char           *ptr[8];	/* String pointer array */
 
 
-    /* Check that geo swath and data swath are same for INTERNAL subsetting */
-    /* -------------------------------------------------------------------- */
-    if (status == 0)
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
     {
-	if (SWXRegion[regionID]->swathID != swathID &&
-	    externalflag != HDFE_EXTERNAL)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-	    HEreport("Region is not defined for this Swath.\n");
-	}
+	HEpush(DFE_NOSPACE,"SWinqfields", __FILE__, __LINE__);
+	return(-1);
     }
 
-
-
-    /* Check for valid fieldname */
-    /* ------------------------- */
-    if (status == 0)
+    utlstr2 = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr2 == NULL)
     {
-
-	/* Get data field info */
-	/* ------------------- */
-	status = SWfieldinfo(swathID, fieldname, &rank,
-			     dims, &ntype, dimlist);
-
-	if (status != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-	    HEreport("Field \"%s\" Not Found.\n", fieldname);
-	}
+	HEpush(DFE_NOSPACE,"SWinqfields", __FILE__, __LINE__);
+	free(utlstr);
+	return(-1);
     }
 
+    /* Check for valid swath id */
+    status = SWchkswid(swathID, "SWinqfields",
+		       &fid, &sdInterfaceID, &swVgrpID);
 
-    /* No problems so proceed ... */
-    /* -------------------------- */
     if (status == 0)
     {
-
-
-	/* Initialize start and edge for all dimensions */
-	/* -------------------------------------------- */
-	for (j = 0; j < rank; j++)
-	{
-	    start[j] = 0;
-	    edge[j] = dims[j];
-	}
-
-
-	/* Vertical Subset */
-	/* --------------- */
-	for (j = 0; j < 8; j++)
+	/* If field names, ranks,  or number types desired ... */
+	/* --------------------------------------------------- */
+	if (fieldlist != NULL || rank != NULL || numbertype != NULL)
 	{
-	    /* If active vertical subset ... */
-	    /* ----------------------------- */
-	    if (SWXRegion[regionID]->StartVertical[j] != -1)
+	    /* Get swath name */
+	    int sID = swathID % idOffset;
+	    if (sID >= NSWATH)
 	    {
+	        free(utlstr);
+	        free(utlstr2);
+	        return -1;
+	    }
+	    Vgetname(SWXSwath[sID].IDTable, swathname);
 
-		/* Find vertical dimension within dimlist */
-		/* -------------------------------------- */
-		dum = EHstrwithin(SWXRegion[regionID]->DimNamePtr[j],
-				  dimlist, ',');
-
-		/* If dimension found ... */
-		/* ---------------------- */
-		if (dum != -1)
+	    /* Get pointers to "GeoField" or "DataField" section within SM */
+	    if (strcmp(fieldtype, "Geolocation Fields") == 0)
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "GeoField", metaptrs);
+		if(metabuf == NULL)
 		{
-		    /* Compute start and edge for vertical dimension */
-		    /* --------------------------------------------- */
-                    vfound = 1;                   /* xhua */
-		    start[dum] = SWXRegion[regionID]->StartVertical[j];
-		    edge[dum] = SWXRegion[regionID]->StopVertical[j] -
-			SWXRegion[regionID]->StartVertical[j] + 1;
+		    free(utlstr);
+		    free(utlstr2);
+		    return(-1);
 		}
-		else
+		strcpy(utlstr2, "GeoFieldName");
+	    }
+	    else
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "DataField", metaptrs);
+		if(metabuf == NULL)
 		{
-		    /* Vertical dimension not found */
-		    /* ---------------------------- */
-		    status = -1;
-		    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-		    HEreport("Vertical Dimension Not Found: \"%s\".\n",
-			     SWXRegion[regionID]->DimNamePtr);
+		    free(utlstr);
+		    free(utlstr2);
+		    return(-1);
 		}
+		strcpy(utlstr2, "DataFieldName");
 	    }
-	} /* End of Vertical Subset loop  */
 
 
-
-	/* No problems so proceed ... */
-	/* -------------------------- */
-	if (status == 0)
-	{
-	    /* If non-vertical subset regions defined ... */
-	    /* ------------------------------------------ */
-	    if (SWXRegion[regionID]->nRegions > 0)
+	    /* If field names are desired then "clear" name buffer */
+	    if (fieldlist != NULL)
 	    {
+		fieldlist[0] = 0;
+	    }
 
-		/* Get geolocation dimension name */
-		/* ------------------------------ */
-		status = SWfieldinfo(SWXRegion[regionID]->swathID,
-				     "Longitude", &dum,
-				     dumdims, &dum, geodim);
-                long_status = status;
-
-                /* If Time field being used, check for dimensions */
-                /* ---------------------------------------------- */
-                if (timeflag == 1)
-                {
-                   /* code change to fix time subset bug for Landsat7 */
-
-                   status = SWfieldinfo(SWXRegion[regionID]->swathID,
-                                        "Time", &dum,
-                                        dumdims, &dum, tgeodim);
-
-                   if (strcmp(geodim, tgeodim) != 0)
-                   {
-                      strcpy(geodim, tgeodim);
-                   }
-                }
-                timeflag = 0;
-
-                /* If defscanregion being used, get dimensions    */
-                /* of field being used                            */
-                /* ---------------------------------------------- */
-                if (SWXRegion[regionID]->scanflag == 1)
-                {
-                   (void) SWnentries(SWXRegion[regionID]->swathID,4,&strbufsize);
-                   dfieldlist = (char *)calloc(strbufsize + 1, sizeof(char));
-                   (void) SWinqdatafields(SWXRegion[regionID]->swathID,dfieldlist,dfrank,numtype2);
-                   status = SWfieldinfo(SWXRegion[regionID]->swathID,dfieldlist,&dum,dumdims,&dum,dgeodim);
-
-                   /* The dimensions have to be switched, because */
-                   /* the mappings force a geodim and datadim     */
-                   /* so to find the mapping, the dimensions must */
-                   /* be switched, but the subsetting will still  */
-                   /* be based on the correct dimensions          */
-                   /* ------------------------------------------- */
-                   if (strcmp(dgeodim,dimlist) != 0 || long_status == -1)
-                   {
-                      strcpy(geodim,dimlist);
-                      strcpy(dimlist,dgeodim);
-                   }
-                }
-
-
-		/* Get "Track" (first) Dimension from geo dimlist */
-		/* ---------------------------------------------- */
-		nDim = EHparsestr(geodim, ',', ptr, slen);
-		geodim[slen[0]] = 0;
-
-
-		/* Parse Data Field Dimlist & find mapping */
-		/* --------------------------------------- */
-		nDim = EHparsestr(dimlist, ',', ptr, slen);
 
+	    /* Begin loop through mapping entries in metadata */
+	    /* ---------------------------------------------- */
+	    while (1)
+	    {
+		/* Search for OBJECT string */
+		metaptrs[0] = strstr(metaptrs[0], "\t\tOBJECT=");
 
-		/* Loop through all dimensions and search for mapping */
-		/* -------------------------------------------------- */
-		for (i = 0; i < nDim; i++)
+		/* If found within "Geo" or "Data" Field metadata section .. */
+		if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
 		{
-		    memcpy(utlbuf, ptr[i], slen[i]);
-		    utlbuf[slen[i]] = 0;
-		    statMap = SWmapinfo(swathID, geodim, utlbuf,
-					&offset, &incr);
-
-
-                    /*
-                     *  Force offset to 0.
-                     *  We're not changing the mapping, so we want
-                     *  the original offset to apply to the subsetted data.
-                     *  Otherwise, bad things happen, such as subsetting
-                     *  past the end of the original data, and being unable
-                     *  to read the first <offset> elements of the
-                     *  original data.
-                     *  The offset is only important for aligning the
-                     *  data with interpolated (incr > 0) or decimated
-                     *  (incr < 0) geolocation information for the data.
-                     */
-
-                    offset = 0;
-
-
-		    /* Mapping found */
-		    /* ------------- */
-		    if (statMap == 0)
+		    /* Get Fieldnames (if desired) */
+		    if (fieldlist != NULL)
 		    {
-			found = 1;
-			l_index = i;
-			break;
-		    }
-		}
-
+			/* Check 1st for old meta data then new */
+			/* ------------------------------------ */
+			EHgetmetavalue(metaptrs, "OBJECT", utlstr);
 
-		/* If mapping not found check for geodim within dimlist */
-		/* ---------------------------------------------------- */
-		if (found == 0)
-		{
-		    l_index = EHstrwithin(geodim, dimlist, ',');
+			/*
+			 * If OBJECT value begins with double quote then old
+			 * metadata, field name is OBJECT value. Otherwise
+			 * search for "GeoFieldName" or "DataFieldName"
+			 * string
+			 */
 
-		    /* Geo dimension found within subset field dimlist */
-		    /* ----------------------------------------------- */
-		    if (l_index != -1)
-		    {
-			found = 1;
-			offset = 0;
-			incr = 1;
-		    }
-		}
+			if (utlstr[0] != '"')
+			{
+			    strcpy(utlstr, "\t\t\t\t");
+			    strcat(utlstr, utlstr2);
+			    strcat(utlstr, "=");
+			    metaptrs[0] = strstr(metaptrs[0], utlstr);
+			    EHgetmetavalue(metaptrs, utlstr2, utlstr);
+			}
 
+			/* Strip off double quotes */
+			/* ----------------------- */
+			REMQUOTE(utlstr);
 
 
-		/* If mapping not found check for l_indexed mapping */
-		/* ---------------------------------------------- */
-		if (found == 0)
-		{
-		    /* Get size of geo dim & allocate space of l_index mapping */
-		    /* ----------------------------------------------------- */
-		    dum = SWdiminfo(swathID, geodim);
-            if( dum < 0 )
-            {
-                return -1;
-            }
+			/* Add to fieldlist */
+			/* ---------------- */
+			    if (nFld > 0)
+			{
+			    strcat(fieldlist, ",");
+			}
+			strcat(fieldlist, utlstr);
 
-                    /* For Landsat files, the l_index mapping has two values   */
-                    /* for each point, a left and right point.  So for a 37  */
-                    /* scene band file there are 2x2 points for each scene   */
-                    /* meaning, 2x2x37 = 148 values.  The above function     */
-                    /* only returns the number of values in the track        */
-                    /* dimension.                                            */
-                    /* ----------------------------------------------------- */
-                    if(land_status == 0)
-                       if(strcmp(fieldname, "Latitude") == 0 ||
-                          strcmp(fieldname, "Longitude") == 0)
-                       {
-                          dum = dum * 2;
-                       }
-		    idxmap = (int32 *) calloc(dum, sizeof(int32));
-		    if(idxmap == NULL)
+		    }
+		    /* Get Numbertype */
+		    if (numbertype != NULL)
 		    {
-			HEpush(DFE_NOSPACE,"SWextractregion", __FILE__, __LINE__);
-			return(-1);
+			EHgetmetavalue(metaptrs, "DataType", utlstr);
+			numbertype[nFld] = EHnumstr(utlstr);
 		    }
-
-		    /* Loop through all dimensions and search for mapping */
-		    /* -------------------------------------------------- */
-		    for (i = 0; i < nDim; i++)
+		    /*
+		     * Get Rank (if desired) by counting # of dimensions in
+		     * "DimList" string
+		     */
+		    if (rank != NULL)
 		    {
-			memcpy(utlbuf, ptr[i], slen[i]);
-			utlbuf[slen[i]] = 0;
-
-			idxMapElem =
-			    SWidxmapinfo(swathID, geodim, utlbuf, idxmap);
-
-
-			/* Mapping found */
-			/* ------------- */
-			if (idxMapElem != -1)
-			{
-			    found = 1;
-			    l_index = i;
-			    break;
-			}
+			EHgetmetavalue(metaptrs, "DimList", utlstr);
+			rank[nFld] = EHparsestr(utlstr, ',', ptr, slen);
 		    }
+		    /* Increment number of fields */
+		    nFld++;
+		}
+		else
+		    /* No more fields found */
+		{
+		    break;
 		}
+	    }
+	    free(metabuf);
+	}
+    }
+
+    /* Set nFld to -1 if error status exists */
+    /* ------------------------------------- */
+    if (status == -1)
+    {
+	nFld = -1;
+    }
 
+    free(utlstr);
+    free(utlstr2);
 
-		/* If regular mapping found ... */
-		/* ---------------------------- */
-		if (found == 1 && idxMapElem == -1)
-		{
-		    for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-		    {
-			if (k > 0)
-			{
-			    /* Compute size in bytes of previous region */
-			    /* ---------------------------------------- */
-			    size = edge[0];
-			    for (j = 1; j < rank; j++)
-			    {
-				size *= edge[j];
-			    }
-			    size *= DFKNTsize(ntype);
+    return (nFld);
+}
 
 
-			    /* Compute output buffer offset */
-			    /* ---------------------------- */
-			    bufOffset += size;
-			}
-			else
-			{
-			    /* Initialize output buffer offset */
-			    /* ------------------------------- */
-			    bufOffset = 0;
-			}
 
 
-			/* Compute number of cross tracks in region */
-			/* ---------------------------------------- */
-			nXtrk = SWXRegion[regionID]->StopRegion[k] -
-			    SWXRegion[regionID]->StartRegion[k] + 1;
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: SWinqgeofields                                                   |
+|                                                                             |
+|  DESCRIPTION: Inquires about geo fields in swath                            |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  nflds          int32               Number of geo fields in swath           |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  swathID        int32               swath structure ID                      |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  fieldlist      char                Field names (comma-separated)           |
+|  rank           int32               Array of ranks                          |
+|  numbertype     int32               Array of HDF number types               |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+int32
+SWinqgeofields(int32 swathID, char *fieldlist, int32 rank[],
+	       int32 numbertype[])
+{
 
+    int32           nflds;	/* Number of Geolocation fields */
 
-			/* Positive increment (geodim <= datadim) */
-			/* -------------------------------------- */
-			if (incr > 0)
-			{
-                           if (SWXRegion[regionID]->scanflag == 1)
-                           {
-                              start[l_index] = SWXRegion[regionID]->StartRegion[k]/incr;
-                              if(SWXRegion[regionID]->band8flag == 2 ||
-                                 SWXRegion[regionID]->band8flag == 3)
-                              {
-                                 start[l_index] = (SWXRegion[regionID]->StartRegion[k]+detect_cnt)/incr;
-                                 status = SWfieldinfo(SWXRegion[regionID]->swathID,"scan_no",&rank,dims2,&nt,dimlist);
-                                 buffer2 = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                                 status = SWreadfield(SWXRegion[regionID]->swathID,"scan_no",NULL,NULL,NULL,buffer2);
-                                 if(incr == 1)
-                                    start[l_index] = start[l_index] - (buffer2[0] * detect_cnt);
-                                 else
-                                    start[l_index] = start[l_index] - buffer2[0];
-                                 free(buffer2);
-                              }
-                              scan_shift = nXtrk % incr;
-                              if(scan_shift != 0)
-                                 nXtrk = nXtrk - scan_shift;
-			      edge[l_index] = nXtrk / incr;
-                              if (nXtrk % incr != 0)
-                                 edge[l_index]++;
-                              if(long_status == -1 || incr == 1)
-                              {
-                                 if( detect_cnt == 0 )
-                                     return -1;
-                                 scan_shift = nXtrk % detect_cnt;
-                                 if(scan_shift != 0)
-                                    edge[l_index] = nXtrk - scan_shift;
-                              }
-
-                           }
-                           else
-                           {
-			      start[l_index] = SWXRegion[regionID]->StartRegion[k] * incr + offset;
-			      edge[l_index] = nXtrk * incr - offset;
-                           }
-			}
-			else
-			{
-			    /* Negative increment (geodim > datadim) */
-			    /* ------------------------------------- */
-			    start[l_index] = SWXRegion[regionID]->StartRegion[k]
-				/ (-incr) + offset;
-			    edge[l_index] = nXtrk / (-incr);
+    /* Call "SWinqfields" routine */
+    /* -------------------------- */
+    nflds = SWinqfields(swathID, "Geolocation Fields", fieldlist, rank,
+			numbertype);
 
-			    /*
-			     * If Xtrk not exactly divisible by incr, round
-			     * edge to next highest integer
-			     */
+    return (nflds);
 
-			    if (nXtrk % (-incr) != 0)
-			    {
-				edge[l_index]++;
-			    }
-			}
+}
 
 
-			/* Read Data into output buffer */
-			/* ---------------------------- */
-			status = SWreadfield(swathID, fieldname,
-					     start, NULL, edge,
-					     (uint8 *) buffer + bufOffset);
-		    }
-		}
-		else if (found == 1 && idxMapElem != -1)
-		{
-		    /* Indexed Mapping */
-		    /* --------------- */
-		    for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-		    {
-			if (k > 0)
-			{
-			    /* Compute size in bytes of previous region */
-			    /* ---------------------------------------- */
-			    size = edge[0];
-			    for (j = 1; j < rank; j++)
-			    {
-				size *= edge[j];
-			    }
-			    size *= DFKNTsize(ntype);
 
 
-			    /* Compute output buffer offset */
-			    /* ---------------------------- */
-			    bufOffset += size;
-			}
-			else
-			{
-			    /* Initialize output buffer offset */
-			    /* ------------------------------- */
-			    bufOffset = 0;
-			}
+/*----------------------------------------------------------------------------|
+|  BEGIN_PROLOG                                                               |
+|                                                                             |
+|  FUNCTION: SWinqdatafields                                                  |
+|                                                                             |
+|  DESCRIPTION: Inquires about data fields in swath                           |
+|                                                                             |
+|                                                                             |
+|  Return Value    Type     Units     Description                             |
+|  ============   ======  =========   =====================================   |
+|  nflds          int32               Number of data fields in swath          |
+|                                                                             |
+|  INPUTS:                                                                    |
+|  swathID        int32               swath structure ID                      |
+|                                                                             |
+|  OUTPUTS:                                                                   |
+|  fieldlist      char                Field names (comma-separated)           |
+|  rank           int32               Array of ranks                          |
+|  numbertype     int32               Array of HDF number types               |
+|                                                                             |
+|  NOTES:                                                                     |
+|                                                                             |
+|                                                                             |
+|   Date     Programmer   Description                                         |
+|  ======   ============  =================================================   |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+int32
+SWinqdatafields(int32 swathID, char *fieldlist, int32 rank[],
+		int32 numbertype[])
+{
 
+    int32           nflds;	/* Number of Data fields */
 
-			/* Compute start & edge from l_index mappings */
-			/* ---------------------------------------- */
-                        if (SWXRegion[regionID]->scanflag == 1 &&
-                            (strcmp(fieldname, "Latitude") == 0 ||
-                             strcmp(fieldname, "Longitude") == 0))
-                        {
-                           if (land_status == 0)
-                              status = SWreadattr(swathID, "scene_count", &scene_cnt);
-                           startscanline = SWXRegion[regionID]->StartRegion[k];
-                           stopscanline = SWXRegion[regionID]->StopRegion[k];
-                           if(SWXRegion[regionID]->band8flag == 2 || SWXRegion[regionID]->band8flag == 3)
-                           {
-                               status = SWfieldinfo(swathID,"scan_no",&rk,dims2,&nt,dimlist);
-                               tbuffer = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                               status =SWreadfield(swathID,"scan_no",NULL,NULL,NULL,tbuffer);
-                               startscanline = startscanline - ((tbuffer[0] * detect_cnt) - detect_cnt);
-                               stopscanline = stopscanline - ((tbuffer[0] * detect_cnt) - 1);
-                           }
-                           if(SWXRegion[regionID]->band8flag == 2 ||
-                              SWXRegion[regionID]->band8flag == 3)
-                           {
-                              if(startscandim == -1)
-                                 if(startscanline < idxmap[0])
-                                 {
-                                    startscandim = 0;
-                                    start[l_index] = 0;
-                                    if(stopscanline > idxmap[scene_cnt * 2 - 1])
-                                    {
-                                       stopscandim = scene_cnt*2 - startscandim;
-                                       edge[l_index] = scene_cnt*2 - startscandim;
-                                    }
-                                 }
-                           }
-                           j = 0;
-                           for (l = 0; l < scene_cnt; l++)
-                           {
-                              if(idxmap[j] <= startscanline && idxmap[j+1] >= startscanline)
-                                 if(startscandim == -1)
-                                 {
-                                    start[l_index] = j;
-                                    startscandim = j;
-                                 }
-                              if(idxmap[j] <= stopscanline && idxmap[j+1] >= stopscanline)
-                                 if(startscandim != -1)
-                                 {
-                                    edge[l_index] = j - start[l_index] + 2;
-                                    stopscandim = j - start[l_index] + 1;
-                                 }
-                              j = j + 2;
-                           }
-                           if(SWXRegion[regionID]->band8flag == 1 ||
-                              SWXRegion[regionID]->band8flag == 2)
-                           {
-                              if(startscandim == -1)
-                                 if(startscanline < idxmap[0])
-                                 {
-                                    startscandim = 0;
-                                    start[l_index] = 0;
-                                 }
-                              if(stopscandim == -1)
-                                 if(stopscanline > idxmap[scene_cnt * 2 - 1])
-                                 {
-                                    stopscandim = scene_cnt*2 - start[l_index];
-                                    edge[l_index] = scene_cnt*2 - start[l_index];
-                                 }
-                           }
-                           if(SWXRegion[regionID]->band8flag == 2)
-                           {
-                              if(startscandim == -1)
-                                 if(startscanline > idxmap[j - 1])
-                                 {
-                                    status = SWfieldinfo(SWXRegion[regionID]->swathID,"scan_no",&rank2,dims2,&nt,dimlist);
-                                    buffer2 = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                                    status = SWreadfield(SWXRegion[regionID]->swathID,"scan_no",NULL,NULL,NULL,buffer2);
-                                    startscanline = startscanline - (buffer2[0] * detect_cnt);
-                                    stopscanline = stopscanline - (buffer2[0] * detect_cnt);
-                                    free(buffer2);
-                                    j = 0;
-                                    for (l = 0; l < scene_cnt; l++)
-                                    {
-                                       if(idxmap[j] <= startscanline && idxmap[j+1] >= startscanline)
-                                       {
-                                          start[l_index] = j;
-                                       }
-                                       if(idxmap[j] <= stopscanline && idxmap[j+1] >= stopscanline)
-                                          edge[l_index] = j - start[l_index] + 2;
-                                       j = j + 2;
-                                       if(idxmap[j] == 0  || idxmap[j+1] == 0)
-                                          l = scene_cnt;
-                                    }
-
-                                 }
-                           }
-
-                        }
-                        else if(SWXRegion[regionID]->scanflag == 1 &&
-                                (strcmp(fieldname, "scene_center_latitude") == 0 ||
-                                 strcmp(fieldname, "scene_center_longitude") == 0))
-                        {
-                           if (land_status == 0)
-                              status = SWreadattr(swathID, "scene_count", &scene_cnt);
-                           startscanline = SWXRegion[regionID]->StartRegion[k];
-                           stopscanline = SWXRegion[regionID]->StopRegion[k];
-                           if(startscanline < idxmap[0])
-                           {
-                              startscandim = 0;
-                              start[l_index] = 0;
-                           }
-                           for (l = 0; l < scene_cnt-1; l++)
-                           {
-                              if(idxmap[l] <= startscanline && idxmap[l+1] >= startscanline)
-                                 if(startscandim == -1)
-                                 {
-                                    start[l_index] = l;
-                                    startscandim = l;
-                                 }
-                              if(idxmap[l] <= stopscanline && idxmap[l+1] >= stopscanline)
-                                 if(stopscandim == -1)
-                                 {
-                                    edge[l_index] = l - start[l_index] + 2;
-                                    stopscandim = l + 1;
-                                 }
-                            }
-                            if(stopscandim == -1)
-                            {
-                               if(stopscanline > idxmap[scene_cnt - 1])
-                               {
-                                  edge[l_index] = scene_cnt - start[l_index];
-                                  stopscandim = scene_cnt - 1;
-                               }
-                            }
-
-                            if(SWXRegion[regionID]->band8flag == 1)
-                            {
-                               if(stopscandim == -1)
-                                  if(stopscanline > idxmap[scene_cnt - 1])
-                                  {
-                                     edge[l_index] = scene_cnt - start[l_index];
-                                     stopscandim = scene_cnt -1;
-                                  }
-                            }
-                            if(SWXRegion[regionID]->band8flag == 2 ||
-                               SWXRegion[regionID]->band8flag == 3)
-                            {
-                               if(startscandim == -1)
-                               {
-                                  if(startscanline < idxmap[0])
-                                  {
-                                     startscandim = 0;
-                                     start[l_index] = 0;
-                                     edge[l_index] = stopscandim - startscandim + 1;
-                                  }
-                               }
-                               if(startscandim == -1)
-                               {
-                                  startscanline = SWXRegion[regionID]->StartScan[k] * detect_cnt - detect_cnt;
-                                  stopscanline = SWXRegion[regionID]->StopScan[k] * detect_cnt - 1;
-                                  for (l = 0; l < scene_cnt-1; l++)
-                                  {
-                                     if(idxmap[l] <= startscanline && idxmap[l+1] >= startscanline)
-                                        start[l_index] = l;
-                                     if(idxmap[l] <= stopscanline && idxmap[l+1] >= stopscanline)
-                                        edge[l_index] = l - start[l_index] + 1;
-                                  }
-                               }
-                           }
-                        }
-                        else
-                        {
-                           if (SWXRegion[regionID]->scanflag == 1 &&
-                               strcmp(fieldname,dfieldlist) == 0)
-                           {
-                              start[l_index] = SWXRegion[regionID]->StartRegion[k];
-                              edge[l_index] = SWXRegion[regionID]->StopRegion[k] -
-                                             SWXRegion[regionID]->StartRegion[k] + 1;
-                              if(SWXRegion[regionID]->band8flag == 2 ||
-				 SWXRegion[regionID]->band8flag == 3 )
-                              {
-                                 status = SWfieldinfo(SWXRegion[regionID]->swathID,"scan_no",&rank,dims2,&nt,dimlist);
-                                 buffer2 = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                                 status = SWreadfield(SWXRegion[regionID]->swathID,"scan_no",NULL,NULL,NULL,buffer2);
-                                 start[l_index] = start[l_index] - (buffer2[0] * detect_cnt - detect_cnt);
-                                 free(buffer2);
-                              }
-                           }
-                           else
-                           {
-			      start[l_index] = idxmap[SWXRegion[regionID]->StartRegion[k]];
-
-			      edge[l_index] = idxmap[SWXRegion[regionID]->StopRegion[k]] -
-			                 idxmap[SWXRegion[regionID]->StartRegion[k]] + 1;
-                           }
-                        }
-			/* Read Data into output buffer */
-			/* ---------------------------- */
-			status = SWreadfield(swathID, fieldname,
-					     start, NULL, edge,
-					     buffer);
-                        if (SWXRegion[regionID]->scanflag == 1)
-                        {
-
-                           if (strcmp(fieldname,"Longitude") == 0)
-                           {
-                              status = SWscan2longlat(swathID, fieldname, buffer, start,
-                                              edge, idxmap, startscanline, stopscanline);
-                           }
-                           if (strcmp(fieldname,"Latitude") == 0)
-                           {
-                              status = SWscan2longlat(swathID, fieldname, buffer, start,
-                                              edge, idxmap, startscanline, stopscanline);
-                           }
-                        }
-		    }
-		}
-		else if(vfound == 1)                          /* Vertical subsetting */
-                {                                             /* found previously,   */
-                   status = SWreadfield(swathID, fieldname,   /* perform the vertical*/
-                                        start, NULL, edge,    /* subsetting.         */
-                                        (uint8 *) buffer);    /* -- xhua             */
-                }
-                else
-		{
-		    /* Mapping not found */
-		    /* ----------------- */
-		    status = -1;
-		    HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-		    HEreport("Mapping Not Defined for \"%s\" Dimension.\n",
-			     geodim);
-		}
-	    }
-	    else
-	    {
-		/* Read Data (Vert SS only) */
-		/* ------------------------ */
-		status = SWreadfield(swathID, fieldname,
-				     start, NULL, edge,
-				     (uint8 *) buffer);
-	    }
-	}
-    }
+    /* Call "SWinqfields" routine */
+    /* -------------------------- */
+    nflds = SWinqfields(swathID, "Data Fields", fieldlist, rank,
+			numbertype);
 
-    /* Free l_index mappings if applicable */
-    /* --------------------------------- */
-    if (idxmap != NULL)
-    {
-	free(idxmap);
-    }
-    if(dfieldlist != NULL)
-       free(dfieldlist);
+    return (nflds);
 
-    return (status);
 }
 
 
 
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWscan2longlat                                                   |
+|  FUNCTION: SWnentries                                                       |
 |                                                                             |
-|  DESCRIPTION:  Convert scanline to Long/Lat for floating scene subsetting.  |
-|                This will calculate/interpolate the long/lat for a given     |
-|                scanline.                                                    |
+|  DESCRIPTION: Returns number of entries and string buffer size              |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nEntries       int32               Number of entries                       |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  fieldname      char                Fieldname                               |
-|  buffer	  void		      Values to update                        |
-|  start	  int32		                                              |
-|  edge		  int32							      |
-|  idxmap	  int32 *	      Buffer of l_index mapping values          |
-|  startscanline  int32		      Start of scan region		      |
-|  stopscanline   int32		      Stop of scan region		      |
+|  swathID        int32               swath structure ID                      |
+|  entrycode      int32               Entry code                              |
+|	                              HDFE_NENTDIM  (0)                       |
+|	                              HDFE_NENTMAP  (1)                       |
+|	                              HDFE_NENTIMAP (2)                       |
+|	                              HDFE_NENTGFLD (3)                       |
+|	                              HDFE_NENTDFLD (4)                       |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
+|  strbufsize     int32               Length of comma-separated list          |
+|                                     (Does not include null-terminator       |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Jul 99   DaW           Original Programmer                                 |
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
+|  Feb 97   Joel Gales    Set nEntries to -1 if status = -1                   |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-static intn
-SWscan2longlat(int32 swathID, const char *fieldname, VOIDP buffer, int32 start[],
-int32 edge[], int32 *idxmap, int32 startscanline, int32 stopscanline)
+int32
+SWnentries(int32 swathID, int32 entrycode, int32 * strbufsize)
+
 {
+    intn            status;	    /* routine return status variable */
+    intn            i;		    /* Loop index */
+
+    int32           fid;	    /* HDF-EOS file ID */
+    int32           sdInterfaceID;  /* HDF SDS interface ID */
+    int32           swVgrpID;	    /* Swath root Vgroup ID */
+    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
+    int32           nEntries = 0;   /* Number of entries */
+    int32           metaflag;	    /* Old (0), New (1) metadata flag) */
+    int32           nVal = 0;	    /* Number of strings to search for */
+
+    char           *metabuf = NULL; /* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];    /* Pointers to begin and end of SM section */
+    char            swathname[80];  /* Swath Name */
+    char           *utlstr;	    /* Utility string */
+    char            valName[2][32]; /* Strings to search for */
+
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
+    {
+	HEpush(DFE_NOSPACE,"SWnemtries", __FILE__, __LINE__);
+	return(-1);
+    }
+    /* Check for valid swath id */
+    /* ------------------------ */
+    status = SWchkswid(swathID, "SWnentries", &fid, &sdInterfaceID, &swVgrpID);
+
+    if (status == 0)
+    {
+	/* Get swath name */
+	int sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    free(utlstr);
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
+
+	/* Zero out string buffer size */
+	*strbufsize = 0;
 
-   enum corner {UL, UR, LL, LR};
-   enum corner pos = UL;
-   enum corner pos2 = UL;
 
-   uint8	scene_cnt = 0;		/* Used to convert scan to scanline  */
-                                        /*  L7 float scene sub.              */
-   float32	*buffer2;
-   float32	*bufferc;
-   float32	deg2rad = (float32)(M_PI/180.00);
+	/*
+	 * Get pointer to relevant section within SM and Get names of
+	 * metadata strings to inquire about
+	 */
+	switch (entrycode)
+	{
+	case HDFE_NENTDIM:
+	    /* Dimensions */
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "Dimension", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
+		nVal = 1;
+		strcpy(&valName[0][0], "DimensionName");
+	    }
+	    break;
 
-   float32	p1_long = 0.0;	/* point 1, longitude */
-   float32	p2_long = 0.0;	/* point 2, longitude */
-   float32	pi_long = 0.0;	/* interpolated point, longitude */
-   int32	scanline_p1 = 0;
+	case HDFE_NENTMAP:
+	    /* Dimension Maps */
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "DimensionMap", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
+		nVal = 2;
+		strcpy(&valName[0][0], "GeoDimension");
+		strcpy(&valName[1][0], "DataDimension");
+	    }
+	    break;
 
-   float32	p1_lat = 0.0;	/* point 1, latitude */
-   float32	p2_lat = 0.0;	/* point 2, latitude */
-   float32	pi_lat = 0.0;	/* interpolated point, latitude */
-   int32	scanline_p2 = 0;
+	case HDFE_NENTIMAP:
+	    /* Indexed Dimension Maps */
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					     "IndexDimensionMap", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
+		nVal = 2;
+		strcpy(&valName[0][0], "GeoDimension");
+		strcpy(&valName[1][0], "DataDimension");
+	    }
+	    break;
 
+	case HDFE_NENTGFLD:
+	    /* Geolocation Fields */
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "GeoField", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
+		nVal = 1;
+		strcpy(&valName[0][0], "GeoFieldName");
+	    }
+	    break;
 
-   float32	x_p1 = 0.0;		/* Cartesian coordinates */
-   float32	y_p1 = 0.0;		/* point 1               */
-   float32	z_p1 = 0.0;
+	case HDFE_NENTDFLD:
+	    /* Data Fields */
+	    {
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "DataField", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
+		nVal = 1;
+		strcpy(&valName[0][0], "DataFieldName");
+	    }
+	    break;
+	}
 
-   float32	x_p2 = 0.0;		/* Cartesian coordinates */
-   float32	y_p2 = 0.0;		/* point 2		 */
-   float32	z_p2 = 0.0;
 
-   float32	x_pi = 0.0;		/* Cartesian coordinates */
-   float32	y_pi = 0.0;		/* interpolated point    */
-   float32	z_pi = 0.0;
-   int32	scanline_pi = 0;
+	/*
+	 * Check for presence of 'GROUP="' string If found then old metadata,
+	 * search on OBJECT string
+	 */
+        if (metabuf)
+        {
+            metaflag = (strstr(metabuf, "GROUP=\"") == NULL) ? 1 : 0;
+            if (metaflag == 0)
+            {
+                nVal = 1;
+                strcpy(&valName[0][0], "\t\tOBJECT");
+            }
 
-   intn		status = -1;
 
-   int		i = 0;
-   int		p1_long_l90_flag = 0;
-   int		p1_long_g90_flag = 0;
-   int		p2_long_l90_flag = 0;
-   int		p2_long_g90_flag = 0;
-   int		fieldflag = 0;
+            /* Begin loop through entries in metadata */
+            /* -------------------------------------- */
+            while (1)
+            {
+                /* Search for first string */
+                strcpy(utlstr, &valName[0][0]);
+                strcat(utlstr, "=");
+                metaptrs[0] = strstr(metaptrs[0], utlstr);
 
-   int	numofval = 0;
+                /* If found within relevant metadata section ... */
+                if (metaptrs[0] < metaptrs[1] && metaptrs[0] != NULL)
+                {
+                    for (i = 0; i < nVal; i++)
+                    {
+                        /*
+                         * Get all string values Don't count quotes
+                         */
+                        EHgetmetavalue(metaptrs, &valName[i][0], utlstr);
+                        *strbufsize += (int32)strlen(utlstr) - 2;
+                    }
+                    /* Increment number of entries */
+                    nEntries++;
 
+                    /* Go to end of OBJECT */
+                    metaptrs[0] = strstr(metaptrs[0], "END_OBJECT");
+                }
+                else
+                    /* No more entries found */
+                {
+                    break;
+                }
+            }
+            free(metabuf);
+        }
 
 
-   numofval = edge[0] * 2;
+	/* Count comma separators & slashes (if mappings) */
+	/* ---------------------------------------------- */
+	if (nEntries > 0)
+	{
+	    *strbufsize += nEntries - 1;
+	    *strbufsize += (nVal - 1) * nEntries;
+	}
+    }
 
 
-   buffer2 = (float32 *)calloc(numofval, sizeof(float32));
-   bufferc = (float32 *)calloc(numofval, sizeof(float32));
-   memmove(bufferc, buffer, numofval*sizeof(float32));
+    /* Set nEntries to -1 if error status exists */
+    /* ----------------------------------------- */
+    if (status == -1)
+	nEntries = -1;
 
-   (void) SWreadattr(swathID, "scene_count", &scene_cnt);
+    free(utlstr);
 
-   if (strcmp(fieldname, "Longitude") == 0)
-   {
-      fieldflag = 1;
-      status = SWreadfield(swathID, "Latitude", start, NULL, edge, buffer2);
-   }
-   else if (strcmp(fieldname, "Latitude") == 0)
-   {
-      fieldflag = 2;
-      status = SWreadfield(swathID, "Longitude", start, NULL, edge, buffer2);
-   }
+    return (nEntries);
+}
 
-   for(i=0; i<4; i++)
-   {
-      switch(pos)
-      {
-         case UL:
-            if (fieldflag == 1)
-            {
-               p1_long = bufferc[0];
-               p2_long = bufferc[2];
-               p1_lat = buffer2[0];
-               p2_lat = buffer2[2];
-            }
-            if (fieldflag == 2)
-            {
-               p1_long = buffer2[0];
-               p2_long = buffer2[2];
-               p1_lat = bufferc[0];
-               p2_lat = bufferc[2];
-            }
-            scanline_p1 = idxmap[start[0]];
-            scanline_p2 = idxmap[start[0]+1];
-            scanline_pi = startscanline;
-            pos = UR;
-            break;
-         case UR:
-            if (fieldflag == 1)
-            {
-               p1_long = bufferc[1];
-               p2_long = bufferc[3];
-               p1_lat = buffer2[1];
-               p2_lat = buffer2[3];
-            }
-            if (fieldflag == 2)
-            {
-               p1_long = buffer2[1];
-               p2_long = buffer2[3];
-               p1_lat = bufferc[1];
-               p2_lat = bufferc[3];
-            }
-            scanline_p1 = idxmap[start[0]];
-            scanline_p2 = idxmap[start[0]+1];
-            scanline_pi = startscanline;
-            pos = LL;
-            break;
-         case LL:
-            if (fieldflag == 1)
-            {
-               p1_long = bufferc[numofval-4];
-               p2_long = bufferc[numofval-2];
-               p1_lat = buffer2[numofval-4];
-               p2_lat = buffer2[numofval-2];
-            }
-            if (fieldflag == 2)
-            {
-               p1_long = buffer2[numofval-4];
-               p2_long = buffer2[numofval-2];
-               p1_lat = bufferc[numofval-4];
-               p2_lat = bufferc[numofval-2];
-            }
-            scanline_p1 = idxmap[start[0] + edge[0] - 2];
-            scanline_p2 = idxmap[start[0] + edge[0] - 1];
-            scanline_pi = stopscanline;
-            pos = LR;
-            break;
-         case LR:
-            if (fieldflag == 1)
-            {
-               p1_long = bufferc[numofval-3];
-               p2_long = bufferc[numofval-1];
-               p1_lat = buffer2[numofval-3];
-               p2_lat = buffer2[numofval-1];
-            }
-            if (fieldflag == 2)
-            {
-               p1_long = buffer2[numofval-3];
-               p2_long = buffer2[numofval-1];
-               p1_lat = bufferc[numofval-3];
-               p2_lat = bufferc[numofval-1];
-            }
-            scanline_p1 = idxmap[start[0] + edge[0] - 2];
-            scanline_p2 = idxmap[start[0] + edge[0] - 1];
-            scanline_pi = stopscanline;
-            break;
-      }
-
-
-
-   if (p1_long <= -90.0)
-   {
-      if (p2_long >= 90.0)
-      {
-         p1_long = p1_long + 180.0f;
-         p2_long = p2_long - 180.0f;
-         p1_long_l90_flag = 2;
-      }
-      else
-      {
-         p1_long = p1_long + 180.0f;
-         p1_long_l90_flag = 1;
-      }
-   }
-   if (p1_long >= 90.0 && p1_long_l90_flag != 2)
-   {
-      if(p2_long <= -90.0)
-      {
-         p1_long = p1_long - 180.0f;
-         p2_long = p2_long + 180.0f;
-         p1_long_g90_flag = 2;
-      }
-      else
-      {
-         p1_long = p1_long - 90.0f;
-         p1_long_g90_flag = 1;
-      }
-   }
-   if (p2_long <= -90.0)
-   {
-      if (p1_long < 0.0)
-      {
-         p2_long = p2_long + 90.0f;
-         p1_long = p1_long + 90.0f;
-         p2_long_l90_flag = 2;
-      }
-      else
-      {
-         p2_long = p2_long + 180.0f;
-         p2_long_l90_flag = 1;
-      }
-   }
-   if (p2_long >= 90.0 && p1_long_l90_flag != 2)
-   {
-      p2_long = p2_long - 90.0f;
-      p2_long_g90_flag = 1;
-   }
-
-
-   x_p1 = (float)(RADOE * cos((p1_long*deg2rad)) * sin((p1_lat*deg2rad)));
-   y_p1 = (float)(RADOE * sin((p1_long*deg2rad)) * sin((p1_lat*deg2rad)));
-   z_p1 = (float)(RADOE * cos((p1_lat*deg2rad)));
-
-
-   x_p2 = (float)(RADOE * cos((p2_long*deg2rad)) * sin((p2_lat*deg2rad)));
-   y_p2 = (float)(RADOE * sin((p2_long*deg2rad)) * sin((p2_lat*deg2rad)));
-   z_p2 = (float)(RADOE * cos((p2_lat*deg2rad)));
-
-   x_pi = x_p1 + (x_p2 - x_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1);
-   y_pi = y_p1 + (y_p2 - y_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1);
-   z_pi = z_p1 + (z_p2 - z_p1)*(scanline_pi-scanline_p1)/(scanline_p2-scanline_p1);
-
-   if (fieldflag == 1)
-   {
-      pi_long = (float)(atan(y_pi/x_pi)*180.0/M_PI);
-      if (p1_long_l90_flag == 1 || p2_long_l90_flag == 1)
-      {
-         pi_long = pi_long - 180.0f;
-         p1_long_l90_flag = 0;
-	 p2_long_l90_flag = 0;
-      }
-      if (p1_long_g90_flag == 1 || p2_long_g90_flag == 1)
-      {
-         pi_long = pi_long + 90.0f;
-         p1_long_g90_flag = 0;
-         p2_long_g90_flag = 0;
-      }
-      if (p1_long_l90_flag == 2)
-      {
-         if (pi_long > 0.0)
-            pi_long = pi_long - 180.0f;
-         else if (pi_long < 0.0)
-            pi_long = pi_long + 180.0f;
-         p1_long_l90_flag = 0;
-      }
-      if (p1_long_g90_flag == 2)
-      {
-         if (pi_long > 0.0)
-            pi_long = pi_long - 180.0f;
-         else if (pi_long < 0.0)
-            pi_long = pi_long + 180.0f;
-         p1_long_g90_flag = 0;
-      }
-      if (p2_long_l90_flag == 2)
-      {
-         pi_long = pi_long - 90.0f;
-         p2_long_l90_flag = 0;
-      }
-
-
-
-      switch(pos2)
-      {
-      case UL:
-         bufferc[0] = pi_long;
-         pos2 = UR;
-         break;
-      case UR:
-         bufferc[1] = pi_long;
-         pos2 = LL;
-         break;
-      case LL:
-         if(stopscanline > idxmap[scene_cnt*2 - 1])
-            break;
-         bufferc[numofval-2] = pi_long;
-         pos2 = LR;
-         break;
-      case LR:
-         if(stopscanline > idxmap[scene_cnt*2 - 1])
-            break;
-         bufferc[numofval-1] = pi_long;
-         break;
-      }
 
-    }
-    if (fieldflag == 2)
-    {
-      pi_lat = (float)(atan((sqrt(x_pi*x_pi + y_pi*y_pi)/z_pi))*180.0/M_PI);
-      switch(pos2)
-      {
-      case UL:
-         bufferc[0] = pi_lat;
-         pos2 = UR;
-         break;
-      case UR:
-         bufferc[1] = pi_lat;
-         pos2 = LL;
-         break;
-      case LL:
-         if(stopscanline > idxmap[scene_cnt*2 - 1])
-            break;
-         bufferc[numofval-2] = pi_lat;
-         pos2 = LR;
-         break;
-      case LR:
-         if(stopscanline > idxmap[scene_cnt*2 - 1])
-            break;
-         bufferc[numofval-1] = pi_lat;
-         break;
-      }
-   }
-   }
-   memmove(buffer, bufferc, numofval*sizeof(float32));
-   free(buffer2);
-   free(bufferc);
-   return(status);
-}
 
 
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWextractperiod                                                  |
+|  FUNCTION: SWinqswath                                                       |
 |                                                                             |
-|  DESCRIPTION: Retrieves data from specified period.                         |
+|  DESCRIPTION: Returns number and names of swath structures in file          |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
+|  nSwath         int32               Number of swath structures in file      |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  periodID       int32               Period ID                               |
-|  fieldname      char                Fieldname                               |
-|  externalflag   int32               External geolocation fields flag        |
-|                                     HDFE_INTERNAL (0)                       |
-|                                     HDFE_EXTERNAL (1)                       |
+|  filename       char                HDF-EOS filename                        |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  buffer         void                Data buffer containing subsetted region |
+|  swathlist      char                List of swath names (comma-separated)   |
+|  strbufsize     int32               Length of swathlist                     |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -8153,109 +2841,119 @@ int32 edge[], int32 *idxmap, int32 startscanline, int32 stopscanline)
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Jun 03   Abe Taaheri   added clearing timeflag if SWextractregion fails    |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWextractperiod(int32 swathID, int32 periodID, const char *fieldname,
-		int32 externalflag, VOIDP buffer)
-
+int32
+SWinqswath(const char *filename, char *swathlist, int32 * strbufsize)
 {
-    intn            status;	/* routine return status variable */
+    int32           nSwath;	/* Number of swath structures in file */
 
-    timeflag = 1;
+    /* Call "EHinquire" routine */
+    /* ------------------------ */
+    nSwath = EHinquire(filename, "SWATH", swathlist, strbufsize);
 
-    /* Call SWextractregion routine */
-    /* ---------------------------- */
-    status = SWextractregion(swathID, periodID, fieldname, externalflag,
-			     (char *) buffer);
-    if (status != 0) timeflag = 0; /*clear timeflag if SWextractregion failed*/
-    return (status);
+    return (nSwath);
 }
-#endif
-
 
 
 
-
-#ifdef UNUSED_BY_GDAL
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdupregion                                                      |
+|  FUNCTION: SW1dfldsrch                                                      |
 |                                                                             |
-|  DESCRIPTION: Duplicates a region                                           |
+|  DESCRIPTION: Retrieves information about a 1D field                        |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  newregionID    int32               New region ID                           |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  oldregionID    int32               Old region ID                           |
+|  fid            int32               HDF-EOS file ID                         |
+|  swathID        int32               swath structure ID                      |
+|  fieldname      const char          field name                              |
+|  access         const char          Access code (w/r)                       |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  vgidout        int32               Field (geo/data) vgroup ID              |
+|  vdataIDout     int32               Field Vdata ID                          |
+|  fldtype        int32               Field type                              |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Jan 97   Joel Gales    Original Programmer                                 |
+|  Jun 96   Joel Gales    Original Programmer                                 |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-int32
-SWdupregion(int32 oldregionID)
+static intn
+SW1dfldsrch(int32 fid, int32 swathID, const char *fieldname, const char *i_access,
+	    int32 * vgidout, int32 * vdataIDout, int32 * fldtype)
+
 {
-    intn            i;		/* Loop index */
+    intn            status = 0;	/* routine return status variable */
 
-    int32           newregionID = -1;	/* New region ID */
+    int32           sID;	/* SwathID - offset */
+    int32           vgid;	/* Swath Geo or Data Vgroup ID */
+    int32           vdataID;	/* 1d field vdata */
+    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
 
 
-    /* Find first empty (inactive) region */
-    /* ---------------------------------- */
-    for (i = 0; i < NSWATHREGN; i++)
+    /* Compute "reduced" swath ID */
+    /* -------------------------- */
+    sID = swathID % idOffset;
+    if (sID >= NSWATH)
     {
-	if (SWXRegion[i] == 0)
-	{
-	    /* Allocate space for new swath region entry */
-	    /* ----------------------------------------- */
-	    SWXRegion[i] = (struct swathRegion *)
-		calloc(1, sizeof(struct swathRegion));
-	    if(SWXRegion[i] == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdupregion", __FILE__, __LINE__);
-		return(-1);
-	    }
+        return -1;
+    }
 
-	    /* Copy old region structure data to new region */
-	    /* -------------------------------------------- */
-	    *SWXRegion[i] = *SWXRegion[oldregionID];
+    /* Get Geolocation Vgroup id and 1D field name Vdata id */
+    /* ---------------------------------------------------- */
+    vgid = SWXSwath[sID].VIDTable[0];
+    vdataID = EHgetid(fid, vgid, fieldname, 1, i_access);
+    *fldtype = 0;
 
 
-	    /* Define new region ID */
-	    /* -------------------- */
-	    newregionID = i;
+    /*
+     * If name not found in Geolocation Vgroup then detach Geolocation Vgroup
+     * and search in Data Vgroup
+     */
+    if (vdataID == -1)
+    {
+	vgid = SWXSwath[sID].VIDTable[1];;
+	vdataID = EHgetid(fid, vgid, fieldname, 1, i_access);
+	*fldtype = 1;
 
-	    break;
+	/* If field also not found in Data Vgroup then set error status */
+	/* ------------------------------------------------------------ */
+	if (vdataID == -1)
+	{
+	    status = -1;
+	    vgid = -1;
+	    vdataID = -1;
 	}
     }
+    *vgidout = vgid;
+    *vdataIDout = vdataID;
 
-    return (newregionID);
+    return (status);
 }
-#endif
 
 
-#ifdef UNUSED_BY_GDAL
+
+
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWregioninfo                                                     |
+|  FUNCTION: SWSDfldsrch                                                      |
 |                                                                             |
-|  DESCRIPTION: Returns size of region in bytes                               |
+|  DESCRIPTION: Retrieves information SDS field                               |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
@@ -8263,16 +2961,18 @@ SWdupregion(int32 oldregionID)
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  regionID       int32               Region ID                               |
-|  fieldname      char                Fieldname                               |
+|  swathID        int32               swath structure ID                      |
+|  sdInterfaceID  int32               SD interface ID                         |
+|  fieldname      const char          field name                              |
 |                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|  ntype          int32               field number type                       |
-|  rank           int32               field rank                              |
-|  dims           int32               dimensions of field region              |
-|  size           int32               size in bytes of field region           |
+|  sdid           int32               SD element ID                           |
+|  rankSDS        int32               Rank of SDS                             |
+|  rankFld        int32               True rank of field (merging)            |
+|  offset         int32               Offset of field within merged field     |
+|  dims           int32               Dimensions of field                     |
+|  solo           int32               Solo field flag                         |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -8280,691 +2980,194 @@ SWdupregion(int32 oldregionID)
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
 |  Jun 96   Joel Gales    Original Programmer                                 |
-|  Aug 96   Joel Gales    Add vertical subsetting                             |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  Mar 97   Joel Gales    Add support for l_index mapping                       |
-|  Jul 99   DaW           Add support for floating scene subsetting           |
+|  Aug 96   Joel Gales    Make metadata ODL compliant                         |
 |                                                                             |
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
-intn
-SWregioninfo(int32 swathID, int32 regionID, const char *fieldname,
-	     int32 * ntype, int32 * rank, int32 dims[], int32 * size)
-
+static intn
+SWSDfldsrch(int32 swathID, int32 sdInterfaceID, const char *fieldname,
+            int32 * sdid, int32 * rankSDS, int32 * rankFld, int32 * offset,
+            int32 dims[], int32 * solo)
 {
     intn            i;		/* Loop index */
-    intn            j;		/* Loop index */
-    intn            k;		/* Loop index */
-    intn            l = 0;		/* Loop index */
-    intn            status;	/* routine return status variable */
-    intn            long_status = 3;	/* routine return status variable for longitude */
-    intn            land_status = 3;    /* Used for L7 float scene sub.      */
-    intn            statMap = -1;   /* Status from SWmapinfo  */
-
-    uint8           found = 0;	/* Found flag */
-    uint8           detect_cnt = 0;	/* Used for L7 float scene sub.      */
-
-    int32           numtype = 0; /* Used for L7 float scene sub. */
-    int32           count = 0;   /* Used for L7 float scene sub. */
-
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath Vgroup ID */
+    intn            status = -1;/* routine return status variable */
 
-    int32           l_index = 0;	/* Geo Dim Index */
-    int32           nDim;	/* Number of dimensions */
-    int32           slen[64];	/* String length array */
+    int32           sID;	/* SwathID - offset */
+    int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
     int32           dum;	/* Dummy variable */
-    int32           incr = 0;	/* Mapping increment */
-    int32           nXtrk = 0;	/* Number of cross tracks */
-    int32	    scan_shift = 0; /* Used to take out partial scans */
-    int32	    startscandim = -1;    /* Used for floating scene region size */
-    int32	    stopscandim = -1;    /* Used for floating scene region size */
-    int32           dumdims[8];	/* Dimensions from SWfieldinfo */
-    int32           idxMapElem = -1;	/* Number of l_index map elements  */
-    int32          *idxmap = NULL;	/* Pointer to l_index mapping array */
-    int32	    datafld = 0;
-
-   uint8	scene_cnt = 0;		/* Number of scenes in swath */
-   int32	startscanline = 0;
-   int32	stopscanline = 0;
-   char		*dfieldlist = (char *)NULL;
-   int32	strbufsize = 0;
-   int32	dfrank[8];
-   int32	numtype2[8];
-   int32	rank2 = 0;
-   int32	rk = 0;
-   int32	dims2[8];
-   int32	nt = 0;
-   uint16	*buffer2 = (uint16 *)NULL;
-   uint16	*tbuffer = (uint16 *)NULL;
-
-    char            dimlist[256];	/* Dimension list */
-    char            geodim[256];/* Geolocation field dimension list */
-    char            tgeodim[256];/* Time Geolocation field dimension list */
-    char            dgeodim[256];/* Data Subsetting field dimension list */
-    char            utlbuf[256];/* Utility buffer */
-    char           *ptr[64];	/* String pointer array */
-    static const char errMesg[] = "Vertical Dimension Not Found: \"%s\".\n";
-
-
-
-    /* Set region size to -1 */
-    /* --------------------- */
-    *size = -1;
-
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWregioninfo", &fid, &sdInterfaceID,
-		       &swVgrpID);
-
-
-    /* Check for valid region ID */
-    /* ------------------------- */
-    if (status == 0)
-    {
-	if (regionID < 0 || regionID >= NSWATHREGN)
-	{
-	    status = -1;
-	    HEpush(DFE_RANGE, "SWregioninfo", __FILE__, __LINE__);
-	    HEreport("Invalid Region id: %d.\n", regionID);
-	}
-    }
+    int32           dums[128];	/* Dummy array */
+    int32           attrIndex;	/* Attribute l_index */
 
+    char            name[2048];	/* Merged-Field Names */
+    char            swathname[80];	/* Swath Name */
+    char           *utlstr;	/* Utility string */
+    char           *metabuf;	/* Pointer to structural metadata (SM) */
+    char           *metaptrs[2];/* Pointers to begin and end of SM section */
+    char           *oldmetaptr;	/* Pointer within SM section */
 
 
-    /* Check for active region ID */
-    /* -------------------------- */
-    if (status == 0)
+    /* Allocate space for utility string */
+    /* --------------------------------- */
+    utlstr = (char *) calloc(UTLSTR_MAX_SIZE, sizeof(char));
+    if(utlstr == NULL)
     {
-	if (SWXRegion[regionID] == 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWregioninfo", __FILE__, __LINE__);
-	    HEreport("Inactive Region ID: %d.\n", regionID);
-	}
+	HEpush(DFE_NOSPACE,"SWSDfldsrch", __FILE__, __LINE__);
+	return(-1);
     }
-
-   /* This code checks for the attribute detector_count */
-   /* which is found in Landsat 7 files.  It is used    */
-   /* for some of the loops.                            */
-   /* ================================================= */
-   if (status == 0 && SWXRegion[regionID]->scanflag == 1)
-   {
-      land_status = SWattrinfo(swathID, "detector_count", &numtype, &count);
-      if (land_status == 0)
-      {
-         land_status = SWreadattr(swathID, "detector_count", &detect_cnt);
-         land_status = SWreadattr(swathID, "scene_count", &scene_cnt);
-
-      }
-   }
-
-
+    /* Set solo flag to 0 (no) */
+    /* ----------------------- */
+    *solo = 0;
 
 
-    /* Check for valid fieldname */
-    /* ------------------------- */
-    if (status == 0)
+    /* Compute "reduced" swath ID */
+    /* -------------------------- */
+    sID = swathID % idOffset;
+    if (sID >= NSWATH)
     {
-	/* Get data field info */
-	/* ------------------- */
-	status = SWfieldinfo(swathID, fieldname, rank,
-			     dims, ntype, dimlist);
-
-	if (status != 0)
-	{
-	    status = -1;
-	    HEpush(DFE_GENAPP, "SWregioninfo", __FILE__, __LINE__);
-	    HEreport("Field \"%s\" Not Found.\n", fieldname);
-	}
+        return -1;
     }
 
-
-
-    /* No problems so proceed ... */
-    /* -------------------------- */
-    if (status == 0)
+    /* Loop through all SDSs in swath */
+    /* ------------------------------ */
+    for (i = 0; i < SWXSwath[sID].nSDS; i++)
     {
-	/* If non-vertical subset regions defined ... */
-	/* ------------------------------------------ */
-	if (SWXRegion[regionID]->nRegions > 0 || SWXRegion[regionID]->scanflag == 1)
+	/* If active SDS ... */
+	/* ----------------- */
+	if (SWXSwath[sID].sdsID[i] != 0)
 	{
+	    /* Get SDS ID, name, rankSDS, and dimensions */
+	    /* ----------------------------------------- */
+	    *sdid = SWXSwath[sID].sdsID[i];
+	    SDgetinfo(*sdid, name, rankSDS, dims, &dum, &dum);
+	    *rankFld = *rankSDS;
 
-	    /* Get geolocation dimension name */
-	    /* ------------------------------ */
-	    status = SWfieldinfo(SWXRegion[regionID]->swathID,
-				 "Longitude", &dum,
-				 dumdims, &dum, geodim);
-            long_status = status;
+	    /* If merged field ... */
+	    /* ------------------- */
+	    if (strstr(name, "MRGFLD_") == &name[0])
+	    {
+		/* Get swath name */
+		/* -------------- */
+		Vgetname(SWXSwath[sID].IDTable, swathname);
 
-            /* If Time field being used, check for dimensions */
-            /* ---------------------------------------------- */
-            if (timeflag == 1)
-            {
-               /* code change to fix time subset bug for Landsat7 */
 
-               status = SWfieldinfo(SWXRegion[regionID]->swathID,
-                                    "Time", &dum,
-                                    dumdims, &dum, tgeodim);
+		/* Get pointers to "MergedFields" section within SM */
+		/* ------------------------------------------------ */
+		metabuf = (char *) EHmetagroup(sdInterfaceID, swathname, "s",
+					       "MergedFields", metaptrs);
+		if(metabuf == NULL)
+		{
+		    free(utlstr);
+		    return(-1);
+		}
 
-               if (strcmp(geodim, tgeodim) != 0)
-               {
-                  strcpy(geodim, tgeodim);
-               }
-            timeflag = 0;
-            }
+		/* Store metaptr in order to recover */
+		/* --------------------------------- */
+		oldmetaptr = metaptrs[0];
 
-            /* If defscanregion being used, get dimensions    */
-            /* of field being used                            */
-            /* ---------------------------------------------- */
-            if (SWXRegion[regionID]->scanflag == 1)
-            {
-               (void) SWnentries(SWXRegion[regionID]->swathID,4,&strbufsize);
-               dfieldlist = (char *)calloc(strbufsize + 1, sizeof(char));
-               (void) SWinqdatafields(SWXRegion[regionID]->swathID,dfieldlist,dfrank,numtype2);
-               status = SWfieldinfo(SWXRegion[regionID]->swathID,dfieldlist,&dum,dumdims,&dum,dgeodim);
-
-                  /* The dimensions have to be switched, because */
-                  /* the mappings force a geodim and datadim     */
-                  /* so to find the mapping, the dimensions must */
-                  /* be switched, but the subsetting will still  */
-                  /* be based on the correct dimensions          */
-                  /* "long_status == -1" added for CAL file which   */
-                  /* doesn't have a Traditional geolocation field   */
-                  /* ---------------------------------------------- */
-                  if (strcmp(dgeodim,dimlist) != 0 || long_status == -1)
-                  {
-                      strcpy(geodim,dimlist);
-                      strcpy(dimlist,dgeodim);
-                  }
-            }
 
+		/* Search for Merged field name */
+		/* ---------------------------- */
+		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%.480s%s", "MergedFieldName=\"",
+			name, "\"\n");
+		metaptrs[0] = strstr(metaptrs[0], utlstr);
 
-	    /* Get "Track" (first) Dimension from geo dimlist */
-	    /* ---------------------------------------------- */
-	    nDim = EHparsestr(geodim, ',', ptr, slen);
-	    geodim[slen[0]] = 0;
 
+		/* If not found check for old metadata */
+		/* ----------------------------------- */
+		if (metaptrs[0] == NULL)
+		{
+		    snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%.480s%s", "OBJECT=\"", name, "\"\n");
+		    metaptrs[0] = strstr(oldmetaptr, utlstr);
+		}
 
-	    /* Parse Data Field Dimlist & find mapping */
-	    /* --------------------------------------- */
-	    nDim = EHparsestr(dimlist, ',', ptr, slen);
 
+		/* Get field list and strip off leading and trailing quotes */
+		EHgetmetavalue(metaptrs, "FieldList", name);  /* not return status --xhua */
+		memmove(name, name + 1, strlen(name) - 2);
+		name[strlen(name) - 2] = 0;
 
-	    /* Loop through all dimensions and search for mapping */
-	    /* -------------------------------------------------- */
-	    for (i = 0; i < nDim; i++)
-	    {
-		memcpy(utlbuf, ptr[i], slen[i]);
-		utlbuf[slen[i]] = 0;
-		statMap = SWmapinfo(swathID, geodim, utlbuf,
-				    &dum, &incr);
+		/* Search for desired field within merged field list */
+		snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s%s", "\"", fieldname, "\"");
+		dum = EHstrwithin(utlstr, name, ',');
 
-		/* Mapping found */
-		/* ------------- */
-		if (statMap == 0)
-		{
-		    found = 1;
-		    l_index = i;
-		    break;
-		}
+		free(metabuf);
 	    }
-
-
-	    /* If mapping not found check for geodim within dimlist */
-	    /* ---------------------------------------------------- */
-	    if (found == 0)
+	    else
 	    {
-		l_index = EHstrwithin(geodim, dimlist, ',');
-
-		/* Geo dimension found within subset field dimlist */
-		/* ----------------------------------------------- */
-		if (l_index != -1)
+		/* If solo (unmerged) check if SDS name matches fieldname */
+		/* ------------------------------------------------------ */
+		dum = EHstrwithin(fieldname, name, ',');
+		if (dum != -1)
 		{
-		    found = 1;
-		    incr = 1;
+		    *solo = 1;
+		    *offset = 0;
 		}
 	    }
 
 
-
-	    /* If mapping not found check for l_indexed mapping */
-	    /* ---------------------------------------------- */
-	    if (found == 0)
+	    /* If field found ... */
+	    /* ------------------ */
+	    if (dum != -1)
 	    {
-		/* Get size of geo dim & allocate space of l_index mapping */
-		/* ----------------------------------------------------- */
-		dum = SWdiminfo(swathID, geodim);
-		if (dum < 0)
-            return -1;
-		idxmap = (int32 *) calloc(dum, sizeof(int32));
-		if(idxmap == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWregioninfo", __FILE__, __LINE__);
-		    return(-1);
-		}
+		status = 0;
 
-		/* Loop through all dimensions and search for mapping */
-		/* -------------------------------------------------- */
-		for (i = 0; i < nDim; i++)
+		/* If merged field ... */
+		/* ------------------- */
+		if (*solo == 0)
 		{
-		    memcpy(utlbuf, ptr[i], slen[i]);
-		    utlbuf[slen[i]] = 0;
-
-		    idxMapElem = SWidxmapinfo(swathID, geodim, utlbuf, idxmap);
-
+		    /* Get "Field Offsets" SDS attribute l_index */
+		    /* --------------------------------------- */
+		    attrIndex = SDfindattr(*sdid, "Field Offsets");
 
-		    /* Mapping found */
-		    /* ------------- */
-		    if (idxMapElem != -1)
+		    /*
+		     * If attribute exists then get offset of desired field
+		     * within merged field
+		     */
+		    if (attrIndex != -1)
 		    {
-			found = 1;
-			l_index = i;
-			break;
+			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
+			*offset = dums[dum];
 		    }
-		}
-	    }
-
-
-	    /* Regular Mapping Found */
-	    /* --------------------- */
-	    if (found == 1 && idxMapElem == -1)
-	    {
-		dims[l_index] = 0;
 
-		/* Loop through all regions */
-		/* ------------------------ */
-		for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-		{
-		    /* Get number of cross tracks in particular region */
-		    /* ----------------------------------------------- */
-		    nXtrk = SWXRegion[regionID]->StopRegion[k] -
-			SWXRegion[regionID]->StartRegion[k] + 1;
 
+		    /* Get "Field Dims" SDS attribute l_index */
+		    /* ------------------------------------ */
+		    attrIndex = SDfindattr(*sdid, "Field Dims");
 
-		    /* If increment is positive (geodim <= datadim) ... */
-		    /* ------------------------------------------------ */
-		    if (incr > 0)
-		    {
-                        if (SWXRegion[regionID]->scanflag == 1)
-                        {
-                            scan_shift = nXtrk % incr;
-                            if(scan_shift != 0)
-                               nXtrk = nXtrk - scan_shift;
-                            dims[l_index] += nXtrk/incr;
-                            if(long_status == -1 || incr == 1)
-                            {
-                               if( detect_cnt == 0 )
-                                   return -1;
-                               scan_shift = nXtrk % detect_cnt;
-                               if(scan_shift != 0)
-                                  dims[l_index] = nXtrk - scan_shift;
-                            }
-                        }
-			else
-                        {
-			   dims[l_index] += nXtrk * incr;
-                        }
-		    }
-		    else
+		    /*
+		     * If attribute exists then get 0th dimension of desired
+		     * field within merged field
+		     */
+		    if (attrIndex != -1)
 		    {
-			/* Negative increment (geodim > datadim) */
-			/* ------------------------------------- */
-			dims[l_index] += nXtrk / (-incr);
+			SDreadattr(*sdid, attrIndex, (VOIDP) dums);
+			dims[0] = dums[dum];
 
-			/*
-			 * If Xtrk not exactly divisible by incr, round dims
-			 * to next highest integer
-			 */
-			if (nXtrk % (-incr) != 0)
+			/* If this dimension = 1 then field is really 2 dim */
+			/* ------------------------------------------------ */
+			if (dums[dum] == 1)
 			{
-			    dims[l_index]++;
+			    *rankFld = 2;
 			}
 		    }
 		}
-	    }
-	    else if (found == 1 && idxMapElem != -1)
-	    {
 
-		/* Indexed Mapping */
-		/* --------------- */
 
-		dims[l_index] = 0;
-
-		/* Loop through all regions */
-		/* ------------------------ */
-		for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-		{
-                   j = 0;
-                   if(SWXRegion[regionID]->scanflag == 1)
-                   {
-                      startscanline = SWXRegion[regionID]->StartRegion[k];
-                      stopscanline = SWXRegion[regionID]->StopRegion[k];
-                      if (strcmp(fieldname,dfieldlist) == 0)
-                      {
-                         dims[l_index] = stopscanline - startscanline + 1;
-                         datafld = 1;
-                      }
-                      if (strcmp(fieldname, "Latitude") == 0 ||
-                          strcmp(fieldname, "Longitude") == 0)
-                      {
-                         if(SWXRegion[regionID]->band8flag == 2 || SWXRegion[regionID]->band8flag == 3)
-                         {
-                            status = SWfieldinfo(swathID,"scan_no",&rk,dims2,&nt,dimlist);
-                            tbuffer = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                            status =SWreadfield(swathID,"scan_no",NULL,NULL,NULL,tbuffer);
-                            startscanline = startscanline - ((tbuffer[0] * detect_cnt) - detect_cnt);
-                            stopscanline = stopscanline - ((tbuffer[0] * detect_cnt) - 1);
-                         }
-                         if(SWXRegion[regionID]->band8flag == 2 ||
-                            SWXRegion[regionID]->band8flag == 3)
-                         {
-                            if(startscandim == -1)
-                               if(startscanline < idxmap[0])
-                               {
-                                  startscandim = 0;
-                                  dims[l_index] = 0;
-                                  if(stopscanline > idxmap[scene_cnt *2 - 1])
-                                  {
-                                     stopscandim = scene_cnt*2 - startscandim;
-                                     dims[l_index] = scene_cnt*2 - startscandim;
-                                  }
-                               }
-                         }
-                         for (l = 0; l < scene_cnt; l++)
-                         {
-                            if(idxmap[j] <= startscanline && idxmap[j+1] >= startscanline)
-                               if(startscandim == -1)
-                               {
-                                  dims[l_index] = j;
-                                  startscandim = j;
-                               }
-                            if(idxmap[j] <= stopscanline && idxmap[j+1] >= stopscanline)
-                               if(startscandim != -1)
-                               {
-                                  dims[l_index] = j - startscandim + 2;
-                                  stopscandim = j + 1;
-                               }
-                            j = j + 2;
-                            if(idxmap[j] == 0  || idxmap[j+1] == 0)
-                               l = scene_cnt;
-                         }
-                         if(SWXRegion[regionID]->band8flag == 1 ||
-                            SWXRegion[regionID]->band8flag == 2)
-                         {
-                            if(stopscandim == -1)
-                               if(stopscanline > idxmap[scene_cnt * 2 - 1])
-                               {
-                                  stopscandim = scene_cnt*2 - dims[l_index];
-                                  dims[l_index] = scene_cnt*2 - dims[l_index];
-                               }
-                         }
-                         if(SWXRegion[regionID]->band8flag == 3)
-                         {
-                            if(startscandim == -1)
-                               if(startscanline < idxmap[0])
-                               {
-                                  startscandim = 0;
-                                  if(stopscandim != -1)
-                                     dims[l_index] = stopscandim - startscandim + 1;
-                               }
-                         }
-                         if(SWXRegion[regionID]->band8flag == 2)
-                         {
-                            if(startscandim == -1)
-                               if(startscanline > idxmap[j - 1])
-                               {
-                                  status = SWfieldinfo(SWXRegion[regionID]->swathID,"scan_no",&rank2,dims2,&nt,dimlist);
-                                  buffer2 = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                                  status = SWreadfield(SWXRegion[regionID]->swathID,"scan_no",NULL,NULL,NULL,buffer2);
-                                  startscanline = startscanline - (buffer2[0] * detect_cnt);
-                                  stopscanline = stopscanline - (buffer2[0] * detect_cnt);
-                                  free(buffer2);
-                                  j = 0;
-                                  for (l = 0; l < scene_cnt; l++)
-                                  {
-                                     if(idxmap[j] <= startscanline && idxmap[j+1] >= startscanline)
-                                     {
-                                        dims[l_index] = j;
-                                        startscandim = j;
-                                     }
-                                     if(idxmap[j] <= stopscanline && idxmap[j+1] >= stopscanline)
-                                        dims[l_index] = j - startscandim + 2;
-                                     j = j + 2;
-                                     if(idxmap[j] == 0  || idxmap[j+1] == 0)
-                                        l = scene_cnt;
-                                  }
-
-                               }
-                         }
-                      }
-                      if (strcmp(fieldname, "scene_center_latitude") == 0 ||
-                          strcmp(fieldname, "scene_center_longitude") == 0)
-                      {
-                         startscanline = SWXRegion[regionID]->StartRegion[k];
-                         stopscanline = SWXRegion[regionID]->StopRegion[k];
-                         if(startscanline < idxmap[0])
-                         {
-                            startscandim = 0;
-                            dims[l_index] = 0;
-                         }
-                         for (l = 0; l < scene_cnt-1; l++)
-                         {
-                            if(idxmap[l] <= startscanline && idxmap[l+1] >= startscanline)
-                               if(startscandim == -1)
-                               {
-                                  dims[l_index] = l;
-                                  startscandim = l;
-                               }
-                            if(idxmap[l] <= stopscanline && idxmap[l+1] >= stopscanline)
-                            {
-                               dims[l_index] = l - startscandim + 2;
-                               stopscandim = l + 1;
-                            }
-                         }
-                         if(stopscandim == -1)
-                         {
-                            if(stopscanline > idxmap[scene_cnt - 1])
-                            {
-                               dims[l_index] = scene_cnt - startscandim;
-                               stopscandim = scene_cnt - 1;
-                            }
-                         }
-                         if(SWXRegion[regionID]->band8flag == 1)
-                         {
-                            if(stopscandim == -1)
-                               if(stopscanline > idxmap[scene_cnt - 1])
-                               {
-                                  dims[l_index] = scene_cnt - startscandim;
-                                  stopscandim = scene_cnt - 1;
-                               }
-                         }
-                         if(SWXRegion[regionID]->band8flag == 2 ||
-                            SWXRegion[regionID]->band8flag == 3)
-                         {
-                            if(startscandim == -1)
-                            {
-                               if(startscanline < idxmap[0])
-                               {
-                                  startscandim = 0;
-                                  dims[l_index] = stopscandim - startscandim + 1;
-                               }
-                            }
-                            if(startscandim == -1)
-                            {
-                               startscanline = SWXRegion[regionID]->StartScan[k] * detect_cnt;
-                               stopscanline = SWXRegion[regionID]->StopScan[k] * detect_cnt;
-                               for (l = 0; l < scene_cnt-1; l++)
-                               {
-                                  if(idxmap[l] <= startscanline && idxmap[l+1] >= startscanline)
-                                     dims[l_index] = l;
-                                  if(idxmap[l] <= stopscanline && idxmap[l+1] >= stopscanline)
-                                     dims[l_index] = l - dims[l_index] + 1;
-                               }
-                            }
-                         }
-                      }
-                   }
-                   else
-                   {
-                      if (datafld != 1)
-                      {
-		         /* Get number of cross tracks in particular region */
-		         /* ----------------------------------------------- */
-		         nXtrk = idxmap[SWXRegion[regionID]->StopRegion[k]] -
-			         idxmap[SWXRegion[regionID]->StartRegion[k]] + 1;
-
-		         dims[l_index] += nXtrk;
-                      }
-                    }
-		}
-	    }
-	    else
-	    {
-		/* Mapping not found */
-		/* ----------------- */
-	        status = -1;
-		HEpush(DFE_GENAPP, "SWregioninfo",
-		       __FILE__, __LINE__);
-		HEreport(
-			 "Mapping Not Defined for \"%s\" Dimension.\n",
-			 geodim);
-	    }
+		/* Break out of SDS loop */
+		/* --------------------- */
+		break;
+	    }			/* End of found field section */
 	}
-
-
-
-	/* Vertical Subset */
-	/* --------------- */
-	if (status == 0 || status == -1)  /* check the vertical subset in any case -- xhua */
+	else
 	{
-	    for (j = 0; j < 8; j++)
-	    {
-		/* If active vertical subset ... */
-		/* ----------------------------- */
-		if (SWXRegion[regionID]->StartVertical[j] != -1)
-		{
-
-		    /* Find vertical dimension within dimlist */
-		    /* -------------------------------------- */
-		    l_index = EHstrwithin(SWXRegion[regionID]->DimNamePtr[j],
-					dimlist, ',');
-
-		    /* If dimension found ... */
-		    /* ---------------------- */
-		    if (l_index != -1)
-		    {
-			/* Compute dimension size */
-			/* ---------------------- */
-			dims[l_index] =
-			    SWXRegion[regionID]->StopVertical[j] -
-			    SWXRegion[regionID]->StartVertical[j] + 1;
-		    }
-		    else
-		    {
-			/* Vertical dimension not found */
-			/* ---------------------------- */
-			status = -1;
-			*size = -1;
-			HEpush(DFE_GENAPP, "SWregioninfo", __FILE__, __LINE__);
-			HEreport(errMesg, SWXRegion[regionID]->DimNamePtr[j]);
-		    }
-		}
-	    }
-
-
-
-	    /* Compute size of region data buffer */
-	    /* ---------------------------------- */
-	    if (status == 0)
-	    {
-                if(idxMapElem == 1 && SWXRegion[regionID]->scanflag == 1 && land_status == 0)
-                {
-                    if(startscandim == dims[0])
-                       dims[0] = scene_cnt*2 - startscandim;
-                }
-
-		/* Compute number of total elements */
-		/* -------------------------------- */
-		*size = dims[0];
-		for (j = 1; j < *rank; j++)
-		{
-		    *size *= dims[j];
-		}
-
-		/* Multiply by size in bytes of numbertype */
-		/* --------------------------------------- */
-		*size *= DFKNTsize(*ntype);
-	    }
+	    /* First non-active SDS signifies no more, break out of SDS loop */
+	    /* ------------------------------------------------------------- */
+	    break;
 	}
     }
 
+    free(utlstr);
 
-
-    /* Free l_index mappings if applicable */
-    /* --------------------------------- */
-    if (idxmap != NULL)
-    {
-	free(idxmap);
-    }
-    if(dfieldlist != NULL)
-       free(dfieldlist);
-
-    return (status);
-}
-#endif
-
-#ifdef UNUSED_BY_GDAL
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWperiodinfo                                                     |
-|                                                                             |
-|  DESCRIPTION: Returns size in bytes of region                               |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  periodID       int32               Period ID                               |
-|  fieldname      char                Fieldname                               |
-|                                                                             |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  ntype          int32               field number type                       |
-|  rank           int32               field rank                              |
-|  dims           int32               dimensions of field region              |
-|  size           int32               size in bytes of field region           |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jun 96   Joel Gales    Original Programmer                                 |
-|  Jun 03   Abe Taaheri   added clearing timeflag if SWregioninfo fails       |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWperiodinfo(int32 swathID, int32 periodID, const char *fieldname,
-	     int32 * ntype, int32 * rank, int32 dims[], int32 * size)
-{
-    intn            status;	/* routine return status variable */
-
-
-    timeflag = 1;
-    /* Call SWregioninfo */
-    /* ----------------- */
-    status = SWregioninfo(swathID, periodID, fieldname, ntype, rank,
-			  dims, size);
-    if (status != 0) timeflag = 0;/* clear timeflag if SWregioninfo failed */
     return (status);
 }
 
@@ -8975,879 +3178,483 @@ SWperiodinfo(int32 swathID, int32 periodID, const char *fieldname,
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWdefvrtregion                                                   |
+|  FUNCTION: SWwrrdfield                                                      |
 |                                                                             |
-|  DESCRIPTION: Finds elements of a monotonic field within a given range.     |
+|  DESCRIPTION: Writes/Reads fields                                           |
 |                                                                             |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
-|  regionID       int32               Region ID                               |
+|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
 |  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  regionID       int32               Region ID                               |
-|  vertObj        char                Vertical object to subset               |
-|  range          float64             Vertical subsetting range               |
+|  swathID        int32               swath structure ID                      |
+|  fieldname      const char          fieldname                               |
+|  code           const char          Write/Read code (w/r)                   |
+|  start          int32               start array                             |
+|  stride         int32               stride array                            |
+|  edge           int32               edge array                              |
+|  datbuf         void                data buffer for read                    |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|  datbuf         void                data buffer for write                   |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
 |                                                                             |
 |   Date     Programmer   Description                                         |
 |  ======   ============  =================================================   |
-|  Aug 96   Joel Gales    Original Programmer                                 |
-|  Dec 96   Joel Gales    Add multiple vertical subsetting capability         |
-|  May 97   Joel Gales    Check for supported field types                     |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-
-
-/* Macro to initialize swath region entry */
-/* -------------------------------------- */
-
-/*
- * 1) Find empty (inactive) region. 2) Allocate space for region entry. 3)
- * Store file ID and swath ID. 4) Set region ID. 5) Initialize vertical
- * subset entries to -1.
- */
-
-#define SETSWTHREG \
-\
-regionID = 0; \
-for (k = 0; k < NSWATHREGN; k++) \
-{ \
-    if (SWXRegion[k] == 0) \
-    { \
-        SWXRegion[k] = (struct swathRegion *) \
-	  calloc(1, sizeof(struct swathRegion)); \
-	SWXRegion[k]->fid = fid; \
-	SWXRegion[k]->swathID = swathID; \
-	regionID = k; \
-	for (j=0; j<8; j++) \
-        { \
-             SWXRegion[k]->StartVertical[j] = -1; \
-             SWXRegion[k]->StopVertical[j]  = -1; \
-             SWXRegion[k]->StartScan[j] = -1; \
-             SWXRegion[k]->StopScan[j]  = -1; \
-             SWXRegion[k]->band8flag  = -1; \
-        } \
-	break; \
-     } \
-}
-
-
-/* Macro to fill vertical subset entry */
-/* ----------------------------------- */
-
-/*
- * 1) Find empty (inactive) vertical region. 2) Set start of vertical region.
- * 3) Allocate space for name of vertical dimension. 4) Write vertical
- * dimension name.
- */
-
-#define FILLVERTREG \
-for (j=0; j<8; j++) \
-{ \
-    if (SWXRegion[regionID]->StartVertical[j] == -1) \
-    { \
-	SWXRegion[regionID]->StartVertical[j] = i; \
-	SWXRegion[regionID]->DimNamePtr[j] = \
-	    (char *) malloc(slen + 1); \
-	memcpy(SWXRegion[regionID]->DimNamePtr[j], \
-	       dimlist, slen + 1); \
-	break; \
-    } \
-} \
-
-
+|  Jun 96   Joel Gales    Original Programmer                                 |
+|  Feb 97   Joel Gales    Stride = 1 HDF compression workaround               |
+|                                                                             |
+|  END_PROLOG                                                                 |
+-----------------------------------------------------------------------------*/
+static intn
+SWwrrdfield(int32 swathID, const char *fieldname, const char *code,
+	    int32 start[], int32 stride[], int32 edge[], VOIDP datbuf)
 
-int32
-SWdefvrtregion(int32 swathID, int32 regionID, const char *vertObj, float64 range[])
 {
     intn            i;		/* Loop index */
-    intn            j = 0;		/* Loop index */
-    intn            k;		/* Loop index */
-    intn            status;	/* routine return status variable */
-
-    uint8           found = 0;	/* Found flag */
-
-    int16           vertINT16;	/* Temporary INT16 variable */
+    intn            status = 0;	/* routine return status variable */
 
     int32           fid;	/* HDF-EOS file ID */
     int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath Vgroup ID */
-    int32           slen;	/* String length */
-    int32           rank;	/* Field rank */
-    int32           nt;		/* Field numbertype */
-    int32           dims[8];	/* Field dimensions */
-    int32           size;	/* Size of numbertype in bytes */
-    int32           vertINT32;	/* Temporary INT32 variable */
+    int32           vgid;	/* Swath Geo or Data Vgroup ID */
+    int32           sdid;	/* SDS ID */
+    int32           dum;	/* Dummy variable */
+    int32           rankSDS;	/* Rank of SDS */
+    int32           rankFld;	/* Rank of field */
+
+    int32           vdataID;	/* 1d field vdata */
+    int32           recsize;	/* Vdata record size */
+    int32           fldsize;	/* Field size */
+    int32           nrec;	/* Number of records in Vdata */
 
-    float32         vertFLT32;	/* Temporary FLT32 variable */
+    int32           offset[8];	/* I/O offset (start) */
+    int32           incr[8];	/* I/O increment (stride) */
+    int32           count[8];	/* I/O count (edge) */
+    int32           dims[8];	/* Field/SDS dimensions */
+    int32           mrgOffset;	/* Merged field offset */
+    int32           nflds;	/* Number of fields in Vdata */
+    int32           strideOne;	/* Strides = 1 flag */
 
-    float64         vertFLT64;	/* Temporary FLT64 variable */
+    uint8          *buf;	/* I/O (transfer) buffer */
+    uint8          *fillbuf;	/* Fill value buffer */
 
-    char           *vertArr;	/* Pointer to vertical field data buffer */
-    char            dimlist[256];	/* Dimension list */
+    char            attrName[80];	/* Name of fill value attribute */
+    char           *ptr[64];	/* String pointer array */
+    char            fieldlist[256];	/* Vdata field list */
 
 
     /* Check for valid swath ID */
     /* ------------------------ */
-    status = SWchkswid(swathID, "SWdefvrtregion", &fid, &sdInterfaceID,
-		       &swVgrpID);
+    status = SWchkswid(swathID, "SWwrrdfield", &fid, &sdInterfaceID, &dum);
+
 
     if (status == 0)
     {
-	/* Copy first 4 characters of vertObj into dimlist */
-	/* ----------------------------------------------- */
-	memcpy(dimlist, vertObj, 4);
-	dimlist[4] = 0;
-
-
 
-	/* If first 4 characters of vertObj = "DIM:" ... */
-	/* --------------------------------------------- */
+	/* Check whether fieldname is in SDS (multi-dim field) */
+	/* --------------------------------------------------- */
+	status = SWSDfldsrch(swathID, sdInterfaceID, fieldname, &sdid,
+			     &rankSDS, &rankFld, &mrgOffset, dims, &dum);
 
-	/* Vertical Object is dimension name */
-	/* --------------------------------- */
-	if (strcmp(dimlist, "DIM:") == 0)
+	/* Multi-Dimensional Field Section */
+	/* ------------------------------- */
+	if (status != -1)
 	{
-	    /* Get string length of vertObj (minus "DIM:) */
-	    /* ------------------------------------------ */
-	    slen = (int)strlen(vertObj) - 4;
-
+	    /* Set I/O offset Section */
+	    /* ---------------------- */
 
-	    /* If regionID = -1 then setup swath region entry */
-	    /* ---------------------------------------------- */
-	    if (regionID == -1)
+	    /*
+	     * If start == NULL (default) set I/O offset of 0th field to
+	     * offset within merged field (if any) and the rest to 0
+	     */
+	    if (start == NULL)
 	    {
-		SETSWTHREG;
+		for (i = 0; i < rankSDS; i++)
+		{
+		    offset[i] = 0;
+		}
+		offset[0] = mrgOffset;
 	    }
-
-
-	    /* Find first empty (inactive) vertical subset entry */
-	    /* ------------------------------------------------- */
-	    for (j = 0; j < 8; j++)
+	    else
 	    {
-		if (SWXRegion[regionID]->StartVertical[j] == -1)
+		/*
+		 * ... otherwise set I/O offset to user values, adjusting the
+		 * 0th field with the merged field offset (if any)
+		 */
+		if (rankFld == rankSDS)
 		{
-		    /* Store start & stop of vertical region */
-		    /* ------------------------------------- */
-		    SWXRegion[regionID]->StartVertical[j] = (int32) range[0];
-		    SWXRegion[regionID]->StopVertical[j] = (int32) range[1];
-
-		    /* Store vertical dimension name */
-		    /* ----------------------------- */
-		    SWXRegion[regionID]->DimNamePtr[j] =
-			(char *) malloc(slen + 1);
-		    if(SWXRegion[regionID]->DimNamePtr[j] == NULL)
+		    for (i = 0; i < rankSDS; i++)
 		    {
-			HEpush(DFE_NOSPACE,"SWdefvrtregion", __FILE__, __LINE__);
-			return(-1);
+			offset[i] = start[i];
 		    }
-		    memcpy(SWXRegion[regionID]->DimNamePtr[j],
-			   vertObj + 4, slen + 1);
-		    break;
+		    offset[0] += mrgOffset;
+		}
+		else
+		{
+		    /*
+		     * If field really 2-dim merged in 3-dim field then set
+		     * 0th field offset to merge offset and then next two to
+		     * the user values
+		     */
+		    for (i = 0; i < rankFld; i++)
+		    {
+			offset[i + 1] = start[i];
+		    }
+		    offset[0] = mrgOffset;
 		}
 	    }
-	}
-	else
-	{
 
-	    /* Vertical Object is fieldname */
-	    /* ---------------------------- */
 
 
-	    /* Check for valid fieldname */
-	    /* ------------------------- */
-	    status = SWfieldinfo(swathID, vertObj, &rank, dims, &nt,
-				 dimlist);
+	    /* Set I/O stride Section */
+	    /* ---------------------- */
 
-	    if (status != 0)
+	    /*
+	     * If stride == NULL (default) set I/O stride to 1
+	     */
+	    if (stride == NULL)
 	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "SWdefvrtregion", __FILE__, __LINE__);
-		HEreport("Vertical Field: \"%s\" not found.\n", vertObj);
+		for (i = 0; i < rankSDS; i++)
+		{
+		    incr[i] = 1;
+		}
+	    }
+	    else
+	    {
+		/*
+		 * ... otherwise set I/O stride to user values
+		 */
+		if (rankFld == rankSDS)
+		{
+		    for (i = 0; i < rankSDS; i++)
+		    {
+			incr[i] = stride[i];
+		    }
+		}
+		else
+		{
+		    /*
+		     * If field really 2-dim merged in 3-dim field then set
+		     * 0th field stride to 1 and then next two to the user
+		     * values.
+		     */
+		    for (i = 0; i < rankFld; i++)
+		    {
+			incr[i + 1] = stride[i];
+		    }
+		    incr[0] = 1;
+		}
 	    }
 
 
 
-	    /* Check for supported field types */
-	    /* ------------------------------- */
-	    if (nt != DFNT_INT16 &&
-		nt != DFNT_INT32 &&
-		nt != DFNT_FLOAT32 &&
-		nt != DFNT_FLOAT64)
+	    /* Set I/O count Section */
+	    /* --------------------- */
+
+	    /*
+	     * If edge == NULL (default) set I/O count to number of remaining
+	     * entries (dims - start) / increment.  Note that 0th field
+	     * offset corrected for merged field offset (if any).
+	     */
+	    if (edge == NULL)
 	    {
-		status = -1;
-		HEpush(DFE_GENAPP, "SWdefvrtregion", __FILE__, __LINE__);
-		HEreport("Fieldtype: %d not supported for vertical subsetting.\n", nt);
+		for (i = 1; i < rankSDS; i++)
+		{
+		    count[i] = (dims[i] - offset[i]) / incr[i];
+		}
+		count[0] = (dims[0] - (offset[0] - mrgOffset)) / incr[0];
+	    }
+	    else
+	    {
+		/*
+		 * ... otherwise set I/O count to user values
+		 */
+		if (rankFld == rankSDS)
+		{
+		    for (i = 0; i < rankSDS; i++)
+		    {
+			count[i] = edge[i];
+		    }
+		}
+		else
+		{
+		    /*
+		     * If field really 2-dim merged in 3-dim field then set
+		     * 0th field count to 1 and then next two to the user
+		     * values.
+		     */
+		    for (i = 0; i < rankFld; i++)
+		    {
+			count[i + 1] = edge[i];
+		    }
+		    count[0] = 1;
+		}
 	    }
 
+	    /* Perform I/O with relevant HDF I/O routine */
+	    /* ----------------------------------------- */
+	    if (strcmp(code, "w") == 0)
+	    {
+		/* Set strideOne to true (1) */
+		/* ------------------------- */
+		strideOne = 1;
+
+
+		/* If incr[i] != 1 set strideOne to false (0) */
+		/* ------------------------------------------ */
+		for (i = 0; i < rankSDS; i++)
+		{
+		    if (incr[i] != 1)
+		    {
+			strideOne = 0;
+			break;
+		    }
+		}
 
 
-	    /* Check that vertical dimension is 1D */
-	    /* ----------------------------------- */
-	    if (status == 0)
-	    {
-		if (rank != 1)
+		/*
+		 * If strideOne is true use NULL parameter for stride. This
+		 * is a work-around to HDF compression problem
+		 */
+		if (strideOne == 1)
+		{
+		    status = SDwritedata(sdid, offset, NULL, count,
+					 (VOIDP) datbuf);
+		}
+		else
 		{
-		    status = -1;
-		    HEpush(DFE_GENAPP, "SWdefvrtregion", __FILE__, __LINE__);
-		    HEreport("Vertical Field: \"%s\" must be 1-dim.\n",
-			     vertObj);
+		    status = SDwritedata(sdid, offset, incr, count,
+					 (VOIDP) datbuf);
 		}
 	    }
+	    else
+	    {
+		status = SDreaddata(sdid, offset, incr, count,
+				    (VOIDP) datbuf);
+	    }
+	}			/* End of Multi-Dimensional Field Section */
+	else
+	{
 
+	    /* One-Dimensional Field Section */
+	    /* ----------------------------- */
 
-	    /* If no problems then continue */
-	    /* ---------------------------- */
-	    if (status == 0)
+	    /* Check fieldname within 1d field Vgroups */
+	    /* --------------------------------------- */
+	    status = SW1dfldsrch(fid, swathID, fieldname, code,
+				 &vgid, &vdataID, &dum);
+
+	    if (status != -1)
 	    {
-		/* Get string length of vertical dimension */
-		/* --------------------------------------- */
-		slen = (int)strlen(dimlist);
+
+		/* Get number of records */
+		/* --------------------- */
+		nrec = VSelts(vdataID);
 
 
-		/* Get size in bytes of vertical field numbertype */
-		/* ---------------------------------------------- */
-		size = DFKNTsize(nt);
+		/* Set offset, increment, & count */
+		/* ------------------------------ */
+		offset[0] = (start == NULL) ? 0 : start[0];
+		incr[0] = (stride == NULL) ? 1 : stride[0];
+		count[0] = (edge == NULL)
+		    ? (nrec - offset[0]) / incr[0]
+		    : edge[0];
 
 
-		/* Allocate space for vertical field */
-		/* --------------------------------- */
-		vertArr = (char *) calloc(dims[0], size);
-		if(vertArr == NULL)
+
+		/* Write Section */
+		/* ------------- */
+		if (strcmp(code, "w") == 0)
 		{
-		    HEpush(DFE_NOSPACE,"SWdefvrtregion", __FILE__, __LINE__);
-		    return(-1);
-		}
+		    /* Get size of field and setup fill buffer */
+		    /* --------------------------------------- */
+		    fldsize = VSsizeof(vdataID, (char *)fieldname);
+		    fillbuf = (uint8 *) calloc(fldsize, 1);
+		    if(fillbuf == NULL)
+		    {
+			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
+			return(-1);
+		    }
 
-		/* Read vertical field */
-		/* ------------------- */
-		status = SWreadfield(swathID, vertObj,
-				     NULL, NULL, NULL, vertArr);
+		    /* Get size of record in Vdata and setup I/O buffer */
+		    /* ------------------------------------------------ */
+		    VSQueryvsize(vdataID, &recsize);
+		    buf = (uint8 *) calloc(recsize, count[0] * incr[0]);
+		    if(buf == NULL)
+		    {
+			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
+			free(fillbuf);
+			return(-1);
+		    }
 
 
+		    /* Get names and number of fields in each record  */
+		    /* ---------------------------------------------- */
+		    VSgetfields(vdataID, fieldlist);
+		    dum = EHstrwithin(fieldname, fieldlist, ',');
+		    nflds = EHparsestr(fieldlist, ',', ptr, NULL);
 
-		switch (nt)
-		{
-		case DFNT_INT16:
 
-		    for (i = 0; i < dims[0]; i++)
+		    /* Get Merged Field Offset (if any) */
+		    /* -------------------------------- */
+		    if (nflds > 1)
 		    {
-			/* Get single element of vertical field */
-			/* ------------------------------------ */
-			memcpy(&vertINT16, vertArr + i * size, size);
-
-
-			/* If within range ... */
-			/* ------------------- */
-			if (vertINT16 >= range[0] &&
-			    vertINT16 <= range[1])
+			if (dum > 0)
 			{
-			    /* Set found flag */
-			    /* -------------- */
-			    found = 1;
-
-
-			    /* If regionID=-1 then setup swath region entry */
-			    /* -------------------------------------------- */
-			    if (regionID == -1)
-			    {
-				SETSWTHREG;
-			    }
-
-
-			    /* Fill-in vertical region entries */
-			    /* ------------------------------- */
-			    FILLVERTREG;
-
-			    break;
+			    *(ptr[dum] - 1) = 0;
+			    mrgOffset = VSsizeof(vdataID, fieldlist);
+			    *(ptr[dum] - 1) = ',';
 			}
-		    }
-
-
-		    /* If found read from "bottom" of data field */
-		    /* ----------------------------------------- */
-		    if (found == 1)
-		    {
-			for (i = dims[0] - 1; i >= 0; i--)
+			else
 			{
-			    /* Get single element of vertical field */
-			    /* ------------------------------------ */
-			    memcpy(&vertINT16, vertArr + i * size, size);
-
-
-			    /* If within range ... */
-			    /* ------------------- */
-			    if (vertINT16 >= range[0] &&
-				vertINT16 <= range[1])
-			    {
-				/* Set end of vertical region */
-				/* -------------------------- */
-				SWXRegion[regionID]->StopVertical[j] = i;
-				break;
-			    }
+			    mrgOffset = 0;
 			}
+
+			/* Read records to recover previously written data */
+			/* status = */ VSsetfields(vdataID, fieldlist);
+			/* status = */ VSseek(vdataID, offset[0]);
+			nrec = VSread(vdataID, buf, count[0] * incr[0],
+				      FULL_INTERLACE);
 		    }
 		    else
 		    {
-			/* No vertical entries within region */
-			/* --------------------------------- */
-			status = -1;
-			HEpush(DFE_GENAPP, "SWdefvrtregion",
-			       __FILE__, __LINE__);
-			HEreport("No vertical field entries within region.\n");
+			mrgOffset = 0;
 		    }
-		    break;
-
 
-		case DFNT_INT32:
 
-		    for (i = 0; i < dims[0]; i++)
-		    {
-			/* Get single element of vertical field */
-			/* ------------------------------------ */
-			memcpy(&vertINT32, vertArr + i * size, size);
 
+		    /* Fill buffer with "Fill" value (if any) */
+		    /* -------------------------------------- */
+                    snprintf( attrName, sizeof(attrName), "_FV_%s", fieldname);
 
-			/* If within range ... */
-			/* ------------------- */
-			if (vertINT32 >= range[0] &&
-			    vertINT32 <= range[1])
+		    status = SWreadattr(swathID, attrName, (char *) fillbuf);
+		    if (status == 0)
+		    {
+			for (i = 0; i < count[0] * incr[0]; i++)
 			{
-			    /* Set found flag */
-			    /* -------------- */
-			    found = 1;
-
-
-			    /* If regionID=-1 then setup swath region entry */
-			    /* -------------------------------------------- */
-			    if (regionID == -1)
-			    {
-				SETSWTHREG;
-			    }
-
-
-			    /* Fill-in vertical region entries */
-			    /* ------------------------------- */
-			    FILLVERTREG;
-
-			    break;
+			    memcpy(buf + i * recsize + mrgOffset,
+				   fillbuf, fldsize);
 			}
 		    }
 
 
-		    /* If found read from "bottom" of data field */
-		    /* ----------------------------------------- */
-		    if (found == 1)
+		    /* Write new data into buffer */
+		    /* -------------------------- */
+		    if (incr[0] == 1 && nflds == 1)
 		    {
-			for (i = dims[0] - 1; i >= 0; i--)
-			{
-			    /* Get single element of vertical field */
-			    /* ------------------------------------ */
-			    memcpy(&vertINT32, vertArr + i * size, size);
-
-
-			    /* If within range ... */
-			    /* ------------------- */
-			    if (vertINT32 >= range[0] &&
-				vertINT32 <= range[1])
-			    {
-				/* Set end of vertical region */
-				/* -------------------------- */
-				SWXRegion[regionID]->StopVertical[j] = i;
-				break;
-			    }
-			}
+			memcpy(buf, datbuf, count[0] * recsize);
 		    }
 		    else
 		    {
-			/* No vertical entries within region */
-			/* --------------------------------- */
-			status = -1;
-			HEpush(DFE_GENAPP, "SWdefvrtregion",
-			       __FILE__, __LINE__);
-			HEreport("No vertical field entries within region.\n");
-		    }
-		    break;
-
-
-		case DFNT_FLOAT32:
-
-		    for (i = 0; i < dims[0]; i++)
-		    {
-			/* Get single element of vertical field */
-			/* ------------------------------------ */
-			memcpy(&vertFLT32, vertArr + i * size, size);
-
-
-			/* If within range ... */
-			/* ------------------- */
-			if (vertFLT32 >= range[0] &&
-			    vertFLT32 <= range[1])
+			for (i = 0; i < count[0]; i++)
 			{
-			    /* Set found flag */
-			    /* -------------- */
-			    found = 1;
-
-
-			    /* If regionID=-1 then setup swath region entry */
-			    /* -------------------------------------------- */
-			    if (regionID == -1)
-			    {
-				SETSWTHREG;
-			    }
-
-
-			    /* Fill-in vertical region entries */
-			    /* ------------------------------- */
-			    FILLVERTREG;
-
-			    break;
+			    memcpy(buf + i * recsize * incr[0] + mrgOffset,
+				   (uint8 *) datbuf + i * fldsize, fldsize);
 			}
 		    }
 
 
-		    /* If found read from "bottom" of data field */
-		    /* ----------------------------------------- */
-		    if (found == 1)
+		    /* If append read last record */
+		    /* -------------------------- */
+		    if (offset[0] == nrec)
 		    {
-			for (i = dims[0] - 1; i >= 0; i--)
-			{
-			    /* Get single element of vertical field */
-			    /* ------------------------------------ */
-			    memcpy(&vertFLT32, vertArr + i * size, size);
-
-
-			    /* If within range ... */
-			    /* ------------------- */
-			    if (vertFLT32 >= range[0] &&
-				vertFLT32 <= range[1])
-			    {
-				/* Set end of vertical region */
-				/* -------------------------- */
-				SWXRegion[regionID]->StopVertical[j] = i;
-				break;
-			    }
-			}
+			/* abe added "status =" to next line 8/8/97 */
+			status = VSseek(vdataID, offset[0] - 1);
+			VSread(vdataID, fillbuf, 1, FULL_INTERLACE);
 		    }
 		    else
 		    {
-			/* No vertical entries within region */
-			/* --------------------------------- */
-			status = -1;
-			HEpush(DFE_GENAPP, "SWdefvrtregion",
-			       __FILE__, __LINE__);
-			HEreport("No vertical field entries within region.\n");
+			status = VSseek(vdataID, offset[0]);
 		    }
-		    break;
-
 
-		case DFNT_FLOAT64:
-
-		    for (i = 0; i < dims[0]; i++)
-		    {
-			/* Get single element of vertical field */
-			/* ------------------------------------ */
-			memcpy(&vertFLT64, vertArr + i * size, size);
-
-
-			/* If within range ... */
-			/* ------------------- */
-			if (vertFLT64 >= range[0] &&
-			    vertFLT64 <= range[1])
-			{
-			    /* Set found flag */
-			    /* -------------- */
-			    found = 1;
-
-
-			    /* If regionID=-1 then setup swath region entry */
-			    /* -------------------------------------------- */
-			    if (regionID == -1)
-			    {
-				SETSWTHREG;
-			    }
 
+		    /* Write data into Vdata */
+		    /* --------------------- */
+		    nrec = VSwrite(vdataID, buf, count[0] * incr[0],
+				   FULL_INTERLACE);
 
-			    /* Fill-in vertical region entries */
-			    /* ------------------------------- */
-			    FILLVERTREG;
+		    free(fillbuf);
+                    if (status > 0)
+                       status = 0;
 
-			    break;
-			}
+		}		/* End Write Section */
+		else
+		{
+		    /* Read Section */
+		    /* ------------ */
+		    status = VSsetfields(vdataID, fieldname);
+		    fldsize = VSsizeof(vdataID, (char *)fieldname);
+		    buf = (uint8 *) calloc(fldsize, count[0] * incr[0]);
+		    if(buf == NULL)
+		    {
+			HEpush(DFE_NOSPACE,"SWwrrdfield", __FILE__, __LINE__);
+			return(-1);
 		    }
 
+		    (void) VSseek(vdataID, offset[0]);
+		    (void) VSread(vdataID, buf, count[0] * incr[0],
+			   FULL_INTERLACE);
+
 
-		    /* If found read from "bottom" of data field */
-		    /* ----------------------------------------- */
-		    if (found == 1)
+		    /* Copy from input buffer to returned data buffer */
+		    /* ---------------------------------------------- */
+		    if (incr[0] == 1)
 		    {
-			for (i = dims[0] - 1; i >= 0; i--)
-			{
-			    /* Get single element of vertical field */
-			    /* ------------------------------------ */
-			    memcpy(&vertFLT64, vertArr + i * size, size);
-
-			    /* If within range ... */
-			    /* ------------------- */
-			    if (vertFLT64 >= range[0] &&
-				vertFLT64 <= range[1])
-			    {
-				/* Set end of vertical region */
-				/* -------------------------- */
-				SWXRegion[regionID]->StopVertical[j] = i;
-				break;
-			    }
-			}
+			memcpy(datbuf, buf, count[0] * fldsize);
 		    }
 		    else
 		    {
-			/* No vertical entries within region */
-			/* --------------------------------- */
-			status = -1;
-			HEpush(DFE_GENAPP, "SWdefvrtregion",
-			       __FILE__, __LINE__);
-			HEreport("No vertical field entries within region.\n");
+			for (i = 0; i < count[0]; i++)
+			{
+			    memcpy((uint8 *) datbuf + i * fldsize,
+				   buf + i * fldsize * incr[0], fldsize);
+			}
 		    }
-		    break;
-
-		}		/* End of switch */
-		free(vertArr);
-	    }
-	}
-    }
-
-
-    /* Set regionID to -1 if bad return status */
-    /* --------------------------------------- */
-    if (status == -1)
-    {
-	regionID = -1;
-    }
-
-
-    return (regionID);
-}
-#endif
-
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWdefscanregion                                                  |
-|                                                                             |
-|  DESCRIPTION: Initialize the region structure for Landsat 7 float scene     |
-|               subset							      |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  regionID       int32               Region ID                               |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  fieldname      char                Field name to subset                    |
-|  range          float64             subsetting range                        |
-|  mode		  int32		      HDFE_ENDPOINT, HDFE_MIDPOINT or         |
-|				      HDFE_ANYPOINT                           |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  regionID	  int32		      Region ID                               |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Jul 99   DaW 	  Original Programmer                                 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWdefscanregion(int32 swathID, const char *fieldname, float64 range[], CPL_UNUSED int32 mode)
-{
-    intn            j;		/* Loop index */
-    intn            k;		/* Loop index */
-    intn            status;	/* routine return status variable */
-    intn            land_status = 3;	/* routine return status variable */
-    intn	    band81flag = 0;
-    intn	    band82flag = 0;
-    intn	    band83flag = 0;
-    uint8           detect_cnt = 0;     /* Used to convert scan to scanline  */
-                                        /*  L7 float scene sub.              */
-    uint8           scene_cnt = 0;
-
-
-    int32           nmtype = 0; /* Used for L7 float scene sub. */
-    int32           count = 0;   /* Used for L7 float scene sub. */
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath Vgroup ID */
-    int32           slen;	/* String length */
-    int32	    dfrank[8];  /* data fields rank */
-    int32           rank;	/* Field rank */
-    int32	    numtype[8]; /* number type of data fields */
-    int32           nt;		/* Field numbertype */
-    int32           dims[8];	/* Field dimensions */
-    int32           dims2[8];	/* Field dimensions */
-    int32	    strbufsize = 0; /* string buffer size */
-    int32	    tmprange0 = 0;
-
-
-    uint16	    *buffer = (uint16 *)NULL;
-    int32	    *idxmap = (int32 *)NULL;
-
-    int32	    dimsize = 0;
-
-    int32           regionID = -1;	/* Region ID (return) */
-
-    float64	    scan[2] = {0,0};
-    float64	    original_scan[2] = {0,0};
-
-    char            dimlist[256];	/* Dimension list */
-    char	    swathname[80];
-    char	    *dfieldlist = (char *)NULL;  /* data field list  */
-    char	    *tfieldname = (char *)NULL;  /* temp field buffer  */
-    char	    *band81 = (char *)NULL;
-    char	    *band82 = (char *)NULL;
-    char	    *band83 = (char *)NULL;
-
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWdefscanregion", &fid, &sdInterfaceID,
-		       &swVgrpID);
-
-   /* This code checks for the attribute detector_count */
-   /* which is found in Landsat 7 files.  It is used    */
-   /* for some of the loops. The other code checks if   */
-   /* one scan is requested.                            */
-   /* ================================================= */
-      land_status = SWattrinfo(swathID, "detector_count", &nmtype, &count);
-      if (land_status == 0)
-      {
-         scan[0] = range[0];
-         scan[1] = range[1];
-         original_scan[0] = range[0];
-         original_scan[1] = range[1];
-
-         land_status = SWreadattr(swathID, "scene_count", &scene_cnt);
-         land_status = SWreadattr(swathID, "detector_count", &detect_cnt);
-         if (range[0] == range[1])
-         {
-            range[0] = range[0] * detect_cnt - detect_cnt;
-            range[1] = range[0] + detect_cnt - 1;
-         }
-         else
-         {
-            range[0] = range[0] * detect_cnt - detect_cnt;
-            range[1] = range[1] * detect_cnt - 1;
-         }
-
-         Vgetname(SWXSwath[0].IDTable, swathname);
-         band81 = strstr(swathname, "B81");
-         if (band81 != (char *)NULL)
-            band81flag = 1;
-         band82 = strstr(swathname, "B82");
-         if (band82 != (char *)NULL)
-            band82flag = 1;
-         band83 = strstr(swathname, "B83");
-         if (band83 != (char *)NULL)
-            band83flag = 1;
-      }
-
-
-    /* If fieldname is null then subsetting Landsat 7 */
-    /* floating scene. Get data field name, assume    */
-    /* only one data field in swath                   */
-    /* ---------------------------------------------- */
-
-    if (fieldname == (char *)NULL)
-    {
-       (void) SWnentries(swathID, 4, &strbufsize);
-       dfieldlist = (char *)calloc(strbufsize + 1, sizeof(char));
-       (void) SWinqdatafields(swathID, dfieldlist, dfrank, numtype);
-       tfieldname = (char *)calloc(strbufsize + 1, sizeof(char));
-       strcpy(tfieldname, dfieldlist);
-    }
-    else
-    {
-       slen = (int)strlen(fieldname);
-       tfieldname = (char *)calloc(slen + 1, sizeof(char));
-       strcpy(tfieldname, fieldname);
-    }
-
-    /* Check for valid fieldname */
-    /* ------------------------- */
-    status = SWfieldinfo(swathID, tfieldname, &rank, dims, &nt,
-	 dimlist);
-
-    if (status != 0)
-    {
-	status = -1;
-	HEpush(DFE_GENAPP, "SWdefscanregion", __FILE__, __LINE__);
-	HEreport("Field: \"%s\" not found.\n", tfieldname);
-    }
 
+		}		/* End Read Section */
 
-       /* Check if input range values are within range of */
-       /* data field                                      */
-       /* ----------------------------------------------- */
-       if(status == 0)
-       {
-          status = SWfieldinfo(swathID, "scan_no", &rank, dims2, &nt, dimlist);
-          buffer = (uint16 *)calloc(dims2[0], sizeof(uint16));
-          status = SWreadfield(swathID,"scan_no", NULL, NULL, NULL, buffer);
-          if(scan[0] > buffer[dims2[0]-1])
-          {
-             HEpush(DFE_GENAPP, "SWdefscanregion", __FILE__, __LINE__);
-             HEreport("Range values not within bounds of data field\n");
-             free(buffer);
-             buffer = (uint16 *)NULL;
-             if (dfieldlist != NULL)
-                free(dfieldlist);
-             free(tfieldname);
-             return(-1);
-          }
-          if(scan[0] < buffer[0])
-          {
-             if(scan[1] < buffer[0])
-             {
-                HEpush(DFE_GENAPP, "SWdefscanregion", __FILE__, __LINE__);
-                HEreport("Range values not within bounds of data field\n");
-                free(buffer);
-                buffer = (uint16 *)NULL;
-                if (dfieldlist != NULL)
-                   free(dfieldlist);
-                free(tfieldname);
-                return(-1);
-             }
-             else
-             {
-                scan[0] = buffer[0];
-                range[0] = scan[0] * detect_cnt - detect_cnt;
-             }
-          }
-          if(scan[1] > buffer[dims2[0] - 1])
-          {
-             scan[1] = buffer[dims2[0] - 1];
-             range[1] = scan[1] * detect_cnt - 1;
-          }
-       }
-
-       if(status == 0)
-       {
-          dimsize = SWdiminfo(swathID, "GeoTrack");
-          if(dimsize > 0)
-          {
-             idxmap = (int32 *)calloc(dimsize, sizeof(int32));
-             (void) SWidxmapinfo(swathID, "GeoTrack", "ScanLineTrack", idxmap);
-             tmprange0 = (int32)range[0];
-             if(band82flag != 1 && band83flag != 1)
-             {
-                if (range[1] > idxmap[scene_cnt*2 - 1])
-                {
-                   range[1] = idxmap[scene_cnt*2 - 1];
-                   HEreport("Data length compared to geolocation length\n");
-                }
-             }
-             if(band82flag == 1 || band83flag == 1)
-             {
-                tmprange0 = (int32)(range[0] - (buffer[0] * detect_cnt - detect_cnt));
-             }
-             if(tmprange0 >= idxmap[scene_cnt * 2 - 1])
-             {
-                HEpush(DFE_GENAPP, "SWdefscanregion", __FILE__, __LINE__);
-                HEreport(
-            "Range values not within bounds of Latitude/Longitude field(s)\n");
-                if (dfieldlist != NULL)
-                   free(dfieldlist);
-                free(tfieldname);
-                free(buffer);
-                free(idxmap);
-                return(-1);
-             }
-          }
-       }
-
-    if (status == 0)
-    {
-          slen = (int)strlen(tfieldname);
-
-          SETSWTHREG;
-
-	  /* Find first empty (inactive) vertical subset entry */
-	  /* ------------------------------------------------- */
-	  for (j = 0; j < 8; j++)
-	  {
-	     if (SWXRegion[regionID]->StartVertical[j] == -1)
-	     {
-		    /* Store start & stop of region          */
-		    /* ------------------------------------- */
-                SWXRegion[regionID]->StartScan[j] = (int32) original_scan[0];
-                SWXRegion[regionID]->StopScan[j] = (int32) original_scan[1];
-		    SWXRegion[regionID]->StartRegion[j] = (int32) range[0];
-		    SWXRegion[regionID]->StopRegion[j] = (int32) range[1];
-                    ++SWXRegion[regionID]->nRegions;
-                    SWXRegion[regionID]->scanflag = 1;
-                    if(band81flag == 1)
-                       SWXRegion[regionID]->band8flag = 1;
-                    if(band82flag == 1)
-                       SWXRegion[regionID]->band8flag = 2;
-                    if(band83flag == 1)
-                       SWXRegion[regionID]->band8flag = 3;
-                   break;
-		}
+		free(buf);
+		VSdetach(vdataID);
 	    }
-       }
-
+	    else
+	    {
+		HEpush(DFE_GENAPP, "SWwrrdfield", __FILE__, __LINE__);
+		HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
+	    }
+	}			/* End One-D Field Section */
 
-    /* Set regionID to -1 if bad return status */
-    /* --------------------------------------- */
-    if (status == -1)
-    {
-	regionID = -1;
     }
-
-    if (dfieldlist != NULL)
-       free(dfieldlist);
-    free(tfieldname);
-    if (buffer != NULL)
-       free(buffer);
-    if (idxmap != NULL)
-    free(idxmap);
-
-    return (regionID);
+    return (status);
 }
 
 
+
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |
-|  FUNCTION: SWsetfillvalue                                                   |
-|                                                                             |
-|  DESCRIPTION: Sets fill value for the specified field.                      |
+|  FUNCTION: SWreadfield                                                      |
 |                                                                             |
+|  DESCRIPTION: Reads data from field                                         |
 |                                                                             |
 |  Return Value    Type     Units     Description                             |
 |  ============   ======  =========   =====================================   |
 |  status         intn                return status (0) SUCCEED, (-1) FAIL    |
 |                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               swath structure ID                      |
-|  fieldname      char                field name                              |
-|  fillval        void                fill value                              |
+|  INPUTS:                                                                    |
+|  swathID        int32               swath structure ID                      |
+|  fieldname      const char          fieldname                               |
+|  start          int32               start array                             |
+|  stride         int32               stride array                            |
+|  edge           int32               edge array                              |
+|  buffer         void                data buffer for read                    |
+|                                                                             |
 |                                                                             |
 |  OUTPUTS:                                                                   |
-|             None                                                            |
+|     None                                                                    |
 |                                                                             |
 |  NOTES:                                                                     |
 |                                                                             |
@@ -9859,63 +3666,16 @@ SWdefscanregion(int32 swathID, const char *fieldname, float64 range[], CPL_UNUSE
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 intn
-SWsetfillvalue(int32 swathID, const char *fieldname, VOIDP fillval)
-{
-    intn            status;	/* routine return status variable */
-
-    int32           fid;	/* HDF-EOS file ID */
-    int32           sdInterfaceID;	/* HDF SDS interface ID */
-    int32           swVgrpID;	/* Swath root Vgroup ID */
-    int32           sdid;	/* SDS id */
-    int32           nt;		/* Number type */
-    int32           dims[8];	/* Dimensions array */
-    int32           dum;	/* Dummy variable */
-    int32           solo;	/* "Solo" (non-merged) field flag */
-
-    char            name[80];	/* Fill value "attribute" name */
-
-    /* Check for valid swath ID and get SDS interface ID */
-    status = SWchkswid(swathID, "SWsetfillvalue",
-		       &fid, &sdInterfaceID, &swVgrpID);
-
-    if (status == 0)
-    {
-	/* Get field info */
-	status = SWfieldinfo(swathID, fieldname, &dum, dims, &nt, NULL);
-
-	if (status == 0)
-	{
-	    /* Get SDS ID and solo flag */
-	    status = SWSDfldsrch(swathID, sdInterfaceID, fieldname,
-				 &sdid, &dum, &dum, &dum,
-				 dims, &solo);
+SWreadfield(int32 swathID, const char *fieldname,
+	    int32 start[], int32 stride[], int32 edge[], VOIDP buffer)
 
-	    /* If unmerged field then call HDF set field routine */
-	    if (solo == 1)
-	    {
-                /* status = */ SDsetfillvalue(sdid, fillval);
-	    }
+{
+    intn            status = 0;	/* routine return status variable */
 
-	    /*
-	     * Store fill value in attribute.  Name is given by fieldname
-	     * prepended with "_FV_"
-	     */
-	    strcpy(name, "_FV_");
-	    strcat(name, fieldname);
-	    status = SWwriteattr(swathID, name, nt, 1, fillval);
-	}
-	else
-	{
-	    HEpush(DFE_GENAPP, "SWsetfillvalue", __FILE__, __LINE__);
-	    HEreport("Fieldname \"%s\" does not exist.\n", fieldname);
-	}
-    }
+    status = SWwrrdfield(swathID, fieldname, "r", start, stride, edge,
+			 buffer);
     return (status);
 }
-#endif
-
-
-
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
@@ -10020,621 +3780,88 @@ SWdetach(int32 swathID)
 
 {
     intn            i;		/* Loop index */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    intn            j;		/* Loop index */
-#endif
     intn            k;		/* Loop index */
     intn            status = 0;	/* routine return status variable */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    intn            statusFill = 0;	/* return status from SWgetfillvalue */
-#endif
 
     uint8          *buf;	/* Buffer for blank (initial) 1D records */
 
     int32           vdataID;	/* Vdata ID */
-    int32          *namelen = NULL;	/* Pointer to name string length array */
-    int32          *dimlen = NULL;	/* Pointer to dim string length array */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    int32           slen1[3];	/* String length array 1 */
-    int32           slen2[3];	/* String length array 2 */
-    int32           nflds;	/* Number of fields */
-    int32           match[5];	/* Merged field match array */
-    int32           cmbfldcnt;	/* Number of fields combined */
-    int32           sdid;	/* SDS ID */
-    int32           vgid;	/* Vgroup ID */
-#endif
     int32           dims[3];	/* Dimension array */
-    int32          *offset = NULL;	/* Pointer to merged field offset array */
-    int32          *indvdims = NULL;	/* Pointer to merged field size array */
     int32           sdInterfaceID;	/* SDS interface ID */
     int32           sID;	/* Swath ID - offset */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    int32           nflds0;	/* Number of fields */
-#endif
-    int32          *namelen0 = NULL;	/* Pointer to name string length array */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    int32           rank;	/* Rank of merged field */
-    int32           truerank;	/* True rank of merged field */
-#endif
     int32           idOffset = SWIDOFFSET;	/* Swath ID offset */
     int32           dum;	/* Dummy variable */
 
-    char           *nambuf = NULL;	/* Pointer to name buffer */
-    char          **nameptr = NULL;	/* Pointer to name string pointer array */
-    char          **dimptr = NULL;	/* Pointer to dim string pointer array */
-    char          **nameptr0 = NULL;	/* Pointer to name string pointer array */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    char           *ptr1[3];	/* String pointer array */
-    char           *ptr2[3];	/* String pointer array */
-    char            dimbuf1[128];	/* Dimension buffer 1 */
-    char            dimbuf2[128];	/* Dimension buffer 2 */
-#endif
     char            swathname[VGNAMELENMAX + 1];	/* Swath name */
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-    char           *utlbuf;	/* Utility buffer */
-    char            fillval[32];/* Fill value buffer */
-#endif
 
     /* Check for proper swath ID and get SD interface ID */
     /* ------------------------------------------------- */
     status = SWchkswid(swathID, "SWdetach", &dum, &sdInterfaceID, &dum);
 
-    if (status == 0)
-    {
-	/* Subtract off swath ID offset and get swath name */
-	/* ----------------------------------------------- */
-	sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
-	Vgetname(SWXSwath[sID].IDTable, swathname);
-
-
-	/* Create 1D "orphaned" fields */
-	/* --------------------------- */
-	i = 0;
-
-	/* Find "active" entries in 1d combination array */
-	/* --------------------------------------------- */
-	while (SWX1dcomb[3 * i] != 0)
-	{
-	    /* For fields defined within swath... */
-	    /* ---------------------------------- */
-	    if (SWX1dcomb[3 * i + 1] == SWXSwath[sID].IDTable)
-	    {
-		/* Get dimension size and vdata ID */
-		/* ------------------------------- */
-		dims[0] = abs(SWX1dcomb[3 * i]);
-		vdataID = SWX1dcomb[3 * i + 2];
-
-		/* Get fieldname (= vdata name) */
-		/* ---------------------------- */
-		nambuf = (char *) calloc(VSNAMELENMAX + 1, 1);
-		if(nambuf == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		    return(-1);
-		}
-
-		VSgetname(vdataID, nambuf);
-
-		/* Set field within vdata */
-		/* ---------------------- */
-		VSsetfields(vdataID, nambuf);
-
-		/* Write (blank) records */
-		/* --------------------- */
-		buf = (uint8 *) calloc(VSsizeof(vdataID, nambuf), dims[0]);
-		if(buf == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		    free(nambuf);
-		    return(-1);
-		}
-		VSwrite(vdataID, buf, dims[0], FULL_INTERLACE);
-
-		free(buf);
-		free(nambuf);
-
-		/* Detach Vdata */
-		/* ------------ */
-		VSdetach(vdataID);
-	    }
-	    i++;
-	}
-
-
-	/* SDS combined fields */
-	/* ------------------- */
-	if (strlen(SWXSDname) == 0)
-	{
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-	    nflds = 0;
-#endif
-
-	    /* Allocate "dummy" arrays so free() doesn't bomb later */
-	    /* ---------------------------------------------------- */
-	    nameptr = (char **) calloc(1, sizeof(char *));
-	    if(nameptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		return(-1);
-	    }
-	    namelen = (int32 *) calloc(1, sizeof(int32));
-	    if(namelen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		return(-1);
-	    }
-	    nameptr0 = (char **) calloc(1, sizeof(char *));
-	    if(nameptr0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		return(-1);
-	    }
-	    namelen0 = (int32 *) calloc(1, sizeof(int32));
-	    if(namelen0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		return(-1);
-	    }
-	    dimptr = (char **) calloc(1, sizeof(char *));
-	    if(dimptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		return(-1);
-	    }
-	    dimlen = (int32 *) calloc(1, sizeof(int32));
-	    if(dimlen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		return(-1);
-	    }
-	    offset = (int32 *) calloc(1, sizeof(int32));
-	    if(offset == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		return(-1);
-	    }
-	    indvdims = (int32 *) calloc(1, sizeof(int32));
-	    if(indvdims == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		free(offset);
-		return(-1);
-	    }
-	}
-#if defined(HDFEOS_SW_WRITE_SUPPORT)
-	else
-	{
-	    /*
-	     * "Trim Off" trailing "," and ";" in SWXSDname & SWXSDdims
-	     * respectively
-	     */
-	    SWXSDname[strlen(SWXSDname) - 1] = 0;
-	    SWXSDdims[strlen(SWXSDdims) - 1] = 0;
-
-
-	    /* Get number of fields from SWXSDname string */
-	    /* ------------------------------------------ */
-	    nflds = EHparsestr(SWXSDname, ',', NULL, NULL);
-
-
-	    /* Allocate space for various dynamic arrays */
-	    /* ----------------------------------------- */
-	    nameptr = (char **) calloc(nflds, sizeof(char *));
-	    if(nameptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		return(-1);
-	    }
-	    namelen = (int32 *) calloc(nflds, sizeof(int32));
-	    if(namelen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		return(-1);
-	    }
-	    nameptr0 = (char **) calloc(nflds, sizeof(char *));
-	    if(nameptr0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		return(-1);
-	    }
-	    namelen0 = (int32 *) calloc(nflds, sizeof(int32));
-	    if(namelen0 == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		return(-1);
-	    }
-	    dimptr = (char **) calloc(nflds, sizeof(char *));
-	    if(dimptr == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		return(-1);
-	    }
-	    dimlen = (int32 *) calloc(nflds, sizeof(int32));
-	    if(dimlen == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		return(-1);
-	    }
-	    offset = (int32 *) calloc(nflds, sizeof(int32));
-	    if(offset == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		return(-1);
-	    }
-	    indvdims = (int32 *) calloc(nflds, sizeof(int32));
-	    if(indvdims == NULL)
-	    {
-		HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		free(nameptr);
-		free(namelen);
-		free(nameptr0);
-		free(namelen0);
-		free(dimptr);
-		free(dimlen);
-		free(offset);
-		return(-1);
-	    }
-
-
-	    /* Parse SWXSDname and SWXSDdims strings */
-	    /* ------------------------------------- */
-	    nflds = EHparsestr(SWXSDname, ',', nameptr, namelen);
-	    nflds = EHparsestr(SWXSDdims, ';', dimptr, dimlen);
-	}
-
-	/* Loop through all the fields */
-	/* --------------------------- */
-	for (i = 0; i < nflds; i++)
-	{
-	    /* If active entry and field is within swath to be detached ... */
-	    /* ------------------------------------------------------------ */
-	    if (SWXSDcomb[5 * i] != 0 &&
-		SWXSDcomb[5 * i + 3] == SWXSwath[sID].IDTable)
-	    {
-		nambuf = (char *) calloc(strlen(SWXSDname) + 1, 1);
-		if(nambuf == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		    free(nameptr);
-		    free(namelen);
-		    free(nameptr0);
-		    free(namelen0);
-		    free(dimptr);
-		    free(dimlen);
-		    free(offset);
-		    free(indvdims);
-		    return(-1);
-		}
-		utlbuf = (char *) calloc(2 * strlen(SWXSDname) + 7, 1);
-		if(utlbuf == NULL)
-		{
-		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
-		    free(nambuf);
-		    free(nameptr);
-		    free(namelen);
-		    free(nameptr0);
-		    free(namelen0);
-		    free(dimptr);
-		    free(dimlen);
-		    free(offset);
-		    free(indvdims);
-		    return(-1);
-		}
-		/* Zero out dimbuf1 */
-		/* ---------------- */
-		for (k = 0; k < (intn)sizeof(dimbuf1); k++)
-		{
-		    dimbuf1[k] = 0;
-		}
-
-
-		/* Load array to match, name & parse dims */
-		/* -------------------------------------- */
-		memcpy(match, &SWXSDcomb[5 * i], 20);
-		memcpy(nambuf, nameptr[i], namelen[i]);
-
-		memcpy(dimbuf1, dimptr[i], dimlen[i]);
-		dum = EHparsestr(dimbuf1, ',', ptr1, slen1);
-
-
-		/* Separate combined (first) dimension from others */
-		/* ----------------------------------------------- */
-		dimbuf1[slen1[0]] = 0;
-
-		offset[0] = 0;
-		indvdims[0] = abs(match[0]);
-
-		/*
-		 * Loop through remaining fields to check for matches with
-		 * current one
-		 */
-		for (j = i + 1, cmbfldcnt = 0; j < nflds; j++)
-		{
-		    if (SWXSDcomb[5 * j] != 0)
-		    {
-			/* Zero out dimbuf2 */
-			/* ---------------- */
-			for (k = 0; k < (intn)sizeof(dimbuf2); k++)
-			{
-			    dimbuf2[k] = 0;
-			}
-
-			/*
-			 * Parse the dimensions and separate first for this
-			 * entry
-			 */
-			memcpy(dimbuf2, dimptr[j], dimlen[j]);
-			dum = EHparsestr(dimbuf2, ',', ptr2, slen2);
-			dimbuf2[slen2[0]] = 0;
-
-
-			/*
-			 * If 2nd & 3rd dimension values and names (1st and
-			 * 2nd for rank=2 array), swath ID, and numbertype
-			 * are equal, then these fields can be combined.
-			 */
-			if (match[1] == SWXSDcomb[5 * j + 1] &&
-			    match[2] == SWXSDcomb[5 * j + 2] &&
-			    match[3] == SWXSDcomb[5 * j + 3] &&
-			    match[4] == SWXSDcomb[5 * j + 4] &&
-			    strcmp(dimbuf1 + slen1[0] + 1,
-				   dimbuf2 + slen2[0] + 1) == 0)
-			{
-			    /* Add to combined dimension size */
-			    /* ------------------------------ */
-			    match[0] += SWXSDcomb[5 * j];
-
-			    /* Concatenate name */
-			    /* ---------------- */
-			    strcat(nambuf, ",");
-			    memcpy(nambuf + strlen(nambuf),
-				   nameptr[j], namelen[j]);
-
-			    /*
-			     * Increment number of merged fields, store
-			     * individual dims and dim offsets
-			     */
-			    cmbfldcnt++;
-			    indvdims[cmbfldcnt] = abs(SWXSDcomb[5 * j]);
-			    offset[cmbfldcnt] = offset[cmbfldcnt - 1] +
-				indvdims[cmbfldcnt - 1];
-
-			    /* Delete this field from combination list */
-			    /* --------------------------------------- */
-			    SWXSDcomb[5 * j] = 0;
-			}
-		    }
-		}
-
-
-		/* Create SDS */
-		/* ---------- */
-
-		/* Parse names string */
-		/* ------------------ */
-		nflds0 = EHparsestr(nambuf, ',', nameptr0, namelen0);
-
-		if (abs(match[0]) == 1)
-		{
-		    /* Two Dimensional Array (no merging has occurred) */
-		    /* ---------------------------------------------- */
-		    dims[0] = abs(match[1]);
-		    dims[1] = abs(match[2]);
-
-		    /* Create SDS */
-		    /* ---------- */
-		    rank = 2;
-		    sdid = SDcreate(sdInterfaceID, nambuf,
-				    SWXSDcomb[5 * i + 4], 2, dims);
-		}
-		else
-		{
-		    /* Three Dimensional Array */
-		    /* ----------------------- */
-		    dims[0] = abs(match[0]);
-		    dims[1] = abs(match[1]);
-		    dims[2] = abs(match[2]);
-
-		    rank = 3;
-
-		    /*
-		     * If merged fields then form string consisting of
-		     * "MRGFLD_" + 1st field in merge + ":" + entire merged
-		     * field list and store in utlbuf. Then write to
-		     * MergedField metadata section
-		     */
-		    if (cmbfldcnt > 0)
-		    {
-			strcpy(utlbuf, "MRGFLD_");
-			memcpy(utlbuf + 7, nameptr0[0], namelen0[0]);
-			utlbuf[7 + namelen0[0]] = 0;
-			strcat(utlbuf, ":");
-			strcat(utlbuf, nambuf);
-
-			status = EHinsertmeta(sdInterfaceID, swathname, "s",
-					      6L, utlbuf, NULL);
-		    }
-		    else
-		    {
-			/*
-			 * If not merged field then store field name in
-			 * utlbuf
-			 */
-			strcpy(utlbuf, nambuf);
-		    }
-
-		    /* Create SDS */
-		    /* ---------- */
-		    sdid = SDcreate(sdInterfaceID, utlbuf,
-				    SWXSDcomb[5 * i + 4], 3, dims);
-
-
-		    /*
-		     * If merged field then store dimensions and offsets as
-		     * SD attributes
-		     */
-		    if (cmbfldcnt > 0)
-		    {
-			SDsetattr(sdid, "Field Dims", DFNT_INT32,
-				  cmbfldcnt + 1, (VOIDP) indvdims);
-
-			SDsetattr(sdid, "Field Offsets", DFNT_INT32,
-				  cmbfldcnt + 1, (VOIDP) offset);
-		    }
-		}
-
+    if (status == 0)
+    {
+	/* Subtract off swath ID offset and get swath name */
+	/* ----------------------------------------------- */
+	sID = swathID % idOffset;
+	if (sID >= NSWATH)
+	{
+	    return -1;
+	}
+	Vgetname(SWXSwath[sID].IDTable, swathname);
 
 
-		/* Register Dimensions in SDS */
-		/* -------------------------- */
-		for (k = 0; k < rank; k++)
-		{
-		    if (rank == 2)
-		    {
-			/* Copy k+1th dimension into dimbuf2 if rank = 2 */
-			/* --------------------------------------------- */
-			memcpy(dimbuf2, ptr1[k + 1], slen1[k + 1]);
-			dimbuf2[slen1[k + 1]] = 0;
-		    }
-		    else
-		    {
-			/* Copy kth dimension into dimbuf2 if rank > 2 */
-			/* ------------------------------------------- */
-			memcpy(dimbuf2, ptr1[k], slen1[k]);
-			dimbuf2[slen1[k]] = 0;
-		    }
+	/* Create 1D "orphaned" fields */
+	/* --------------------------- */
+	i = 0;
 
-		    /*
-		     * If first dimension and merged field then generate
-		     * dimension name consisting of "MRGDIM:" + swathname +
-		     * dimension size
-		     */
-		    if (k == 0 && cmbfldcnt > 0)
-		    {
-			snprintf(dimbuf2, sizeof(dimbuf2), "%s%s_%ld", "MRGDIM:",
-				swathname, (long)dims[0]);
-		    }
-		    else
-		    {
-			/* Otherwise concatenate swathname to dim name */
-			/* ------------------------------------------- */
-			strcat(dimbuf2, ":");
-			strcat(dimbuf2, swathname);
-		    }
+	/* Find "active" entries in 1d combination array */
+	/* --------------------------------------------- */
+	while (SWX1dcomb[3 * i] != 0)
+	{
+	    /* For fields defined within swath... */
+	    /* ---------------------------------- */
+	    if (SWX1dcomb[3 * i + 1] == SWXSwath[sID].IDTable)
+	    {
+		/* Get dimension size and vdata ID */
+		/* ------------------------------- */
+		dims[0] = abs(SWX1dcomb[3 * i]);
+		vdataID = SWX1dcomb[3 * i + 2];
 
-		    /* Register dimensions using "SDsetdimname" */
-		    /* ---------------------------------------- */
-		    SDsetdimname(SDgetdimid(sdid, k), (char *) dimbuf2);
+		/* Get fieldname (= vdata name) */
+		/* ---------------------------- */
+		char* nambuf = (char *) calloc(VSNAMELENMAX + 1, 1);
+		if(nambuf == NULL)
+		{
+		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
+		    return(-1);
 		}
 
+		VSgetname(vdataID, nambuf);
 
+		/* Set field within vdata */
+		/* ---------------------- */
+		VSsetfields(vdataID, nambuf);
 
-		/* Write Fill Value */
-		/* ---------------- */
-		for (k = 0; k < nflds0; k++)
+		/* Write (blank) records */
+		/* --------------------- */
+		buf = (uint8 *) calloc(VSsizeof(vdataID, nambuf), dims[0]);
+		if(buf == NULL)
 		{
-		    /* Check if fill values has been set */
-		    /* --------------------------------- */
-		    memcpy(utlbuf, nameptr0[k], namelen0[k]);
-		    utlbuf[namelen[k]] = 0;
-		    statusFill = SWgetfillvalue(swathID, utlbuf, fillval);
-
-		    if (statusFill == 0)
-		    {
-			/*
-			 * If merged field then fill value must be stored
-			 * manually using EHfillfld
-			 */
-			if (cmbfldcnt > 0)
-			{
-			    dims[0] = indvdims[k];
-			    truerank = (dims[0] == 1) ? 2 : 3;
-			    EHfillfld(sdid, rank, truerank,
-				      DFKNTsize(match[4]), offset[k],
-				      dims, fillval);
-			}
-			/*
-			 * If single field then just use the HDF set fill
-			 * function
-			 */
-			else
-			{
-			    status = SDsetfillvalue(sdid, fillval);
-			}
-		    }
+		    HEpush(DFE_NOSPACE,"SWdetach", __FILE__, __LINE__);
+		    free(nambuf);
+		    return(-1);
 		}
+		VSwrite(vdataID, buf, dims[0], FULL_INTERLACE);
 
-
-		/*
-		 * Insert SDS within the appropriate Vgroup (geo or data) and
-		 * "detach" newly-created SDS
-		 */
-		vgid = (match[0] < 0)
-		    ? SWXSwath[sID].VIDTable[0]
-		    : SWXSwath[sID].VIDTable[1];
-
-		Vaddtagref(vgid, DFTAG_NDG, SDidtoref(sdid));
-		SDendaccess(sdid);
-
+		free(buf);
 		free(nambuf);
-		free(utlbuf);
+
+		/* Detach Vdata */
+		/* ------------ */
+		VSdetach(vdataID);
 	    }
+	    i++;
 	}
-#endif
-
-
 
 	/* "Contract" 1dcomb array */
 	/* ----------------------- */
@@ -10651,65 +3878,6 @@ SWdetach(int32 swathID)
 		i++;
 	}
 
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-	/* "Contract" SDcomb array */
-	/* ----------------------- */
-	for (i = 0; i < nflds; i++)
-	{
-	    if (SWXSDcomb[5 * i + 3] == SWXSwath[sID].IDTable)
-	    {
-		if (i == (nflds - 1))
-		{
-		    SWXSDcomb[5 * i] = 0;
-		    *(nameptr[i] - (nflds != 1)) = 0;
-		    *(dimptr[i] - (nflds != 1)) = 0;
-		}
-		else
-		{
-		    memmove(&SWXSDcomb[5 * i],
-			   &SWXSDcomb[5 * (i + 1)],
-			   (512 - i - 1) * 5 * 4);
-
-		    memmove(nameptr[i],
-			   nameptr[i + 1],
-			   nameptr[0] + 2048 - nameptr[i + 1] - 1);
-
-		    memmove(dimptr[i],
-			   dimptr[i + 1],
-			   dimptr[0] + 2048 * 2 - dimptr[i + 1] - 1);
-		}
-
-		i--;
-		nflds = EHparsestr(SWXSDname, ',', nameptr, namelen);
-		nflds = EHparsestr(SWXSDdims, ';', dimptr, dimlen);
-	    }
-	}
-
-
-	/* Replace trailing delimiters on SWXSDname & SWXSDdims */
-	/* ---------------------------------------------------- */
-	if (nflds != 0)
-	{
-	    strcat(SWXSDname, ",");
-	    strcat(SWXSDdims, ";");
-	}
-#endif
-
-
-	/* Free up a bunch of dynamically allocated arrays */
-	/* ----------------------------------------------- */
-	free(nameptr);
-	free(namelen);
-	free(nameptr0);
-	free(namelen0);
-	free(dimptr);
-	free(dimlen);
-	free(offset);
-	free(indvdims);
-
-
-
-
 	/* "Detach" from previously attached SDSs */
 	/* -------------------------------------- */
 	for (k = 0; k < SWXSwath[sID].nSDS; k++)
@@ -10803,660 +3971,6 @@ SWclose(int32 fid)
     return (status);
 }
 
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWupdatescene                                                    |
-|                                                                             |
-|  DESCRIPTION: Updates the StartRegion and StopRegion values                 |
-|               for a specified region.                                       |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  status         intn                return status (0) SUCCEED, (-1) FAIL    |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  regionID       int32               Region ID                               |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Nov 98   Xinmin Hua    Original developing                                 |
-|  Aug 99   Abe Taaheri   Added code to exclude regions that have the same    |
-|                         start and stop.                                     |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-intn
-SWupdatescene(int32 swathID, int32 regionID)
-{
-    intn            k;          /* Loop index */
-    int32           status;     /* routine return status variable */
-
-    int32           fid;        /* HDF-EOS file ID */
-    int32           sdInterfaceID;      /* HDF SDS interface ID */
-    int32           swVgrpID;   /* Swath Vgroup ID */
-
-    int32           startReg;   /* Indexed start region */
-    int32           stopReg;    /* Indexed stop region */
-    int32           l_index[MAXNREGIONS]; /* to store indices when stop and
-					   start are different */
-
-    int32           ind;        /* l_index */
-    int32           tempnRegions; /* temp number of regions */
-
-    memset(l_index, 0, sizeof(int32) * MAXNREGIONS);
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWupdatescene", &fid, &sdInterfaceID,
-                       &swVgrpID);
-
-
-    /* Check for valid region ID */
-    /* ------------------------- */
-    if (status == 0)
-    {
-        if (regionID < 0 || regionID >= NSWATHREGN)
-        {
-            status = -1;
-            HEpush(DFE_RANGE, "SWupdatescene", __FILE__, __LINE__);
-            HEreport("Invalid Region id: %d.\n", regionID);
-        }
-    }
-
-    /* Check for active region ID */
-    /* -------------------------- */
-    if (status == 0)
-    {
-        if (SWXRegion[regionID] == 0)
-        {
-            status = -1;
-            HEpush(DFE_GENAPP, "SWupdatescene", __FILE__, __LINE__);
-            HEreport("Inactive Region ID: %d.\n", regionID);
-        }
-    }
-
-    if (status == 0)
-    {
-	tempnRegions = SWXRegion[regionID]->nRegions;
-	ind =0;
-
-	for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-        {
-           startReg = SWXRegion[regionID]->StartRegion[k];
-           stopReg = SWXRegion[regionID]->StopRegion[k];
-	   if(startReg == stopReg)
-	   {
-	       /* reduce number of regions by 1, if tempnRegions is 0 issue
-		  error and break from loop*/
-	       tempnRegions -= 1;
-
-	       if(tempnRegions == 0)
-	       {
-		   /* first free allocated memory for SWXRegion[regionID]
-		      in the function SWdefboxregion and make regionID
-		      inactive */
-		   free(SWXRegion[regionID]);
-		   SWXRegion[regionID] = 0;
-		   status = -1;
-		   HEpush(DFE_GENAPP, "SWupdatescene", __FILE__, __LINE__);
-		   HEreport("Inactive Region ID: %d.\n", regionID);
-		   break;
-	       }
-	   }
-	   else
-	   {
-	       /* store l_index number of regions that have different start and
-		  stop */
-	       l_index[ind] = k;
-	       ind += 1;
-	   }
-	}
-	if (status != 0)
-	{
-	    return (status);
-	}
-	else
-	{
-	    SWXRegion[regionID]->nRegions = tempnRegions;
-	}
-	/* keep starts and stops that are different in the structure  */
-	for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-	{
-	    SWXRegion[regionID]->StartRegion[k] =
-	      SWXRegion[regionID]->StartRegion[l_index[k]];
-	    SWXRegion[regionID]->StopRegion[k] =
-	      SWXRegion[regionID]->StopRegion[l_index[k]];
-	}
-
-    }
-
-
-    if (status == 0)
-    {
-
-        for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-        {
-
-           startReg = SWXRegion[regionID]->StartRegion[k];
-           stopReg = SWXRegion[regionID]->StopRegion[k];
-
-           if(startReg % 2 == 1) {
-
-              SWXRegion[regionID]->StartRegion[k] = ++startReg;
-
-           }
-           if(stopReg % 2 == 0) {
-
-              SWXRegion[regionID]->StopRegion[k] = --stopReg;
-
-           }
-
-        }
-
-    }
-
-    return(status);
-
-}
-#endif
-
-#ifdef HDFEOS_SW_WRITE_SUPPORT
-/*----------------------------------------------------------------------------|
-|  BEGIN_PROLOG                                                               |
-|                                                                             |
-|  FUNCTION: SWupdateidxmap                                                   |
-|                                                                             |
-|  DESCRIPTION: Updates the map l_index for a specified region.                 |
-|                                                                             |
-|                                                                             |
-|  Return Value    Type     Units     Description                             |
-|  ============   ======  =========   =====================================   |
-|  nout           int32               return Number of elements in output     |
-|                                     l_index array if SUCCEED, (-1) FAIL       |
-|                                                                             |
-|  INPUTS:                                                                    |
-|  swathID        int32               Swath structure ID                      |
-|  regionID       int32               Region ID                               |
-|  l_indexin        int32               array of l_index values                   |
-|                                                                             |
-|  OUTPUTS:                                                                   |
-|  l_indexout       int32               array of l_index values                   |
-|  indices	  int32		      array of start and stop in region       |
-|                                                                             |
-|  NOTES:                                                                     |
-|                                                                             |
-|                                                                             |
-|   Date     Programmer   Description                                         |
-|  ======   ============  =================================================   |
-|  Aug 97   Abe Taaheri   Original Programmer                                 |
-|  AUG 97   Abe Taaheri   Add support for l_index mapping                       |
-|  Sep 99   DaW		  Add support for Floating Scene Subsetting Landsat 7 |
-|                                                                             |
-|  END_PROLOG                                                                 |
------------------------------------------------------------------------------*/
-int32
-SWupdateidxmap(int32 swathID, int32 regionID, int32 l_indexin[], int32 l_indexout[], int32 indicies[])
-{
-    intn            i;          /* Loop index */
-    intn            j;          /* Loop index */
-    intn            k;          /* Loop index */
-    int32           status;     /* routine return status variable */
-    int32           land_status = 3;     /* routine return status variable */
-
-    int32           fid;        /* HDF-EOS file ID */
-    int32           sdInterfaceID;      /* HDF SDS interface ID */
-    int32           swVgrpID;   /* Swath Vgroup ID */
-
-    int32           numtype = 0; /* Used for L7 float scene sub. */
-    int32           count = 0;   /* Used for L7 float scene sub. */
-
-    int32           startReg = 0;   /* Indexed start region */
-    int32           stopReg = 0;    /* Indexed stop region */
-    int32           nout=-1;       /* Number of elements in output l_index array */
-    int32	    indexoffset = 0;
-    uint8	    scene_cnt = 0;	/* Used for L7 float scene sub.      */
-    uint8           detect_cnt = 0;     /* Used to convert scan to scanline  */
-    intn	    gtflag = 0;
-    intn	    ngtflag = 0;
-    int32           *buffer1 = (int32 *)NULL;
-    int32           *buffer2 = (int32 *)NULL;
-
-    /* Check for valid swath ID */
-    /* ------------------------ */
-    status = SWchkswid(swathID, "SWupdateidxmap", &fid, &sdInterfaceID,
-                       &swVgrpID);
-
-
-    /* Check for valid region ID */
-    /* ------------------------- */
-    if (status == 0)
-    {
-        if (regionID < 0 || regionID >= NSWATHREGN)
-        {
-            status = -1;
-            HEpush(DFE_RANGE, "SWupdateidxmap", __FILE__, __LINE__);
-            HEreport("Invalid Region id: %d.\n", regionID);
-        }
-    }
-
-    /* Check for active region ID */
-    /* -------------------------- */
-    if (status == 0)
-    {
-        if (SWXRegion[regionID] == 0)
-        {
-            status = -1;
-            HEpush(DFE_GENAPP, "SWextractregion", __FILE__, __LINE__);
-            HEreport("Inactive Region ID: %d.\n", regionID);
-        }
-    }
-
-    if (status == 0)
-    {
-	/* Loop through all regions */
-	/* ------------------------ */
-	for (k = 0; k < SWXRegion[regionID]->nRegions; k++)
-	{
-
-	    /* fix overlap l_index mapping problem for Landsat 7 */
-
-	    startReg = SWXRegion[regionID]->StartRegion[k];
-	    stopReg = SWXRegion[regionID]->StopRegion[k];
-
-
-            if(SWXRegion[regionID]->scanflag == 1)
-            {
-               indicies[0] = -1;
-               indicies[1] = -1;
-               j = 0;
-            /* This code checks for the attribute detector_count */
-            /* which is found in Landsat 7 files.  It is used    */
-            /* for some of the loops.                            */
-            /* ================================================= */
-               land_status = SWattrinfo(swathID, "scene_count", &numtype, &count);
-               if (land_status == 0)
-               {
-                  land_status = SWreadattr(swathID, "scene_count", &scene_cnt);
-                  land_status = SWreadattr(swathID, "detector_count", &detect_cnt);
-               }
-
-
-	      /* calculate the offsets first */
-	      buffer1 = (int32 *)calloc(74, sizeof(int32));
-	      buffer2 = (int32 *)calloc(74, sizeof(int32));
-
-	      status = SWidxmapinfo(swathID,"GeoTrack",
-				    "ScanLineTrack", (int32*)buffer1);
-	      status = SWidxmapinfo(swathID,"UpperTrack",
-				    "ScanLineTrack", (int32*)buffer2);
-
-	      indexoffset = buffer2[0] - buffer1[0];
-	      free(buffer1);
-	      free(buffer2);
-
-               if(SWXRegion[regionID]->band8flag == -1)
-               {
-                  for(i=0; i<scene_cnt;i++)
-                  {
-                     if(l_indexin[j] <= startReg && l_indexin[j+1] >= startReg)
-                        if(indicies[0] == -1)
-                           indicies[0] = j;
-                     if(l_indexin[j] <= stopReg && l_indexin[j+1] >= stopReg)
-                        indicies[1] = j + 1;
-                     j = j + 2;
-                     if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                        i = scene_cnt;
-                  }
-                  if(indicies[0] == -1)
-                  {
-                     if(startReg <= l_indexin[0])
-                        indicies[0] = 0;
-                  }
-                  if(indicies[0] == -1)
-                  {
-                     j = 0;
-                     for(i=0; i<scene_cnt; i++)
-                     {
-                        if(l_indexin[j] <= startReg && l_indexin[j+1] >= startReg)
-                           if(indicies[0] == -1)
-                              indicies[0] = j;
-                        j = j + 1;
-                        if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                           i = scene_cnt;
-                     }
-                  }
-                  if(indicies[1] == -1)
-                  {
-                     j = 0;
-                     for(i=0; i<scene_cnt; i++)
-                     {
-                        if(l_indexin[j] <= stopReg && l_indexin[j+1] >= stopReg)
-                           if(indicies[1] == -1)
-                              indicies[1] = j + 1;
-                        j = j + 1;
-                        if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                           i = scene_cnt;
-                     }
-                  }
-                  if(indicies[1] == -1)
-                     if(stopReg > l_indexin[scene_cnt - 1])
-                        indicies[1] = scene_cnt - 1;
-               }
-
-	       /* This section of code handles exceptions in Landsat 7  */
-	       /* data.  The Band 8 data - multiple files, data gaps	*/
-               /* ===================================================== */
-               if(SWXRegion[regionID]->band8flag == 1 ||
-                  SWXRegion[regionID]->band8flag == 2 ||
-                  SWXRegion[regionID]->band8flag == 3)
-               {
-                  j = 0;
-                  for(i=0; i<scene_cnt; i++)
-                  {
-                     j = j + 2;
-                     if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                     {
-                        if(l_indexin[j] == 0)
-                           gtflag = 1;
-                        else
-                           ngtflag = 1;
-                        i = scene_cnt;
-                     }
-                  }
-                  j = 0;
-                  if(gtflag == 1)
-                  {
-                     for(i=0; i<scene_cnt; i++)
-                     {
-		      if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
-			  startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
-                           if(indicies[0] == -1)
-                              indicies[0] = j;
-		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
-			  stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
-                           indicies[1] = j + 1;
-                        j = j + 2;
-                        if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                           i = scene_cnt;
-                     }
-                     if(SWXRegion[regionID]->band8flag == 1)
-                     {
-                        if(indicies[1] == -1)
-                           if(stopReg > (l_indexin[j - 1] + indexoffset - detect_cnt))
-                              indicies[1] = j - 1;
-                     }
-                     if(SWXRegion[regionID]->band8flag == 2 ||
-                        SWXRegion[regionID]->band8flag == 3)
-                     {
-
-                        if(startReg >= (l_indexin[j - 1] + indexoffset - detect_cnt))
-                        {
-                           indicies[0] = -1;
-                           indicies[1] = -1;
-                           /* status = SWfieldinfo(swathID, "scan_no", &rank, dims2, &nt, dimlist);
-                           buffer = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                           status = SWreadfield(swathID,"scan_no", NULL, NULL, NULL, buffer);
-                           indexoffset = buffer[0] * detect_cnt;
-                           free(buffer);
-                           startReg = startReg - (indexoffset - detect_cnt);
-                           stopReg = stopReg - (indexoffset - 1); */
-                           j = 0;
-                           for(i=0; i<scene_cnt; i++)
-                           {
-			     if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
-				 startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
-			       if(indicies[0] == -1)
-				 indicies[0] = j;
-			     if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
-				 stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
-			       indicies[1] = j + 1;
-                              j = j + 2;
-                              if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                                 i = scene_cnt;
-                           }
-                        }
-
-                        if(indicies[0] == -1)
-                        {
-                           j = 0;
-                           for(i=0; i<scene_cnt; i++)
-                           {
-			     if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
-				 startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
-			       if(indicies[0] == -1)
-				 indicies[0] = j;
-
-			     j = j + 2;
-			     if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-			       i = scene_cnt;
-                           }
-                        }
-                        if(indicies[1] == -1)
-                           if(stopReg > (l_indexin[j - 1] + indexoffset - detect_cnt) )
-                              indicies[1] = j - 1;
-                     }
-                     if(indicies[1] == -1)
-                     {
-                        j = 0;
-                        for(i=0; i<scene_cnt; i++)
-                        {
-			  if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
-			      stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
-			    indicies[1] = j;
-			  j = j + 2;
-			  if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-			    i = scene_cnt;
-                        }
-                     }
-                  }
-
-                  if(ngtflag == 1)
-                  {
-                     for(i=0; i<scene_cnt; i++)
-                     {
-		      if( startReg >= l_indexin[j] && startReg <= l_indexin[j+1])
-                           if(indicies[0] == -1)
-                              indicies[0] = j;
-		      if( stopReg >= l_indexin[j] && stopReg <= l_indexin[j+1])
-                           indicies[1] = j + 1;
-                        j = j + 2;
-                        if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                           i = scene_cnt;
-                     }
-                     if(SWXRegion[regionID]->band8flag == 2)
-                     {
-                        if(startReg >= l_indexin[j] )
-                        {
-                           if(indicies[0] == -1)
-                              indicies[0] = j;
-                           if(indicies[1] == -1)
-                              indicies[1] = j;
-                        }
-                        if(indicies[0] == -1)
-                           if(startReg <= l_indexin[0])
-                              indicies[0] = 0;
-                        if(indicies[1] == -1)
-                           if(stopReg > l_indexin[j])
-                              indicies[1] = j;
-                     }
-                     if(indicies[0] == -1)
-                     {
-                        j = 0;
-                        for(i=0; i<scene_cnt; i++)
-                        {
-			  if( startReg >= l_indexin[j] && startReg <= l_indexin[j+1])
-			    indicies[0] = j;
-                           j = j + 2;
-                           if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                              i = scene_cnt;
-                        }
-                     }
-                     if(indicies[1] == -1)
-                     {
-                        j = 0;
-                        for(i=0; i<scene_cnt; i++)
-                        {
-		      if( stopReg >= l_indexin[j] && stopReg <= l_indexin[j+1])
-                              indicies[1] = j;
-                           j = j + 2;
-                           if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                              i = scene_cnt;
-                        }
-                     }
-                     if(indicies[1] == -1)
-                     {
-                        if(stopReg > l_indexin[j])
-                           indicies[1] = j;
-                     }
-                  }
-                  if(indicies[0] == -1)
-                  {
-                     if(startReg <= (l_indexin[0]+ indexoffset - detect_cnt) )
-                        indicies[0] = 0;
-                     if(indicies[1] == -1)
-                        if(stopReg > (l_indexin[j] + indexoffset - detect_cnt))
-                           indicies[1] = j;
-                  }
-               }
-               if (indicies[1] == -1)
-               {
-                  if(SWXRegion[regionID]->band8flag == 2 ||
-                     SWXRegion[regionID]->band8flag == 3)
-                  {
-                     if(stopReg < (l_indexin[0] + indexoffset - detect_cnt))
-                     {
-		       /*status = SWfieldinfo(swathID, "scan_no", &rank, dims2, &nt, dimlist);
-                        buffer = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                        status = SWreadfield(swathID,"scan_no", NULL, NULL, NULL, buffer);
-                        indexoffset = buffer[0] * detect_cnt;
-                        free(buffer);
-                        startReg = startReg + (indexoffset - detect_cnt);
-                        stopReg = stopReg + (indexoffset - 1); */
-                        if(stopReg >= (l_indexin[scene_cnt - 1] + indexoffset - detect_cnt))
-                        {
-                           indicies[1] = scene_cnt - 1;
-                        }
-                        else
-                        {
-                           j = 0;
-                           for(i=0;i<scene_cnt;i++)
-                           {
-		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
-			  stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
-			         indicies[1] = j;
-			      j = j + 2;
-                              if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                                 i = scene_cnt;
-                           }
-                        }
-                     }
-
-                     if(startReg > (l_indexin[j - 1] + indexoffset - detect_cnt ))
-                     {
-                        indicies[0] = -1;
-                        indicies[1] = -1;
-                        /*status = SWfieldinfo(swathID, "scan_no", &rank, dims2, &nt, dimlist);
-                        buffer = (uint16 *)calloc(dims2[0], sizeof(uint16));
-                        status = SWreadfield(swathID,"scan_no", NULL, NULL, NULL, buffer);
-                        indexoffset = buffer[0] * detect_cnt;
-                        free(buffer);
-                        startReg = startReg - (indexoffset - detect_cnt);
-                        stopReg = stopReg - (indexoffset - 1);*/
-                        j = 0;
-                        for(i=0; i<scene_cnt; i++)
-                        {
-		      if( startReg >= (l_indexin[j] + indexoffset - detect_cnt) &&
-			  startReg <= (l_indexin[j+1] + indexoffset - detect_cnt) )
-                              if(indicies[0] == -1)
-                                 indicies[0] = j;
-		      if( stopReg >= (l_indexin[j] + indexoffset - detect_cnt ) &&
-			  stopReg <= (l_indexin[j+1] + indexoffset - detect_cnt ) )
-                              indicies[1] = j + 1;
-                           j = j + 2;
-                           if(l_indexin[j] == 0 || l_indexin[j+1] == 0)
-                              i = scene_cnt;
-                        }
-                        if(indicies[0] == -1)
-                           if(startReg < (l_indexin[0] +  indexoffset - detect_cnt))
-                              indicies[0] = 0;
-                        if(indicies[1] == -1)
-                           if(stopReg > (l_indexin[j - 1] + indexoffset - detect_cnt))
-                              indicies[1] = j - 1;
-                     }
-                  }
-               }
-            }		/* end of if for floating scene update */
-            else
-            {
-	       /* If start of region is odd then increment */
-	       /* ---------------------------------------- */
-	       if (startReg % 2 == 1)
-	       {
-		  startReg++;
-	       }
-
-	       /* If end of region is even then decrement */
-	       /* --------------------------------------- */
-	       if (stopReg % 2 == 0)
-	       {
-		  stopReg--;
-	       }
-
-               indicies[0]=startReg;
-               indicies[1]=stopReg;
-	   }
-        }
-
-	if (l_indexout != NULL)
-	{
-           if(SWXRegion[regionID]->scanflag == 1)
-           {
-              nout = (indicies[1] - indicies[0] + 1);
-              j = 0;
-              if (nout == 1)
-                 l_indexout[0] = l_indexin[indicies[0]];
-              for(i=0; i<nout;i++)
-              {
-                 l_indexout[i] = l_indexin[indicies[0] + i];
-              }
-           }
-           else
-           {
-	      /* get new l_index values */
-              /* ==================== */
-	      for(i = startReg; i <= stopReg  ; i++)
-	      {
-	         l_indexout[i-startReg] = l_indexin[i];
-	      }
-	      nout = (stopReg - startReg) + 1;
-           }
-        }
-        else
-        {
-           nout = indicies[1] - indicies[0] + 1;
-	}
-     }
-
-
-    if(status == -1)
-    {
-	return(status);
-    }
-    else
-    {
-        return(nout);
-    }
-
-}
-#endif
-
-
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
 |                                                                             |

From 248346c4e8fa4d8a805ad93fa80d6d9acf6ed35d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 26 Nov 2024 19:24:43 +0100
Subject: [PATCH 21/21] autotest/ogr/ogr_parquet.py: add a missing
 require_driver()

---
 autotest/ogr/ogr_parquet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
index 9fddd67b926e..dc5bb62c17ca 100755
--- a/autotest/ogr/ogr_parquet.py
+++ b/autotest/ogr/ogr_parquet.py
@@ -4100,6 +4100,7 @@ def test_ogr_parquet_ignored_fields_bounding_box_column_arrow_dataset(tmp_path):
 
 
 @gdaltest.enable_exceptions()
+@pytest.mark.require_driver("ARROW")
 def test_ogr_parquet_vsi_arrow_file_system():
 
     version = int(