This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository gdal.

commit 101a82cb0e1314ea3c7c8d8fb9cd3d4af640cacf
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Wed Sep 16 19:55:11 2015 +0200

    Imported Upstream version 1.11.3~rc2+dfsg
---
 NEWS                                |  8 +++-
 frmts/gtiff/gt_wkt_srs.cpp          | 22 +++++++---
 frmts/pdf/pdfdataset.cpp            | 12 +++---
 frmts/pdf/pdfio.cpp                 | 82 +++++++++++++++++++++++++++++++++++--
 frmts/pdf/pdfio.h                   |  6 ++-
 gcore/gdal_version.h                |  2 +-
 man/man1/gdal-config.1              |  2 +-
 man/man1/gdal2tiles.1               |  2 +-
 man/man1/gdal_calc.1                |  2 +-
 man/man1/gdal_contour.1             |  2 +-
 man/man1/gdal_edit.1                |  2 +-
 man/man1/gdal_fillnodata.1          |  2 +-
 man/man1/gdal_grid.1                |  2 +-
 man/man1/gdal_merge.1               |  2 +-
 man/man1/gdal_polygonize.1          |  2 +-
 man/man1/gdal_proximity.1           |  2 +-
 man/man1/gdal_rasterize.1           |  2 +-
 man/man1/gdal_retile.1              |  2 +-
 man/man1/gdal_sieve.1               |  2 +-
 man/man1/gdal_translate.1           |  2 +-
 man/man1/gdal_utilities.1           |  2 +-
 man/man1/gdaladdo.1                 |  2 +-
 man/man1/gdalbuildvrt.1             |  2 +-
 man/man1/gdalcompare.1              |  2 +-
 man/man1/gdaldem.1                  |  2 +-
 man/man1/gdalinfo.1                 |  2 +-
 man/man1/gdallocationinfo.1         |  2 +-
 man/man1/gdalmanage.1               |  2 +-
 man/man1/gdalmove.1                 |  2 +-
 man/man1/gdalsrsinfo.1              |  2 +-
 man/man1/gdaltindex.1               |  2 +-
 man/man1/gdaltransform.1            |  2 +-
 man/man1/gdalwarp.1                 |  2 +-
 man/man1/nearblack.1                |  2 +-
 man/man1/ogr2ogr.1                  |  2 +-
 man/man1/ogr_utilities.1            |  2 +-
 man/man1/ogrinfo.1                  |  2 +-
 man/man1/ogrlineref.1               |  2 +-
 man/man1/ogrtindex.1                |  2 +-
 man/man1/pct2rgb.1                  |  2 +-
 man/man1/rgb2pct.1                  |  2 +-
 ogr/ogr_srs_api.h                   |  5 ++-
 ogr/ogr_srs_esri.cpp                | 17 +++++++-
 swig/csharp/ogr/Osr.cs              |  1 +
 swig/csharp/osr/Osr.cs              |  1 +
 swig/include/python/ogr_python.i    | 12 +++---
 swig/perl/lib/Geo/OSR.pm            |  1 +
 swig/perl/osr_wrap.cpp              |  5 +++
 swig/python/extensions/osr_wrap.cpp |  1 +
 swig/python/osgeo/ogr.py            | 10 ++---
 swig/python/osgeo/osr.py            |  1 +
 51 files changed, 189 insertions(+), 67 deletions(-)

