Merge branch 'master' of github.com:OSGeo/gdal

* 'master' of github.com:OSGeo/gdal: JPEG2000 drivers: use modern Get/SetSpatialRef() API. No functional change GTiff: rework signature of GTIFSetFromOGISDefnEx() for future change. No functional change /vsiswift/: Fix openstack swift endpoint detection, add application_credential authentication support (OSGeo#3960) RFC83: update status as adopted tiff_write.py: fix deletion of temp files on Windows COG: don't crash if GDALCreateGenImgProjTransformer2() fails Shapefile: fix wrong SRS when reading a WGS 84 SRS with a TOWGS84[0,0,0,0,0,0,0] (fixes OSGeo#3958) rfc83: add note on which input is taken into account rfc83: use gender neutral terms rfc83: other typo fixes rfc83: other typo fixes Take into account mloskot's suggestions Typos Add RFC 83: guidelines for the use of GDAL project sponsorship
a0x8o · Jun 10, 2022 · 1ff20a7 · 1ff20a7
1 parent 01a6ad8
commit 1ff20a7
Show file tree

Hide file tree

Showing 7 changed files with 1,584 additions and 0 deletions.
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
@@ -3826,6 +3826,7 @@ def test_ogr_shape_wgs84_with_zero_TOWGS84():
     assert '4326' in got_wkt
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/test_ogr_shape_wgs84_with_zero_TOWGS84.shp')
+<<<<<<< HEAD
 
 ###############################################################################
 # Test a ETRS89-based CRS with a TOWGS84[0,0,0,0,0,0]
@@ -3846,6 +3847,8 @@ def test_ogr_shape_etrs89_with_zero_TOWGS84():
     ds = None
 
     ogr.GetDriverByName('ESRI Shapefile').DeleteDataSource('/vsimem/test_ogr_shape_etrs89_with_zero_TOWGS84.shp')
+=======
+>>>>>>> 3d5cfd648d (Merge branch 'master' of github.com:OSGeo/gdal)
 
 ###############################################################################
 # Test REPACK with both implementations

diff --git a/doc/source/development/rfc/index.rst b/doc/source/development/rfc/index.rst
@@ -88,7 +88,11 @@ RFC list
     rfc78_gdal_utils_package
     rfc79_listing_service_providers
     rfc80_numfocus_relationship
+<<<<<<< HEAD:doc/source/development/rfc/index.rst
     rfc81_coordinate_epoch
     rfc83_use_of_project_sponsorship
     rfc84_cmake
     rfc85_policy_code_additions
+=======
+    rfc83_use_of_project_sponsorship
+>>>>>>> 3d5cfd648d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/doc/source/development/rfc/index.rst
diff --git a/frmts/gtiff/gt_wkt_srs.cpp b/frmts/gtiff/gt_wkt_srs.cpp
@@ -3410,9 +3410,12 @@ CPLErr GTIFMemBufFromSRS( OGRSpatialReferenceH hSRS, const double *padfGeoTransf
     if( hSRS != nullptr || bPixelIsPoint )
     {
         hGTIF = GTIFNew(hTIFF);
+<<<<<<< HEAD:frmts/gtiff/gt_wkt_srs.cpp
         if (hGTIF)
             GTIFAttachPROJContext(hGTIF, OSRGetProjTLSContext());
 
+=======
+>>>>>>> 3d5cfd648d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/frmts/gtiff/gt_wkt_srs.cpp
         if( hSRS != nullptr )
             GTIFSetFromOGISDefnEx( hGTIF, hSRS,
                                    GEOTIFF_KEYS_STANDARD,