Skip to content
Commits on Source (22)
Show whitespace changes
Inline Side-by-side
configure.in
View file @ e93ddc48
dnl ***************************************************************************
dnl $Id: configure.in 37160 2017-01-17 07:34:22Z rouault $
dnl $Id$
dnl
dnl Project: GDAL GRASS Plugin
dnl Purpose: Configure source file.
......
debian/changelog
View file @ e93ddc48
libgdal-grass (2.2.4-2) UNRELEASED; urgency=medium
libgdal-grass (2.3.0-1) unstable; urgency=medium
* Bump minimum GDAL version to 2.3.0.
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Thu, 24 May 2018 18:37:15 +0200
libgdal-grass (2.3.0-1~exp1) experimental; urgency=medium
* New upstream release.
-- Bas Couwenberg <sebastic@debian.org> Fri, 11 May 2018 12:40:00 +0200
libgdal-grass (2.3.0~rc1-1~exp2) experimental; urgency=medium
* Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.
* Strip trailing whitespace from changelog & control files.
* Don't use version plugins directory.
-- Bas Couwenberg <sebastic@debian.org> Mon, 07 May 2018 19:08:06 +0200
libgdal-grass (2.3.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Enable parallel make.
-- Bas Couwenberg <sebastic@debian.org> Fri, 04 May 2018 20:18:15 +0200
libgdal-grass (2.3.0~beta1-1~exp1) experimental; urgency=medium
* New upstream beta release.
* Update Vcs-* URLs for Salsa.
* Drop override for vcs-deprecated-in-debian-infrastructure.
* Bump Standards-Version to 4.1.4, no changes.
-- Bas Couwenberg <sebastic@debian.org> Sat, 31 Mar 2018 11:38:09 +0200
-- Bas Couwenberg <sebastic@debian.org> Sun, 22 Apr 2018 09:17:58 +0200
libgdal-grass (2.2.4-1) unstable; urgency=medium
......@@ -605,4 +634,3 @@ libgdal-grass (1.2.6-1) unstable; urgency=low
* Initial release (Closes: #248832)
-- Steve Halasz <debian@adkgis.org> Mon, 13 Jun 2005 13:00:27 -0400
debian/control
View file @ e93ddc48
......@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
d-shlibs,
grass (>= 7.4.0),
grass-dev (>= 7.4.0),
libgdal-dev (>= 2.2.4),
libgdal-dev (>= 2.3.0),
libpq-dev,
pkg-config
Standards-Version: 4.1.4
......@@ -31,4 +31,3 @@ Description: GRASS extension for the GDAL library
provides access to GRASS data via GDAL.
.
This package provides the GDAL GRASS plugin.
debian/lintian-overrides
View file @ e93ddc48
# The run path has been added to get GRASS internal library
libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib
debian/rules
View file @ e93ddc48
......@@ -17,7 +17,6 @@ endif
PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))
GDAL=$(shell cat VERSION | cut -d. -f1,2)
%:
dh $@ --with autoreconf --parallel
......@@ -41,18 +40,12 @@ override_dh_auto_configure:
dh_auto_configure -- \
--prefix=/usr \
--with-autoload=/usr/lib/gdalplugins/$(GDAL) \
--with-autoload=/usr/lib/gdalplugins \
--with-grass=/usr/lib/$(GRASS) \
--with-postgres-includes=$(shell pg_config --includedir)
override_dh_auto_install:
mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
$(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL) \
GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
# removes redundant stuff already installed by grass
rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)
dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins
override_dh_shlibdeps:
dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib
......
grass57dataset.cpp
View file @ e93ddc48
......@@ -63,7 +63,7 @@ char *GPJ_grass_to_wkt( struct Key_Value *,
#define GRASS_MAX_COLORS 100000 // what is the right value
CPL_CVSID("$Id: grass57dataset.cpp 37964 2017-04-11 18:04:50Z rouault $");
CPL_CVSID("$Id: grass57dataset.cpp c4d5cfef28c1c6fbb03a9ab1d42835e6cfa920cc 2017-12-20 12:29:27Z Kurt Schwehr $")
#if GRASS_VERSION_MAJOR >= 7
#define G_get_cellhd Rast_get_cellhd
......@@ -133,10 +133,10 @@ class GRASSDataset : public GDALDataset
public:
GRASSDataset();
~GRASSDataset();
~GRASSDataset() override;
virtual const char *GetProjectionRef(void) override;
virtual CPLErr GetGeoTransform( double * ) override;
const char *GetProjectionRef(void) override;
CPLErr GetGeoTransform( double * ) override;
static GDALDataset *Open( GDALOpenInfo * );
......@@ -174,21 +174,20 @@ class GRASSRasterBand : public GDALRasterBand
bool valid;
public:
GRASSRasterBand( GRASSDataset *, int, const char *, const char * );
~GRASSRasterBand() override;
GRASSRasterBand( GRASSDataset *, int,
const char *, const char * );
virtual ~GRASSRasterBand();
virtual CPLErr IReadBlock( int, int, void * ) override;
virtual CPLErr IRasterIO ( GDALRWFlag, int, int, int, int, void *, int, int, GDALDataType,
CPLErr IReadBlock( int, int, void * ) override;
CPLErr IRasterIO ( GDALRWFlag, int, int, int, int,
void *, int, int, GDALDataType,
GSpacing nPixelSpace,
GSpacing nLineSpace,
GDALRasterIOExtraArg* psExtraArg) override;
virtual GDALColorInterp GetColorInterpretation() override;
virtual GDALColorTable *GetColorTable() override;
virtual double GetMinimum( int *pbSuccess = NULL ) override;
virtual double GetMaximum( int *pbSuccess = NULL ) override;
virtual double GetNoDataValue( int *pbSuccess = NULL ) override;
GDALColorInterp GetColorInterpretation() override;
GDALColorTable *GetColorTable() override;
double GetMinimum( int *pbSuccess = NULL ) override;
double GetMaximum( int *pbSuccess = NULL ) override;
double GetNoDataValue( int *pbSuccess = NULL ) override;
private:
CPLErr ResetReading( struct Cell_head * );
......
ogrgrass.h
View file @ e93ddc48
/******************************************************************************
* $Id: ogrgrass.h 36501 2016-11-25 14:09:24Z rouault $
* $Id: ogrgrass.h 2c3d60220a2d6b41496ded571e231b96435bffa0 2016-11-25 14:09:24Z Even Rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Private definitions for OGR/GRASS driver.
......
ogrgrassdatasource.cpp
View file @ e93ddc48
......@@ -31,7 +31,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
CPL_CVSID("$Id: ogrgrassdatasource.cpp 36368 2016-11-21 01:47:49Z rouault $");
CPL_CVSID("$Id: ogrgrassdatasource.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
#if GRASS_VERSION_MAJOR >= 7
#define G__setenv G_setenv_nogisrc
......
ogrgrassdriver.cpp
View file @ e93ddc48
......@@ -30,7 +30,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
CPL_CVSID("$Id: ogrgrassdriver.cpp 36368 2016-11-21 01:47:49Z rouault $");
CPL_CVSID("$Id: ogrgrassdriver.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
/************************************************************************/
/* ~OGRGRASSDriver() */
......
ogrgrasslayer.cpp
View file @ e93ddc48
......@@ -31,7 +31,7 @@
#include "ogrgrass.h"
#include "cpl_conv.h"
CPL_CVSID("$Id: ogrgrasslayer.cpp 36368 2016-11-21 01:47:49Z rouault $");
CPL_CVSID("$Id: ogrgrasslayer.cpp 4971449609881d6ffdca70188292293852d12691 2017-12-17 16:48:14Z Even Rouault $")
/************************************************************************/
/* OGRGRASSLayer() */
......@@ -789,11 +789,9 @@ OGRFeature *OGRGRASSLayer::GetFeature( GIntBig nFeatureId )
nFeatureId );
int cat;
OGRFeature *poFeature = NULL;
OGRGeometry *poOGR = GetFeatureGeometry ( nFeatureId, &cat );
poFeature = new OGRFeature( poFeatureDefn );
OGRFeature* poFeature = new OGRFeature( poFeatureDefn );
poFeature->SetGeometryDirectly( poOGR );
poFeature->SetFID ( nFeatureId );
......