Changeset 13829

Timestamp:

02/21/08 14:09:39 (3 months ago)

Author:

rouault

Message:

Backport of recent changes done in trunk for GSAG driver (ticket #2224)

Files:

• branches/1.5/gdal/frmts/gsg/gsagdataset.cpp (modified) (20 diffs)

branches/1.5/gdal/frmts/gsg/gsagdataset.cpp

@@ -85 +85 @@
-
-    static GDALDataset *Open( GDALOpenInfo * );
-    static GDALDataset *Create( const char * pszFilename,
-                                int nXSize, int nYSize, int nBands,
-                                GDALDataType eType,
-                                char **papszParmList );
-    static GDALDataset *CreateCopy( const char *pszFilename,
-                                    GDALDataset *poSrcDS,
@@ -124 +120 @@
-
-    vsi_l_offset *panLineOffset;
+        int nLastReadLine;
-
-    double *padfRowMinZ;
@@ -183 +180 @@
-
-    panLineOffset =
-CPL
+VSI
-    if( panLineOffset == NULL )
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "GSAGRasterBand::GSAGRasterBand : Out of memory allocating %d * %d bytes",
+                 poDS->nRasterYSize+1, sizeof(vsi_l_offset) );
-        return;
-
-
+
+
+
+
-}
-
@@ -304 +307 @@
-
-    if( nBlockYOff < 0 || nBlockYOff > nRasterYSize - 1 || nBlockXOff != 0 )
-       
+        
-
-    if( panLineOffset[nBlockYOff] == 0 )
-
+
+
+
+
+
+
+
-
-    if( panLineOffset[nBlockYOff] == 0 )
-
-
+
-    if( VSIFSeekL( poGDS->fp, panLineOffset[nBlockYOff], SEEK_SET ) != 0 )
-    {
-       
-               
-               
-       
+        
+                
+                
+        
-    }
-
@@ -325 +333 @@
-    size_t nCharsExamined = 0;
-    /* If we know the offsets, we can just read line directly */
-panLineOffset[nBlockYOff+1] != 0
-
-+
-+
-                       
+(nBlockYOff > 0) && ( panLineOffset[nBlockYOff-1] != 0 )
+
+-
+-
+      
-    }
-    else
@@ -413 +421 @@
-
-                while( *szStart == '\0' &&
-                       
+                       
-                    szStart++;
-
@@ -435 +443 @@
-        }
-        else if( *szEnd == '\0'
-               
-               
-               
-               
-               
-               
-               
-               
-               
+                 
+                 
+                 
+                 
+                 
+                 
+                 
+                 
+                 
-        {
-            /* Number was interrupted by a nul character */
@@ -510 +518 @@
-    if( *szEnd != '\0' && *szEnd != poGDS->szEOL[0] )
-        CPLDebug( "GSAG", "Grid row %d does not end with a newline.  "
-                       
+                 
-
-    while( isspace( *szEnd ) )
@@ -520 +528 @@
-        nMaxLineSize = nCharsExamined + 1;
-
-
+
+
+
+
+
-
-    VSIFree( szLineBuf );
@@ -551 +563 @@
-        || nMinZRow < 0 || nMaxZRow < 0 )
-    {
-*
+ * 
-        if( padfRowMinZ == NULL )
-        {
@@ -559 +571 @@
-        }
-
-*
+ * 
-        if( padfRowMaxZ == NULL )
-        {
@@ -853 +865 @@
-
-        size_t nRead = VSIFReadL( pabyHeader, 1, nMAX_HEADER_SIZE-1, poDS->fp );
-+1
-
-
-
+
+
+
+ = NULL
-    const char *szStart = pabyHeader + 5;
-    char *szEnd;
@@ -880 +892 @@
-        poDS->nRasterXSize = INT_MAX;
-    }
+    else if ( nTemp == 0 )
+    {
+        szErrorMsg = "Number of X axis grid columns is zero, which is invalid.\n";
+        goto error;
+    }
-    else
-    {
@@ -898 +915 @@
-                  "Number of Y axis grid rows not representable.\n" );
-        poDS->nRasterYSize = INT_MAX;
+    }
+    else if ( nTemp == 0)
+    {
+        szErrorMsg = "Number of Y axis grid rows is zero, which is invalid.\n";
+        goto error;
-    }
-    else
@@ -994 +1016 @@
-    {
-    GSAGRasterBand *poBand = new GSAGRasterBand( poDS, 1, szEnd-pabyHeader );
+    if( poBand->panLineOffset == NULL )
+    {
+        delete poBand;
+        goto error;
+    }
+
-    poBand->dfMinX = dfMinX;
-    poBand->dfMaxX = dfMaxX;
@@ -1025 +1053 @@
-    delete poDS;
-
-
+
+
-    return NULL;
-}
@@ -1441 +1470 @@
-
-/************************************************************************/
-/*                               Create()                               */
-/************************************************************************/
-
-GDALDataset *GSAGDataset::Create( const char * pszFilename,
-                                  int nXSize, int nYSize, int nBands,
-                                  GDALDataType eType,
-                                  char **papszParmList )
-
-{
-    if( nXSize <= 0 || nYSize <= 0 )
-    {
-        CPLError( CE_Failure, CPLE_IllegalArg,
-                  "Unable to create grid, both X and Y size must be "
-                  "non-negative.\n" );
-
-        return NULL;
-    }
-
-    if( eType != GDT_Byte && eType != GDT_Float32 && eType != GDT_UInt16
-        && eType != GDT_Int16 && eType != GDT_Float64 && eType != GDT_Int32
-        && eType != GDT_UInt32 )
-    {
-        CPLError( CE_Failure, CPLE_AppDefined,
-                  "Golden Software ASCII Grid only supports Byte, Int16, "
-                  "Uint16, Int32, Uint32, Float32, and Float64 datatypes.  "
-                  "Unable to create with type %s.\n",
-                  GDALGetDataTypeName( eType ) );
-
-        return NULL;
-    }
-
-    FILE *fp = VSIFOpenL( pszFilename, "w+b" );
-
-    if( fp == NULL )
-    {
-        CPLError( CE_Failure, CPLE_OpenFailed,
-                  "Attempt to create file '%s' failed.\n",
-                  pszFilename );
-        return NULL;
-    }
-
-    std::ostringstream ssHeader;
-
-    ssHeader << "DSAA\x0D\x0A";
-    ssHeader << nXSize << " " << nYSize << "\x0D\x0A";
-    ssHeader << 0.0 << " " << nXSize << "\x0D\x0A";
-    ssHeader << 0.0 << " " << nYSize << "\x0D\x0A";
-    ssHeader << 0.0 << " " << 0.0 << "\x0D\x0A";
-
-    if( VSIFWriteL( (void *)ssHeader.str().c_str(), 1, ssHeader.str().length(),
-                    fp ) != ssHeader.str().length() )
-    {
-        VSIFCloseL( fp );
-        CPLError( CE_Failure, CPLE_FileIO,
-                  "Unable to create copy, writing header failed.\n" );
-        return NULL;
-    }
-
-    /* grid data, row major, max 10 values per line (to mimic Surfer) */
-    std::ostringstream ssOutStream;
-    ssOutStream.precision( nFIELD_PRECISION );
-    ssOutStream.setf( std::ios::uppercase );
-    ssOutStream << dfNODATA_VALUE << " ";
-    CPLString sOut = ssOutStream.str();
-    const char *szOut = sOut.c_str();
-    size_t nOutLen = sOut.length();
-    for( int iRow=0; iRow<nYSize; iRow++ )
-    {
-        for( int iLine=0; iLine<nXSize/10+1; iLine++ )
-        {
-            for( int iCol=0; iCol<10 && iLine*10+iCol<nXSize; iCol++ )
-            {
-                if( VSIFWriteL( szOut, 1, nOutLen, fp ) != nOutLen )
-                {
-                    CPLError( CE_Failure, CPLE_FileIO,
-                              "Unable to write grid cell.  Disk full?\n" );
-                    return NULL;
-                }
-            }
-
-            if( VSIFWriteL( (void *)"\x0D\x0A", 1, 2, fp ) != 2 )
-            {
-                CPLError( CE_Failure, CPLE_FileIO,
-                          "Unable to finish write of grid line. Disk full?\n" );
-                return NULL;
-            }
-        }
-
-        if( VSIFWriteL( (void *)"\x0D\x0A", 1, 2, fp ) != 2 )
-        {
-            CPLError( CE_Failure, CPLE_FileIO,
-                      "Unable to finish write of grid row. Disk full?\n" );
-            return NULL;
-        }
-    }
-
-    VSIFCloseL( fp );
-
-    return (GDALDataset *)GDALOpen( pszFilename, GA_Update );
-}
-
-/************************************************************************/
-/*                             CreateCopy()                             */
-/************************************************************************/
@@ -1633 +1560 @@
-/*      Copy band data.                                                 */
-/* -------------------------------------------------------------------- */
-
+ 
-    if( pdfData == NULL )
-    {
@@ -1649 +1576 @@
-    for( int iRow=0; iRow<nYSize; iRow++ )
-    {
-iRow
+nYSize-iRow-1
-                                           nXSize, 1, pdfData,
-                                           nXSize, 1, GDT_Float64, 0, 0 );
@@ -1892 +1819 @@
-                                   "Float32 Float64" );
-
-
-
+
-        poDriver->pfnCreateCopy = GSAGDataset::CreateCopy;
-        poDriver->pfnDelete = GSAGDataset::Delete;