Changeset 11554

Show
Ignore:
Timestamp:
05/18/07 13:09:03 (2 years ago)
Author:
mloskot
Message:

Backported update to GRASS drivers to support new prototypes of error handlers introduced in GRASS >=6.3 (Ticket #1587).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.4/gdal/frmts/grass/GNUmakefile

    r9466 r11554  
    1717clean: 
    1818        rm -f *.o $(O_OBJ) $(OBJ) 
     19        rm -f *~ 
    1920 
    2021install-obj:    $(O_OBJ) 
    …… 
    2223dist: 
    2324        cp -r pkg gdal-grass-$(GDAL_VER) 
    24         rm -rf gdal-grass-$(GDAL_VER)/CVS 
     25        rm -rf gdal-grass-$(GDAL_VER)/.svn 
    2526        cp grass57dataset.cpp gdal-grass-$(GDAL_VER) 
    26         cp ../../ogr/ogrsf_frmts/grass/*.{cpp,h} gdal-grass-$(GDAL_VER) 
     27        cp ../../ogr/ogrsf_frmts/grass/*.cpp gdal-grass-$(GDAL_VER) 
     28        cp ../../ogr/ogrsf_frmts/grass/*.h gdal-grass-$(GDAL_VER) 
    2729        tar czvf gdal-grass-$(GDAL_VER).tar.gz ./gdal-grass-$(GDAL_VER) 
    2830        rm -rf gdal-grass-$(GDAL_VER) 
     31 

  • branches/1.4/gdal/frmts/grass/grass57dataset.cpp

    r10646 r11554  
    4242#endif 
    4343     
     44#include <grass/version.h> 
    4445#include <grass/gprojects.h> 
    4546#include <grass/gis.h> 
    …… 
    786787/************************************************************************/ 
    787788 
     789#if GRASS_VERSION_MAJOR  >= 6 && GRASS_VERSION_MINOR  >= 3 
     790typedef int (*GrassErrorHandler)(const char *, int); 
     791#else 
    788792typedef int (*GrassErrorHandler)(char *, int); 
     793#endif 
    789794 
    790795GDALDataset *GRASSDataset::Open( GDALOpenInfo * poOpenInfo ) 

  • branches/1.4/gdal/ogr/ogrsf_frmts/grass/ogrgrass.h

    r10646 r11554  
    3434 
    3535extern "C" { 
     36    #include <grass/version.h> 
    3637    #include <grass/gprojects.h> 
    3738    #include <grass/gis.h> 

  • branches/1.4/gdal/ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp

    r10646 r11554  
    6666OGRGRASSDataSource::~OGRGRASSDataSource() 
    6767{ 
    68     CPLDebug ( "GRASS", "OGRGRASSDataSource::~OGRGRASSDataSource()" ); 
    69  
    7068    for( int i = 0; i < nLayers; i++ ) 
    7169        delete papoLayers[i]; 
    …… 
    8280/*                                Open()                                */ 
    8381/************************************************************************/ 
     82 
     83#if GRASS_VERSION_MAJOR  >= 6 && GRASS_VERSION_MINOR  >= 3 
     84typedef int (*GrassErrorHandler)(const char *, int); 
     85#else 
    8486typedef int (*GrassErrorHandler)(char *, int); 
     87#endif 
    8588 
    8689int OGRGRASSDataSource::Open( const char * pszNewName, int bUpdate, 
    8790                              int bTestOpen, int bSingleNewFileIn ) 
    8891{ 
    89     CPLDebug ( "GRASS", "OGRGRASSDataSource::Open" ); 
    90  
    9192    VSIStatBuf  stat; 
    9293