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

* 'master' of github.com:OSGeo/gdal: gdal/doc/source/tutorials/osr_api_tut.rst - add a reference to "CRS27", "CRS83" or "CRS84" in the "CRS and axis order" section gdal/ogr/ogrspatialreference.cpp - SetWellKnownGeogCS: update the docs, reformat WKT strings. DXF: Fix crash on malformed file (fixes OSGeo#3936) Internal libtiff: fix when writing a IFD with a single tile that is a sparse one, on big endian hosts (fixes failures in cog.py tests)
a0x8o · Jun 10, 2022 · 862b49e · 862b49e
1 parent 3e786b1
commit 862b49e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/ci/travis/graviton2/install.sh b/ci/travis/graviton2/install.sh
@@ -27,7 +27,11 @@ sudo sh -c "apt-get remove -y libproj-dev"
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Configure GDAL
+<<<<<<< HEAD:ci/travis/graviton2/install.sh
 sh -c "cd $PWD && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+=======
+sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+>>>>>>> 66a76c0d6d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ci/travis/graviton2/install.sh
 
 sh -c "cd $PWD && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3"
 sh -c "cd $PWD/apps && make USER_DEFS=-Werror -j3 test_ogrsf"

diff --git a/ci/travis/s390x/install.sh b/ci/travis/s390x/install.sh
@@ -27,7 +27,11 @@ sudo sh -c "apt-get remove -y libproj-dev"
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Configure GDAL
+<<<<<<< HEAD:ci/travis/s390x/install.sh
 sh -c "cd $PWD && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+=======
+sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols"
+>>>>>>> 66a76c0d6d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ci/travis/s390x/install.sh
 
 sh -c "cd $PWD && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3"
 sh -c "cd $PWD/apps && make USER_DEFS=-Werror -j3 test_ogrsf"

diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
@@ -219,10 +219,14 @@ int OGRDXFReader::ReadValueRaw( char *pszValueBuf, int nValueBufSize )
 <<<<<<< HEAD:ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
 =======
 
-        // If nothing was read, we have reached the end of the file
+        // If nothing was read, we have prematurely reached the end of the file
         if( iEOL == iSrcBufferOffset )
+<<<<<<< HEAD:ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
             break;
 >>>>>>> 137c8e8f4e (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
+=======
+            return -1;
+>>>>>>> 66a76c0d6d (Merge branch 'master' of github.com:OSGeo/gdal):gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
     }
 
     size_t nValueBufLen = 0;