VRT driver : properly set eAccess flag to avoid erros on vrtrawlink.p…

…y, particularly when GDAL_FORCE_CACHING=YES is set (#3133) git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@17624 f0d54148-0727-0410-94bb-9a71ac55c965
judajake · Sep 8, 2009 · 896ea7d · 896ea7d
1 parent 34ab190
commit 896ea7d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/frmts/raw/rawdataset.cpp b/frmts/raw/rawdataset.cpp
@@ -199,6 +199,16 @@ RawRasterBand::~RawRasterBand()
     CPLFree( pLineBuffer );
 }
 
+
+/************************************************************************/
+/*                             SetAccess()                              */
+/************************************************************************/
+
+void  RawRasterBand::SetAccess( GDALAccess eAccess )
+{
+    this->eAccess = eAccess;
+}
+
 /************************************************************************/
 /*                             FlushCache()                             */
 /*                                                                      */

diff --git a/frmts/raw/rawdataset.h b/frmts/raw/rawdataset.h
@@ -129,6 +129,8 @@ class CPL_DLL RawRasterBand : public GDALPamRasterBand
 
     CPLErr          AccessLine( int iLine );
 
+    void            SetAccess( GDALAccess eAccess );
+
     // this is deprecated.
     void	 StoreNoDataValue( double );
 

diff --git a/frmts/vrt/vrtdataset.cpp b/frmts/vrt/vrtdataset.cpp
@@ -675,7 +675,7 @@ GDALDataset *VRTDataset::Open( GDALOpenInfo * poOpenInfo )
 /* -------------------------------------------------------------------- */
 /*      Turn the XML representation into a VRTDataset.                  */
 /* -------------------------------------------------------------------- */
-    VRTDataset *poDS = (VRTDataset *) OpenXML( pszXML, pszVRTPath );
+    VRTDataset *poDS = (VRTDataset *) OpenXML( pszXML, pszVRTPath, poOpenInfo->eAccess );
 
     if( poDS != NULL )
         poDS->bNeedsFlush = FALSE;
@@ -699,7 +699,8 @@ GDALDataset *VRTDataset::Open( GDALOpenInfo * poOpenInfo )
 /*      of the dataset.                                                 */
 /************************************************************************/
 
-GDALDataset *VRTDataset::OpenXML( const char *pszXML, const char *pszVRTPath )
+GDALDataset *VRTDataset::OpenXML( const char *pszXML, const char *pszVRTPath,
+                                  GDALAccess eAccess)
 
 {
  /* -------------------------------------------------------------------- */
@@ -733,7 +734,10 @@ GDALDataset *VRTDataset::OpenXML( const char *pszXML, const char *pszVRTPath )
     if( strstr(pszXML,"VRTWarpedDataset") != NULL )
         poDS = new VRTWarpedDataset( nXSize, nYSize );
     else
+    {
         poDS = new VRTDataset( nXSize, nYSize );
+        poDS->eAccess = eAccess;
+    }
 
     if( poDS->XMLInit( psTree, pszVRTPath ) != CE_None )
     {
@@ -913,7 +917,7 @@ VRTDataset::Create( const char * pszName,
 
     if( EQUALN(pszName,"<VRTDataset",11) )
     {
-        GDALDataset *poDS = OpenXML( pszName, NULL );
+        GDALDataset *poDS = OpenXML( pszName, NULL, GA_Update );
         poDS->SetDescription( "<FromXML>" );
         return poDS;
     }
@@ -935,6 +939,7 @@ VRTDataset::Create( const char * pszName,
                       pszSubclass );
             return NULL;
         }
+        poDS->eAccess = GA_Update;
 
         poDS->SetDescription( pszName );
 

diff --git a/frmts/vrt/vrtdataset.h b/frmts/vrt/vrtdataset.h
@@ -112,7 +112,7 @@ class CPL_DLL VRTDataset : public GDALDataset
 
     static int          Identify( GDALOpenInfo * );
     static GDALDataset *Open( GDALOpenInfo * );
-    static GDALDataset *OpenXML( const char *, const char * = NULL );
+    static GDALDataset *OpenXML( const char *, const char * = NULL, GDALAccess eAccess = GA_ReadOnly );
     static GDALDataset *Create( const char * pszName,
                                 int nXSize, int nYSize, int nBands,
                                 GDALDataType eType, char ** papszOptions );

diff --git a/frmts/vrt/vrtrawrasterband.cpp b/frmts/vrt/vrtrawrasterband.cpp
@@ -89,6 +89,15 @@ CPLErr VRTRawRasterBand::IRasterIO( GDALRWFlag eRWFlag,
         return CE_Failure;
     }
 
+    if( eRWFlag == GF_Write && eAccess == GA_ReadOnly )
+    {
+        CPLError( CE_Failure, CPLE_NoWriteAccess,
+                  "Attempt to write to read only dataset in"
+                  "VRTRawRasterBand::IRasterIO().\n" );
+
+        return( CE_Failure );
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Do we have overviews that would be appropriate to satisfy       */
 /*      this request?                                                   */
@@ -101,6 +110,8 @@ CPLErr VRTRawRasterBand::IRasterIO( GDALRWFlag eRWFlag,
                               eBufType, nPixelSpace, nLineSpace ) == CE_None )
             return CE_None;
     }
+
+    poRawRaster->SetAccess(eAccess);
 
     return poRawRaster->RasterIO( eRWFlag, nXOff, nYOff, nXSize, nYSize, 
                                   pData, nBufXSize, nBufYSize, 
@@ -139,7 +150,9 @@ CPLErr VRTRawRasterBand::IWriteBlock( int nBlockXOff, int nBlockYOff,
                   "No raw raster band configured on VRTRawRasterBand." );
         return CE_Failure;
     }
-
+
+    poRawRaster->SetAccess(eAccess);
+
     return poRawRaster->WriteBlock( nBlockXOff, nBlockYOff, pImage );
 }
 
@@ -238,7 +251,6 @@ CPLErr VRTRawRasterBand::SetRawLink( const char *pszFilename,
     return CE_None;
 }
 
-
 /************************************************************************/
 /*                            ClearRawLink()                            */
 /************************************************************************/