diff --git a/NEWS b/NEWS
index cfb34e8..a9c1d10 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ The 1.11.3 release is a bug fix release.
  * Support custom buildflags in GRASS plugin (#5850)
  * GRASS 7.0.0 support (#5852)
  * fix detection of ECW SDK 5.1 on Mac (#5867, #5390)
+ * Add support for Poppler >= 0.31.0 (#6118)
 
 == Port ==
  * /vsitar/: remove useless validation test that prevents from opening valid 
.tar files (#5864)
@@ -43,6 +44,7 @@ GeoRaster driver:
 GTiff driver:
  * fix GTiffDataset::IsBlockAvailable() wrong behaviour when compiling against 
internal libtiff, when a BigTIFF file has a TileByteCounts with LONG/4-byte 
counts and not LONG8 (#6001)
  * avoid generated corrupted  right-most and bottom-most tiles for 12-bit 
JPEG-compressed (#5971)
+ * on reading attach PROJ4 extension node for Mercator_Auxiliary_Sphere / 
WebMercator (#5924)
 
 HDF4 driver:
  * fix AnyTypeToDouble() to use proper type (int instead of long) to work with 
DFNT_INT32/DFNT_UINT32 on 64-bit Linux (#5965)
@@ -68,6 +70,9 @@ VRT driver:
  * add more checks to CheckCompatibleForDatasetIO() to avoid issues with 
overview bands (#5954)
  * fix rounding of output window size on VRTSimpleSource (#5874)
 
+== OGRSpatialReference ==
+ * morphFromESRI(): map Mercator_Auxiliary_Sphere to EPSG:3857 (#5924)
+
 == OGR drivers ==
 
 EDIGEO driver:
@@ -107,7 +112,8 @@ SQLite driver:
 Perl bindings:
  * Fix creation of Field Definition object (#6099)
 
-A Field Definition object is sometimes created with wrong attributes
+Python bindings:
+ * Fix build with SWIG 3.0.6 (#6045)
 
 = GDAL/OGR 1.11.2 Release Notes = 
 
diff --git a/frmts/gtiff/gt_wkt_srs.cpp b/frmts/gtiff/gt_wkt_srs.cpp
index 4f6e8bd..d22073a 100644
--- a/frmts/gtiff/gt_wkt_srs.cpp
+++ b/frmts/gtiff/gt_wkt_srs.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: gt_wkt_srs.cpp 27182 2014-04-14 20:03:08Z rouault $
+ * $Id: gt_wkt_srs.cpp 30439 2015-09-16 09:58:56Z rouault $
  *
  * Project:  GeoTIFF Driver
  * Purpose:  Implements translation between GeoTIFF normalized projection
@@ -45,7 +45,7 @@
 #include "gt_wkt_srs_for_gdal.h"
 #include "gt_citation.h"
 
-CPL_CVSID("$Id: gt_wkt_srs.cpp 27182 2014-04-14 20:03:08Z rouault $")
+CPL_CVSID("$Id: gt_wkt_srs.cpp 30439 2015-09-16 09:58:56Z rouault $")
 
 #define ProjLinearUnitsInterpCorrectGeoKey   3059
 
@@ -209,11 +209,11 @@ static void WKTMassageDatum( char ** ppszDatum )
 /************************************************************************/
 
 /* For example:
-   GTCitationGeoKey (Ascii,215): "IMAGINE GeoTIFF Support\nCopyright 1991 - 
2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 27182 $ 
$Date: 2014-04-14 13:03:08 -0700 (Mon, 14 Apr 2014) $\nProjection Name = 
UTM\nUnits = meters\nGeoTIFF Units = meters"
+   GTCitationGeoKey (Ascii,215): "IMAGINE GeoTIFF Support\nCopyright 1991 - 
2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 30439 $ 
$Date: 2015-09-16 02:58:56 -0700 (Wed, 16 Sep 2015) $\nProjection Name = 
UTM\nUnits = meters\nGeoTIFF Units = meters"
 
-   GeogCitationGeoKey (Ascii,267): "IMAGINE GeoTIFF Support\nCopyright 1991 - 
2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 27182 $ 
$Date: 2014-04-14 13:03:08 -0700 (Mon, 14 Apr 2014) $\nUnable to match 
Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 
1866\nDatum = NAD27 (CONUS)"
+   GeogCitationGeoKey (Ascii,267): "IMAGINE GeoTIFF Support\nCopyright 1991 - 
2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 30439 $ 
$Date: 2015-09-16 02:58:56 -0700 (Wed, 16 Sep 2015) $\nUnable to match 
Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 
1866\nDatum = NAD27 (CONUS)"
 
-   PCSCitationGeoKey (Ascii,214): "IMAGINE GeoTIFF Support\nCopyright 1991 - 
2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 27182 $ 
$Date: 2014-04-14 13:03:08 -0700 (Mon, 14 Apr 2014) $\nUTM Zone 10N\nEllipsoid 
= Clarke 1866\nDatum = NAD27 (CONUS)"
+   PCSCitationGeoKey (Ascii,214): "IMAGINE GeoTIFF Support\nCopyright 1991 - 
2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 30439 $ 
$Date: 2015-09-16 02:58:56 -0700 (Wed, 16 Sep 2015) $\nUTM Zone 10N\nEllipsoid 
= Clarke 1866\nDatum = NAD27 (CONUS)"
  
 */
 
@@ -289,6 +289,18 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
             strstr(szPeStr, "ESRI PE String = " ) )
         {
             pszWKT = CPLStrdup( szPeStr + strlen("ESRI PE String = ") );
+
+            if( strstr(pszWKT, 
"PROJCS[\"WGS_1984_Web_Mercator_Auxiliary_Sphere\"") )
+            {
+                oSRS.SetFromUserInput(pszWKT);
+                oSRS.SetExtension( "PROJCS", "PROJ4",  
+                                   "+proj=merc +a=6378137 +b=6378137 
+lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  
+no_defs" ); 
+                oSRS.FixupOrdering();
+                CPLFree(pszWKT);
+                pszWKT = NULL;
+                oSRS.exportToWkt(&pszWKT);
+            }
+
             return pszWKT;
         }
         else
diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
index 116cb74..7f76976 100644
--- a/frmts/pdf/pdfdataset.cpp
+++ b/frmts/pdf/pdfdataset.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: pdfdataset.cpp 27741 2014-09-26 19:20:02Z goatbar $
+ * $Id: pdfdataset.cpp 30441 2015-09-16 10:08:47Z rouault $
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
@@ -55,7 +55,7 @@
 
 /* g++ -fPIC -g -Wall frmts/pdf/pdfdataset.cpp -shared -o gdal_PDF.so -Iport 
-Igcore -Iogr -L. -lgdal -lpoppler -I/usr/include/poppler */
 
-CPL_CVSID("$Id: pdfdataset.cpp 27741 2014-09-26 19:20:02Z goatbar $");
+CPL_CVSID("$Id: pdfdataset.cpp 30441 2015-09-16 10:08:47Z rouault $");
 
 CPL_C_START
 void    GDALRegister_PDF(void);
@@ -108,12 +108,9 @@ class GDALPDFOutputDev : public SplashOutputDev
 
     public:
         GDALPDFOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
-                         GBool reverseVideoA, SplashColorPtr paperColorA,
-                         GBool bitmapTopDownA = gTrue,
-                         GBool allowAntialiasA = gTrue) :
+                         GBool reverseVideoA, SplashColorPtr paperColorA) :
                 SplashOutputDev(colorModeA, bitmapRowPadA,
-                                reverseVideoA, paperColorA,
-                                bitmapTopDownA, allowAntialiasA),
+                                reverseVideoA, paperColorA),
                 bEnableVector(TRUE),
                 bEnableText(TRUE),
                 bEnableBitmap(TRUE) {}
@@ -1371,6 +1368,7 @@ static void PDFFreeDoc(PDFDoc* poDoc)
     {
         /* hack to avoid potential cross heap issues on Win32 */
         /* str is the VSIPDFFileStream object passed in the constructor of 
PDFDoc */
+        // NOTE: This is potentially very dangerous. See comment in 
VSIPDFFileStream::FillBuffer() */
         delete poDoc->str;
         poDoc->str = NULL;
 
diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
index 94acd10..6243465 100644
--- a/frmts/pdf/pdfio.cpp
+++ b/frmts/pdf/pdfio.cpp
@@ -37,7 +37,19 @@
 
 #include "cpl_vsi.h"
 
-CPL_CVSID("$Id: pdfio.cpp 27044 2014-03-16 23:41:27Z rouault $");
+CPL_CVSID("$Id: pdfio.cpp 30441 2015-09-16 10:08:47Z rouault $");
+
+
+#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
+/* Poppler 0.31.0 is the first one that needs to know the file size */
+static vsi_l_offset VSIPDFFileStreamGetSize(VSILFILE* f)
+{
+    VSIFSeekL(f, 0, SEEK_END);
+    vsi_l_offset nSize = VSIFTellL(f);
+    VSIFSeekL(f, 0, SEEK_SET);
+    return nSize;
+}
+#endif
 
 /************************************************************************/
 /*                         VSIPDFFileStream()                           */
@@ -45,7 +57,7 @@ CPL_CVSID("$Id: pdfio.cpp 27044 2014-03-16 23:41:27Z rouault 
$");
 
 VSIPDFFileStream::VSIPDFFileStream(VSILFILE* f, const char* pszFilename, 
Object *dictA):
 #ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
-                                                        BaseStream(dictA, 0)
+                                                        BaseStream(dictA, 
(setPos_offset_type)VSIPDFFileStreamGetSize(f))
 #else
                                                         BaseStream(dictA)
 #endif
@@ -188,6 +200,27 @@ int VSIPDFFileStream::FillBuffer()
     if (nBufferLength == 0)
         return FALSE;
 
+    // Since we now report a non-zero length (as BaseStream::length member),
+    // PDFDoc::getPage() can go to the linearized mode if the file is 
linearized,
+    // and thus create a pageCache. If so, in PDFDoc::~PDFDoc(),
+    // if pageCache is not null, it would try to access the stream (str) 
through
+    // getPageCount(), but we have just freed and nullify str before in 
PDFFreeDoc().
+    // So make as if the file is not linearized to avoid those issues...
+    // All this is due to our attempt of avoiding cross-heap issues with 
allocation
+    // and liberation of VSIPDFFileStream as PDFDoc::str member.
+    if( nCurrentPos <= 0 )
+    {
+        for(int i=0;i<nToRead-(int)strlen("/Linearized ");i++)
+        {
+            if( memcmp(abyBuffer + i, "/Linearized ",
+                       strlen("/Linearized ")) == 0 )
+            {
+                memcpy(abyBuffer + i, "/XXXXXXXXXX ", strlen("/Linearized "));
+                break;
+            }
+        }
+    }
+
     return TRUE;
 }
 
@@ -195,7 +228,7 @@ int VSIPDFFileStream::FillBuffer()
 /*                                getChar()                             */
 /************************************************************************/
 
-/* The unoptimized version performs a bit well since we must go through */
+/* The unoptimized version performs a bit less since we must go through */
 /* the whole virtual I/O chain for each character reading. We save a few */
 /* percent with this extra internal caching */
 
@@ -326,4 +359,47 @@ void VSIPDFFileStream::moveStart(moveStart_delta_type 
delta)
     nPosInBuffer = nBufferLength = -1;
 }
 
+/************************************************************************/
+/*                          hasGetChars()                               */
+/************************************************************************/
+
+GBool VSIPDFFileStream::hasGetChars()
+{
+    return true;
+}
+
+/************************************************************************/
+/*                            getChars()                                */
+/************************************************************************/
+
+int VSIPDFFileStream::getChars(int nChars, Guchar *buffer)
+{
+    int nRead = 0;
+    while (nRead < nChars)
+    {
+        int nToRead = nChars - nRead;
+        if (nPosInBuffer == nBufferLength)
+        {
+            if (!bLimited && nToRead > BUFFER_SIZE)
+            {
+                int nJustRead = (int) VSIFReadL(buffer + nRead, 1, nToRead, f);
+                nPosInBuffer = nBufferLength = -1;
+                nCurrentPos += nJustRead;
+                nRead += nJustRead;
+                break;
+            }
+            else if (!FillBuffer() || nPosInBuffer >= nBufferLength)
+                break;
+        }
+        if( nToRead > nBufferLength - nPosInBuffer )
+            nToRead = nBufferLength - nPosInBuffer;
+
+        memcpy( buffer + nRead, abyBuffer + nPosInBuffer, nToRead );
+        nPosInBuffer += nToRead;
+        nCurrentPos += nToRead;
+        nRead += nToRead;
+    }
+    return nRead;
+}
+
 #endif
diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
index ebedc57..852d65b 100644
--- a/frmts/pdf/pdfio.h
+++ b/frmts/pdf/pdfio.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: pdfio.h 27044 2014-03-16 23:41:27Z rouault $
+ * $Id: pdfio.h 30441 2015-09-16 10:08:47Z rouault $
  *
  * Project:  PDF driver
  * Purpose:  GDALDataset driver for PDF dataset.
@@ -93,6 +93,10 @@ class VSIPDFFileStream: public BaseStream
         virtual void       close();
 
     private:
+        /* Added in poppler 0.15.0 */
+        virtual GBool hasGetChars();
+        virtual int getChars(int nChars, Guchar *buffer);
+
         VSIPDFFileStream  *poParent;
         GooString         *poFilename;
         VSILFILE          *f;
diff --git a/gcore/gdal_version.h b/gcore/gdal_version.h
index b84e277..7b8ad07 100644
--- a/gcore/gdal_version.h
+++ b/gcore/gdal_version.h
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20150915
+#  define GDAL_RELEASE_DATE     20150916
 #endif
 #ifndef GDAL_RELEASE_NAME
 #  define GDAL_RELEASE_NAME     "1.11.3"
diff --git a/man/man1/gdal-config.1 b/man/man1/gdal-config.1
index 7ce23f0..0c2cb38 100644
--- a/man/man1/gdal-config.1
+++ b/man/man1/gdal-config.1
@@ -1,4 +1,4 @@
-.TH "gdal-config" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal-config" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal2tiles.1 b/man/man1/gdal2tiles.1
index ad30d7a..b1f7ca4 100644
--- a/man/man1/gdal2tiles.1
+++ b/man/man1/gdal2tiles.1
@@ -1,4 +1,4 @@
-.TH "gdal2tiles" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal2tiles" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_calc.1 b/man/man1/gdal_calc.1
index e9bb80e..dc5ed85 100644
--- a/man/man1/gdal_calc.1
+++ b/man/man1/gdal_calc.1
@@ -1,4 +1,4 @@
-.TH "gdal_calc" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_calc" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_contour.1 b/man/man1/gdal_contour.1
index 89b5301..83d2c17 100644
--- a/man/man1/gdal_contour.1
+++ b/man/man1/gdal_contour.1
@@ -1,4 +1,4 @@
-.TH "gdal_contour" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_contour" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_edit.1 b/man/man1/gdal_edit.1
index 81ba552..33d14cb 100644
--- a/man/man1/gdal_edit.1
+++ b/man/man1/gdal_edit.1
@@ -1,4 +1,4 @@
-.TH "gdal_edit" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_edit" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_fillnodata.1 b/man/man1/gdal_fillnodata.1
index f0c0866..45f2f2d 100644
--- a/man/man1/gdal_fillnodata.1
+++ b/man/man1/gdal_fillnodata.1
@@ -1,4 +1,4 @@
-.TH "gdal_fillnodata" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_fillnodata" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_grid.1 b/man/man1/gdal_grid.1
index ac14d60..1a9207b 100644
--- a/man/man1/gdal_grid.1
+++ b/man/man1/gdal_grid.1
@@ -1,4 +1,4 @@
-.TH "gdal_grid" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_grid" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_merge.1 b/man/man1/gdal_merge.1
index 2cdbc45..f625894 100644
--- a/man/man1/gdal_merge.1
+++ b/man/man1/gdal_merge.1
@@ -1,4 +1,4 @@
-.TH "gdal_merge" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_merge" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_polygonize.1 b/man/man1/gdal_polygonize.1
index 076a37e..861eddd 100644
--- a/man/man1/gdal_polygonize.1
+++ b/man/man1/gdal_polygonize.1
@@ -1,4 +1,4 @@
-.TH "gdal_polygonize" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_polygonize" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_proximity.1 b/man/man1/gdal_proximity.1
index df177db..e7d5e67 100644
--- a/man/man1/gdal_proximity.1
+++ b/man/man1/gdal_proximity.1
@@ -1,4 +1,4 @@
-.TH "gdal_proximity" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_proximity" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_rasterize.1 b/man/man1/gdal_rasterize.1
index d1201db..430c642 100644
--- a/man/man1/gdal_rasterize.1
+++ b/man/man1/gdal_rasterize.1
@@ -1,4 +1,4 @@
-.TH "gdal_rasterize" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_rasterize" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_retile.1 b/man/man1/gdal_retile.1
index 802653d..6a69805 100644
--- a/man/man1/gdal_retile.1
+++ b/man/man1/gdal_retile.1
@@ -1,4 +1,4 @@
-.TH "gdal_retile" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_retile" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_sieve.1 b/man/man1/gdal_sieve.1
index c67c594..a434667 100644
--- a/man/man1/gdal_sieve.1
+++ b/man/man1/gdal_sieve.1
@@ -1,4 +1,4 @@
-.TH "gdal_sieve" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_sieve" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_translate.1 b/man/man1/gdal_translate.1
index 9b02a38..3f9b34e 100644
--- a/man/man1/gdal_translate.1
+++ b/man/man1/gdal_translate.1
@@ -1,4 +1,4 @@
-.TH "gdal_translate" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_translate" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdal_utilities.1 b/man/man1/gdal_utilities.1
index b8b289d..d4442ca 100644
--- a/man/man1/gdal_utilities.1
+++ b/man/man1/gdal_utilities.1
@@ -1,4 +1,4 @@
-.TH "gdal_utilities" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdal_utilities" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdaladdo.1 b/man/man1/gdaladdo.1
index 01e8f8c..908cb70 100644
--- a/man/man1/gdaladdo.1
+++ b/man/man1/gdaladdo.1
@@ -1,4 +1,4 @@
-.TH "gdaladdo" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdaladdo" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalbuildvrt.1 b/man/man1/gdalbuildvrt.1
index c75b31f..9ce6a38 100644
--- a/man/man1/gdalbuildvrt.1
+++ b/man/man1/gdalbuildvrt.1
@@ -1,4 +1,4 @@
-.TH "gdalbuildvrt" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalbuildvrt" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalcompare.1 b/man/man1/gdalcompare.1
index 37d307f..d0e54af 100644
--- a/man/man1/gdalcompare.1
+++ b/man/man1/gdalcompare.1
@@ -1,4 +1,4 @@
-.TH "gdalcompare" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalcompare" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdaldem.1 b/man/man1/gdaldem.1
index 9002539..ba52ba1 100644
--- a/man/man1/gdaldem.1
+++ b/man/man1/gdaldem.1
@@ -1,4 +1,4 @@
-.TH "gdaldem" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdaldem" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalinfo.1 b/man/man1/gdalinfo.1
index aec5ea5..815e6d1 100644
--- a/man/man1/gdalinfo.1
+++ b/man/man1/gdalinfo.1
@@ -1,4 +1,4 @@
-.TH "gdalinfo" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalinfo" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdallocationinfo.1 b/man/man1/gdallocationinfo.1
index 69c76eb..a60c2e4 100644
--- a/man/man1/gdallocationinfo.1
+++ b/man/man1/gdallocationinfo.1
@@ -1,4 +1,4 @@
-.TH "gdallocationinfo" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdallocationinfo" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalmanage.1 b/man/man1/gdalmanage.1
index 3313f27..2083ed6 100644
--- a/man/man1/gdalmanage.1
+++ b/man/man1/gdalmanage.1
@@ -1,4 +1,4 @@
-.TH "gdalmanage" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalmanage" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalmove.1 b/man/man1/gdalmove.1
index 7debfe6..1fcef5a 100644
--- a/man/man1/gdalmove.1
+++ b/man/man1/gdalmove.1
@@ -1,4 +1,4 @@
-.TH "gdalmove" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalmove" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalsrsinfo.1 b/man/man1/gdalsrsinfo.1
index 6ca154b..8dfc686 100644
--- a/man/man1/gdalsrsinfo.1
+++ b/man/man1/gdalsrsinfo.1
@@ -1,4 +1,4 @@
-.TH "gdalsrsinfo" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalsrsinfo" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdaltindex.1 b/man/man1/gdaltindex.1
index 511f96d..ce6a13a 100644
--- a/man/man1/gdaltindex.1
+++ b/man/man1/gdaltindex.1
@@ -1,4 +1,4 @@
-.TH "gdaltindex" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdaltindex" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdaltransform.1 b/man/man1/gdaltransform.1
index f3eaf4b..ac6eb5f 100644
--- a/man/man1/gdaltransform.1
+++ b/man/man1/gdaltransform.1
@@ -1,4 +1,4 @@
-.TH "gdaltransform" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdaltransform" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/gdalwarp.1 b/man/man1/gdalwarp.1
index f592f7d..c05e053 100644
--- a/man/man1/gdalwarp.1
+++ b/man/man1/gdalwarp.1
@@ -1,4 +1,4 @@
-.TH "gdalwarp" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "gdalwarp" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/nearblack.1 b/man/man1/nearblack.1
index 5973c5d..3378829 100644
--- a/man/man1/nearblack.1
+++ b/man/man1/nearblack.1
@@ -1,4 +1,4 @@
-.TH "nearblack" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "nearblack" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/ogr2ogr.1 b/man/man1/ogr2ogr.1
index 6037f80..c3fa071 100644
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
@@ -1,4 +1,4 @@
-.TH "ogr2ogr" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "ogr2ogr" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/ogr_utilities.1 b/man/man1/ogr_utilities.1
index 5778516..c6ddade 100644
--- a/man/man1/ogr_utilities.1
+++ b/man/man1/ogr_utilities.1
@@ -1,4 +1,4 @@
-.TH "ogr_utilities" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "ogr_utilities" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/ogrinfo.1 b/man/man1/ogrinfo.1
index f60c4fa..a9978b9 100644
--- a/man/man1/ogrinfo.1
+++ b/man/man1/ogrinfo.1
@@ -1,4 +1,4 @@
-.TH "ogrinfo" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "ogrinfo" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/ogrlineref.1 b/man/man1/ogrlineref.1
index dc5f3ff..63c8b30 100644
--- a/man/man1/ogrlineref.1
+++ b/man/man1/ogrlineref.1
@@ -1,4 +1,4 @@
-.TH "ogrlineref" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "ogrlineref" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/ogrtindex.1 b/man/man1/ogrtindex.1
index 3e24f32..a76b95e 100644
--- a/man/man1/ogrtindex.1
+++ b/man/man1/ogrtindex.1
@@ -1,4 +1,4 @@
-.TH "ogrtindex" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "ogrtindex" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/pct2rgb.1 b/man/man1/pct2rgb.1
index 9817f45..863681f 100644
--- a/man/man1/pct2rgb.1
+++ b/man/man1/pct2rgb.1
@@ -1,4 +1,4 @@
-.TH "pct2rgb" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "pct2rgb" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/man/man1/rgb2pct.1 b/man/man1/rgb2pct.1
index a464633..ff1de2f 100644
--- a/man/man1/rgb2pct.1
+++ b/man/man1/rgb2pct.1
@@ -1,4 +1,4 @@
-.TH "rgb2pct" 1 "Tue Sep 15 2015" "GDAL" \" -*- nroff -*-
+.TH "rgb2pct" 1 "Wed Sep 16 2015" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
diff --git a/ogr/ogr_srs_api.h b/ogr/ogr_srs_api.h
index 8fe73fd..dcfed4e 100644
--- a/ogr/ogr_srs_api.h
+++ b/ogr/ogr_srs_api.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogr_srs_api.h 27109 2014-03-28 20:26:34Z kyle $
+ * $Id: ogr_srs_api.h 30440 2015-09-16 09:59:19Z rouault $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  C API and constant declarations for OGR Spatial References.
@@ -136,6 +136,9 @@ typedef enum {
                                 "Lambert_Azimuthal_Equal_Area"
 #define SRS_PT_MERCATOR_1SP     "Mercator_1SP"
 #define SRS_PT_MERCATOR_2SP     "Mercator_2SP"
+// Mercator_Auxiliary_Sphere is used used by ESRI to mean EPSG:3875
+#define SRS_PT_MERCATOR_AUXILIARY_SPHERE                                 \
+                                "Mercator_Auxiliary_Sphere"
 #define SRS_PT_MILLER_CYLINDRICAL "Miller_Cylindrical"
 #define SRS_PT_MOLLWEIDE        "Mollweide"
 #define SRS_PT_NEW_ZEALAND_MAP_GRID                                     \
diff --git a/ogr/ogr_srs_esri.cpp b/ogr/ogr_srs_esri.cpp
index b8e4f51..20f02c5 100644
--- a/ogr/ogr_srs_esri.cpp
+++ b/ogr/ogr_srs_esri.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogr_srs_esri.cpp 27050 2014-03-18 00:09:03Z kyle $
+ * $Id: ogr_srs_esri.cpp 30440 2015-09-16 09:59:19Z rouault $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  OGRSpatialReference translation to/from ESRI .prj definitions.
@@ -36,7 +36,7 @@
 
 #include "ogr_srs_esri_names.h"
 
-CPL_CVSID("$Id: ogr_srs_esri.cpp 27050 2014-03-18 00:09:03Z kyle $");
+CPL_CVSID("$Id: ogr_srs_esri.cpp 30440 2015-09-16 09:59:19Z rouault $");
 
 void  SetNewName( OGRSpatialReference* pOgr, const char* keyName, const char* 
newName );
 int   RemapImgWGSProjcsName(OGRSpatialReference* pOgr, const char* 
pszProjCSName, 
@@ -835,6 +835,13 @@ OGRErr OGRSpatialReference::importFromESRI( char 
**papszPrj )
                      OSR_GDV( papszPrj, "PARAM_3", 0.0 ) );
     }
 
+    else if( EQUAL(osProj, SRS_PT_MERCATOR_AUXILIARY_SPHERE) )
+    {
+       // This is EPSG:3875 Pseudo Mercator. We might as well import it from
+       // the EPSG spec.
+       importFromEPSG(3857);
+    }
+
     else if( EQUAL(osProj,"POLYCONIC") )
     {
         SetPolyconic( OSR_GDV( papszPrj, "PARAM_2", 0.0 ),
@@ -1578,6 +1585,12 @@ OGRErr OGRSpatialReference::morphFromESRI()
         pszProjection = GetAttrValue("PROJECTION");
     }
 
+    if( pszProjection != NULL &&
+             EQUAL(pszProjection, SRS_PT_MERCATOR_AUXILIARY_SPHERE) )
+    {
+       return importFromEPSG(3857);
+    }
+
 /* -------------------------------------------------------------------- */
 /*      If we are remapping Hotine_Oblique_Mercator_Azimuth_Center      */
 /*      add a rectified_grid_angle parameter - to match the azimuth     */
diff --git a/swig/csharp/ogr/Osr.cs b/swig/csharp/ogr/Osr.cs
index 02a3f29..d2cd76a 100644
--- a/swig/csharp/ogr/Osr.cs
+++ b/swig/csharp/ogr/Osr.cs
@@ -160,6 +160,7 @@ public delegate int GDALProgressFuncDelegate(double 
Complete, IntPtr Message, In
   public const string SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA = 
"Lambert_Azimuthal_Equal_Area";
   public const string SRS_PT_MERCATOR_1SP = "Mercator_1SP";
   public const string SRS_PT_MERCATOR_2SP = "Mercator_2SP";
+  public const string SRS_PT_MERCATOR_AUXILIARY_SPHERE = 
"Mercator_Auxiliary_Sphere";
   public const string SRS_PT_MILLER_CYLINDRICAL = "Miller_Cylindrical";
   public const string SRS_PT_MOLLWEIDE = "Mollweide";
   public const string SRS_PT_NEW_ZEALAND_MAP_GRID = "New_Zealand_Map_Grid";
diff --git a/swig/csharp/osr/Osr.cs b/swig/csharp/osr/Osr.cs
index 42d9b71..b59c263 100644
--- a/swig/csharp/osr/Osr.cs
+++ b/swig/csharp/osr/Osr.cs
@@ -160,6 +160,7 @@ public delegate int GDALProgressFuncDelegate(double 
Complete, IntPtr Message, In
   public const string SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA = 
"Lambert_Azimuthal_Equal_Area";
   public const string SRS_PT_MERCATOR_1SP = "Mercator_1SP";
   public const string SRS_PT_MERCATOR_2SP = "Mercator_2SP";
+  public const string SRS_PT_MERCATOR_AUXILIARY_SPHERE = 
"Mercator_Auxiliary_Sphere";
   public const string SRS_PT_MILLER_CYLINDRICAL = "Miller_Cylindrical";
   public const string SRS_PT_MOLLWEIDE = "Mollweide";
   public const string SRS_PT_NEW_ZEALAND_MAP_GRID = "New_Zealand_Map_Grid";
diff --git a/swig/include/python/ogr_python.i b/swig/include/python/ogr_python.i
index 7c1876c..cd8da8a 100644
--- a/swig/include/python/ogr_python.i
+++ b/swig/include/python/ogr_python.i
@@ -1,5 +1,5 @@
 /*
- * $Id: ogr_python.i 28298 2015-01-06 09:03:37Z rouault $
+ * $Id: ogr_python.i 30442 2015-09-16 10:14:34Z rouault $
  *
  * python specific code for ogr bindings.
  */
@@ -66,9 +66,9 @@
 
     def __getitem__(self, value):
         """Support dictionary, list, and slice -like access to the datasource.
-ds[0] would return the first layer on the datasource.
-ds['aname'] would return the layer named "aname".
-ds[0:4] would return a list of the first four layers."""
+        ds[0] would return the first layer on the datasource.
+        ds['aname'] would return the layer named "aname".
+        ds[0:4] would return a list of the first four layers."""
         if isinstance(value, slice):
             output = []
             for i in xrange(value.start,value.stop,value.step):
@@ -134,8 +134,8 @@ ds[0:4] would return a list of the first four layers."""
 
     def __getitem__(self, value):
         """Support list and slice -like access to the layer.
-layer[0] would return the first feature on the layer.
-layer[0:4] would return a list of the first four features."""
+        layer[0] would return the first feature on the layer.
+        layer[0:4] would return a list of the first four features."""
         if isinstance(value, slice):
             import sys
             output = []
diff --git a/swig/perl/lib/Geo/OSR.pm b/swig/perl/lib/Geo/OSR.pm
index f8cb864..034e7b2 100644
--- a/swig/perl/lib/Geo/OSR.pm
+++ b/swig/perl/lib/Geo/OSR.pm
@@ -286,6 +286,7 @@ package Geo::OSR;
 *SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA = 
*Geo::OSRc::SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA;
 *SRS_PT_MERCATOR_1SP = *Geo::OSRc::SRS_PT_MERCATOR_1SP;
 *SRS_PT_MERCATOR_2SP = *Geo::OSRc::SRS_PT_MERCATOR_2SP;
+*SRS_PT_MERCATOR_AUXILIARY_SPHERE = 
*Geo::OSRc::SRS_PT_MERCATOR_AUXILIARY_SPHERE;
 *SRS_PT_MILLER_CYLINDRICAL = *Geo::OSRc::SRS_PT_MILLER_CYLINDRICAL;
 *SRS_PT_MOLLWEIDE = *Geo::OSRc::SRS_PT_MOLLWEIDE;
 *SRS_PT_NEW_ZEALAND_MAP_GRID = *Geo::OSRc::SRS_PT_NEW_ZEALAND_MAP_GRID;
diff --git a/swig/perl/osr_wrap.cpp b/swig/perl/osr_wrap.cpp
index a845a27..3478861 100644
--- a/swig/perl/osr_wrap.cpp
+++ b/swig/perl/osr_wrap.cpp
@@ -13774,6 +13774,11 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SRS_PT_MERCATOR_AUXILIARY_SPHERE", 
TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("Mercator_Auxiliary_Sphere"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SRS_PT_MILLER_CYLINDRICAL", TRUE | 
0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Miller_Cylindrical"));
     SvREADONLY_on(sv);
diff --git a/swig/python/extensions/osr_wrap.cpp 
b/swig/python/extensions/osr_wrap.cpp
index 4eece55..b37e779 100644
--- a/swig/python/extensions/osr_wrap.cpp
+++ b/swig/python/extensions/osr_wrap.cpp
@@ -13861,6 +13861,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, 
"SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA",SWIG_FromCharPtr("Lambert_Azimuthal_Equal_Area"));
   SWIG_Python_SetConstant(d, 
"SRS_PT_MERCATOR_1SP",SWIG_FromCharPtr("Mercator_1SP"));
   SWIG_Python_SetConstant(d, 
"SRS_PT_MERCATOR_2SP",SWIG_FromCharPtr("Mercator_2SP"));
+  SWIG_Python_SetConstant(d, 
"SRS_PT_MERCATOR_AUXILIARY_SPHERE",SWIG_FromCharPtr("Mercator_Auxiliary_Sphere"));
   SWIG_Python_SetConstant(d, 
"SRS_PT_MILLER_CYLINDRICAL",SWIG_FromCharPtr("Miller_Cylindrical"));
   SWIG_Python_SetConstant(d, "SRS_PT_MOLLWEIDE",SWIG_FromCharPtr("Mollweide"));
   SWIG_Python_SetConstant(d, 
"SRS_PT_NEW_ZEALAND_MAP_GRID",SWIG_FromCharPtr("New_Zealand_Map_Grid"));
diff --git a/swig/python/osgeo/ogr.py b/swig/python/osgeo/ogr.py
index 28e6f78..342f168 100644
--- a/swig/python/osgeo/ogr.py
+++ b/swig/python/osgeo/ogr.py
@@ -815,9 +815,9 @@ class DataSource(_object):
 
     def __getitem__(self, value):
         """Support dictionary, list, and slice -like access to the datasource.
-    ] would return the first layer on the datasource.
-    aname'] would return the layer named "aname".
-    :4] would return a list of the first four layers."""
+        ds[0] would return the first layer on the datasource.
+        ds['aname'] would return the layer named "aname".
+        ds[0:4] would return a list of the first four layers."""
         if isinstance(value, slice):
             output = []
             for i in xrange(value.start,value.stop,value.step):
@@ -2035,8 +2035,8 @@ class Layer(_object):
 
     def __getitem__(self, value):
         """Support list and slice -like access to the layer.
-    r[0] would return the first feature on the layer.
-    r[0:4] would return a list of the first four features."""
+        layer[0] would return the first feature on the layer.
+        layer[0:4] would return a list of the first four features."""
         if isinstance(value, slice):
             import sys
             output = []
diff --git a/swig/python/osgeo/osr.py b/swig/python/osgeo/osr.py
index 58ad949..ed52541 100644
--- a/swig/python/osgeo/osr.py
+++ b/swig/python/osgeo/osr.py
@@ -96,6 +96,7 @@ SRS_PT_LAMBERT_CONFORMAL_CONIC_2SP_BELGIUM = 
_osr.SRS_PT_LAMBERT_CONFORMAL_CONIC
 SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA = _osr.SRS_PT_LAMBERT_AZIMUTHAL_EQUAL_AREA
 SRS_PT_MERCATOR_1SP = _osr.SRS_PT_MERCATOR_1SP
 SRS_PT_MERCATOR_2SP = _osr.SRS_PT_MERCATOR_2SP
+SRS_PT_MERCATOR_AUXILIARY_SPHERE = _osr.SRS_PT_MERCATOR_AUXILIARY_SPHERE
 SRS_PT_MILLER_CYLINDRICAL = _osr.SRS_PT_MILLER_CYLINDRICAL
 SRS_PT_MOLLWEIDE = _osr.SRS_PT_MOLLWEIDE
 SRS_PT_NEW_ZEALAND_MAP_GRID = _osr.SRS_PT_NEW_ZEALAND_MAP_GRID

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/gdal.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to