Changeset 14800

Timestamp:

07/02/08 16:19:49 (5 months ago)

Author:

rouault

Message:

Improve PAM metadata support with GeoTIFF in PROFILE=BASELINE/GeoTIFF mode (#2448)

Files:

• trunk/gdal/frmts/gtiff/geotiff.cpp (modified) (14 diffs)

trunk/gdal/frmts/gtiff/geotiff.cpp

@@ -202 +202 @@
-
-    // only needed by createcopy and close code.
-void
-
+int
+, int bExcludeRPBandIMGFileWriting = FALSE
-    static void     WriteNoDataValue( TIFF *, double );
-
@@ -2907 +2907 @@
-/************************************************************************/
-
-void
+int 
-                                  int bSrcIsGeoTIFF,
-                                  const char *pszProfile,
-                                  const char *pszTIFFFilename,
-
+
+
-
-{
@@ -2942 +2943 @@
-/* -------------------------------------------------------------------- */
-    char **papszRPCMD = poSrcDS->GetMetadata("RPC");
-
+&& !bExcludeRPBandIMGFileWriting 
-    {
-        if( EQUAL(pszProfile,"GDALGeoTIFF") )
@@ -2958 +2959 @@
-/* -------------------------------------------------------------------- */
-    char **papszIMDMD = poSrcDS->GetMetadata("IMD");
-
+&& !bExcludeRPBandIMGFileWriting
-    {
-        GDALWriteIMDFile( pszTIFFFilename, papszIMDMD );
@@ -3013 +3014 @@
-    if( psRoot != NULL )
-    {
+        int bRet = TRUE;
+
-        if( EQUAL(pszProfile,"GDALGeoTIFF") )
-        {
@@ -3020 +3023 @@
-                if( bSrcIsGeoTIFF )
-                    ((GTiffDataset *) poSrcDS)->PushMetadataToPam();
+                else
+                    bRet = FALSE;
-                CPLError( CE_Warning, CPLE_AppDefined, 
-                          "Lost metadata writing to GeoTIFF ... too large to fit in tag." );
@@ -3033 +3038 @@
-            if( bSrcIsGeoTIFF )
-                ((GTiffDataset *) poSrcDS)->PushMetadataToPam();
+            else
+                bRet = FALSE;
-        }
-
-        CPLDestroyXMLNode( psRoot );
-
+
+
+
+
+
-}
-
@@ -3087 +3098 @@
-            papszMD = CSLDuplicate(papszMD);
-
-
+=
-            {
-                if( EQUALN(papszMD[i],"TIFFTAG_",8)
@@ -3096 +3107 @@
-
-            if( nBand == 0 )
-
-
+
-            else
-
-
+
-
-            CSLDestroy( papszMD );
@@ -3116 +3125 @@
-            if( bSuccess && (dfOffset != 0.0 || dfScale != 1.0) )
-            {
-((GDALPamRasterBand *) poBand)->
-((GDALPamRasterBand *) poBand)->
+poBand->GDALPamRasterBand::
+poBand->GDALPamRasterBand::
-            }
-        }
@@ -3489 +3498 @@
-/* -------------------------------------------------------------------- */
-    char **papszPamDomains = oMDMD.GetDomainList();
-
-
-
-
-
+
+
+
+
-        char **papszGT_MD = oGTiffMDMD.GetMetadata( pszDomain );
-        char **papszPAM_MD = CSLDuplicate(oMDMD.GetMetadata( pszDomain ));
@@ -3501 +3509 @@
-        oGTiffMDMD.SetMetadata( papszPAM_MD, pszDomain );
-        CSLDestroy( papszPAM_MD );
+    }
+
+    for( int i = 1; i <= GetRasterCount(); i++)
+    {
+        GTiffRasterBand* poBand = (GTiffRasterBand *)GetRasterBand(i);
+        papszPamDomains = poBand->oMDMD.GetDomainList();
+
+        for( int iDomain = 0; papszPamDomains && papszPamDomains[iDomain] != NULL; iDomain++ )
+        {
+            const char *pszDomain = papszPamDomains[iDomain];
+            char **papszGT_MD = poBand->oGTiffMDMD.GetMetadata( pszDomain );
+            char **papszPAM_MD = CSLDuplicate(poBand->oMDMD.GetMetadata( pszDomain ));
+
+            papszPAM_MD = CSLMerge( papszPAM_MD, papszGT_MD );
+
+            poBand->oGTiffMDMD.SetMetadata( papszPAM_MD, pszDomain );
+            CSLDestroy( papszPAM_MD );
+        }
-    }
-}
@@ -5131 +5157 @@
-
-/* -------------------------------------------------------------------- */
-
-
-
-
+
+
+
+
+
+
+
-                                 pszFilename, papszOptions );
-
@@ -5307 +5336 @@
-
-    poDS->osProfile = pszProfile;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    hTIFF = (TIFF*) poDS->GetInternalHandle(NULL);
+
+/* -------------------------------------------------------------------- */
+/*      Second chance : now that we have a PAM dataset, it is possible  */
+/*      to write metadata that we couldn't be writen as TIFF tag        */
+/* -------------------------------------------------------------------- */
+    if (!bHasWrittenMDInGeotiffTAG)
+        GTiffDataset::WriteMetadata( poDS, hTIFF, TRUE, pszProfile,
+                                     pszFilename, papszOptions, TRUE /* don't write RPC and IMG file again */);
-
-    /* We must re-set the compression level at this point, since it has */