PAM: preserve existing metadata when setting new one (fixes #1430)

OSGeo · Apr 9, 2019 · b711807 · b711807
1 parent 5b9501f
commit b711807
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
@@ -423,6 +423,25 @@ def test_pam_13():
 
     gdal.SetConfigOption('GDAL_PAM_ENABLED', 'YES')
 
+###############################################################################
+# Test that existing PAM metadata is preserved when new is added
+# https://github.com/OSGeo/gdal/issues/1430
+
+
+def test_pam_metadata_preserved():
+
+    tmpfilename = '/vsimem/tmp.pnm'
+    ds = gdal.GetDriverByName('PNM').Create(tmpfilename, 1, 1)
+    ds.SetMetadataItem('foo', 'bar')
+    ds = None
+    ds = gdal.Open(tmpfilename)
+    ds.GetRasterBand(1).SetMetadataItem('bar', 'baz')
+    ds = None
+    ds = gdal.Open(tmpfilename)
+    assert ds.GetMetadataItem('foo') == 'bar'
+    assert ds.GetRasterBand(1).GetMetadataItem('bar') == 'baz'
+    ds = None
+    gdal.GetDriverByName('PNM').Delete(tmpfilename)
 
 ###############################################################################
 # Cleanup.

diff --git a/gdal/gcore/gdalpamdataset.cpp b/gdal/gcore/gdalpamdataset.cpp
@@ -418,7 +418,10 @@ CPLErr GDALPamDataset::XMLInit( CPLXMLNode *psTree, const char *pszUnused )
 /* -------------------------------------------------------------------- */
 /*      Apply any dataset level metadata.                               */
 /* -------------------------------------------------------------------- */
-    oMDMD.XMLInit( psTree, TRUE );
+    if( oMDMD.XMLInit( psTree, TRUE ) )
+    {
+        psPam->bHasMetadata = TRUE;
+    }
 
 /* -------------------------------------------------------------------- */
 /*      Try loading ESRI xml encoded GeodataXform.                      */