Changeset 14797

Timestamp:

06/30/08 18:54:20 (5 months ago)

Author:

warmerdam

Message:

merge PAM metadata into oGTiffMDMD when opening (#2448)

Files:

• branches/1.5/gdal/frmts/gtiff/geotiff.cpp (modified) (1 diff)

branches/1.5/gdal/frmts/gtiff/geotiff.cpp

@@ -2957 +2957 @@
-        CPLFree( pszProjection );
-        pszProjection = CPLStrdup( pszPamSRS );
+    }
+
+/* -------------------------------------------------------------------- */
+/*      Copy any PAM metadata into our GeoTIFF context, but with the    */
+/*      GeoTIFF context overriding the PAM info.                        */
+/* -------------------------------------------------------------------- */
+    char **papszPamDomains = oMDMD.GetDomainList();
+    int i;
+
+    for( i = 0; papszPamDomains && papszPamDomains[i] != NULL; i++ )
+    {
+        const char *pszDomain = papszPamDomains[i];
+        char **papszGT_MD = oGTiffMDMD.GetMetadata( pszDomain );
+        char **papszPAM_MD = CSLDuplicate(oMDMD.GetMetadata( pszDomain ));
+
+        papszPAM_MD = CSLMerge( papszPAM_MD, papszGT_MD );
+
+        oGTiffMDMD.SetMetadata( papszPAM_MD, pszDomain );
+        CSLDestroy( papszPAM_MD );
-    }
-}