innFactory · pull · Nov 2, 2023 · Oct 31, 2023 · Oct 31, 2023 · Oct 31, 2023
diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
@@ -498,6 +498,7 @@ class SetupTargetLayer
     GDALDataset *m_poDstDS;
     char **m_papszLCO;
     OGRSpatialReference *m_poOutputSRS;
+    bool m_bTransform = false;
     bool m_bNullifyOutputSRS;
     bool m_bSelFieldsSet = false;
     char **m_papszSelFields;
@@ -2753,6 +2754,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
     oSetup.m_poDstDS = poODS;
     oSetup.m_papszLCO = psOptions->aosLCO.List();
     oSetup.m_poOutputSRS = oOutputSRSHolder.get();
+    oSetup.m_bTransform = psOptions->bTransform;
     oSetup.m_bNullifyOutputSRS = psOptions->bNullifyOutputSRS;
     oSetup.m_bSelFieldsSet = psOptions->bSelFieldsSet;
     oSetup.m_papszSelFields = psOptions->aosSelFields.List();
@@ -4417,7 +4419,9 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
 
         // Cf https://github.com/OSGeo/gdal/issues/6859
         // warn if the user requests -t_srs but the driver uses a different SRS.
-        if (m_poOutputSRS != nullptr && !psOptions->bQuiet)
+        if (m_poOutputSRS != nullptr && m_bTransform && !psOptions->bQuiet &&
+            // MapInfo is somewhat lossy regarding SRS, so do not warn
+            !EQUAL(m_poDstDS->GetDriver()->GetDescription(), "MapInfo File"))
         {
             auto poCreatedSRS = poDstLayer->GetSpatialRef();
             if (poCreatedSRS != nullptr)

diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
@@ -1232,3 +1232,7 @@ def progress(pct, msg, user_data):
     assert gdal.VSIStatL(dstfilename).size != 1000 * 1000
 
     gdal.Unlink(dstfilename)
+
+
+def test_vsimem_illegal_filename():
+    assert gdal.FileFromMemBuffer("/vsimem/\\\\", "foo") == -1
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
@@ -9509,12 +9509,18 @@ def test_ogr_gpkg_sql_exact_spatial_filter_for_feature_count(tmp_vsimem):
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt("LINESTRING (0.1 0.25,0.15 0.25)"))
     lyr.CreateFeature(f)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("LINESTRING (0.12 0.25,1 1)"))
+    lyr.CreateFeature(f)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("LINESTRING EMPTY"))
+    lyr.CreateFeature(f)
     ds = None
 
     ds = ogr.Open(filename)
     lyr = ds.GetLayer(0)
     lyr.SetSpatialFilterRect(0.1, 0.2, 0.15, 0.3)
-    assert lyr.GetFeatureCount() == 1
+    assert lyr.GetFeatureCount() == 2
 
 
 ###############################################################################

diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
@@ -1536,6 +1536,10 @@ def test_ogr_parquet_read_partitioned_flat(use_vsi, use_metadata_file, prefix):
             assert lyr.GetNextFeature() is None
             lyr.ResetReading()
 
+        s = lyr.GetArrowStream()
+        assert s.GetSchema().GetChildrenCount() == 2
+        del s
+
 
 ###############################################################################
 # Test reading a HIVE partitioned dataset

diff --git a/doc/source/download.rst b/doc/source/download.rst
@@ -315,15 +315,15 @@ GDAL master Conda builds
 GDAL master builds are available in the `gdal-master <https://anaconda.org/gdal-master/gdal>`__
 channel. They are based on dependencies from the ``conda-forge`` channel.
 
-First create a dedicated ``gdal_master_env`` environment, activate it and install
-the ``mamba`` package manager.
+First, install mamba into the ``base`` environment, create a dedicated ``gdal_master_env`` 
+environment, and then activate the dedicated ``gdal_master_env`` environment.
 
 ::
 
     conda update -n base -c conda-forge conda
+    conda install -n base --override-channels -c conda-forge mamba 'python_abi=*=*cp*'
     conda create --name gdal_master_env
     conda activate gdal_master_env
-    conda install -c conda-forge mamba
 
 Then install GDAL from the ``gdal-master`` channel:
 

diff --git a/frmts/gtiff/libgeotiff/geo_extra.c b/frmts/gtiff/libgeotiff/geo_extra.c
@@ -27,11 +27,7 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-/*
-#include "geotiff.h"
-#include "geo_tiffp.h"
-#include "geo_keyp.h"
-*/
+#include <stddef.h>
 
 #include "geo_normalize.h"
 #include "geovalues.h"
@@ -428,10 +424,8 @@ int	GTIFMapSysToPCS( int MapSys, int Datum, int nZone )
     }
     else if( MapSys == MapSys_State_Plane_27 )
     {
-	int		i;
-
         PCSCode = 10000 + nZone;
-	for( i = 0; StatePlaneTable[i] != KvUserDefined; i += 2 )
+	for( int i = 0; StatePlaneTable[i] != KvUserDefined; i += 2 )
 	{
 	    if( StatePlaneTable[i+1] == PCSCode )
 	        PCSCode = StatePlaneTable[i];
@@ -443,11 +437,9 @@ int	GTIFMapSysToPCS( int MapSys, int Datum, int nZone )
     }
     else if( MapSys == MapSys_State_Plane_83 )
     {
-	int		i;
-
         PCSCode = 10000 + nZone + 30;
 
-	for( i = 0; StatePlaneTable[i] != KvUserDefined; i += 2 )
+	for( int i = 0; StatePlaneTable[i] != KvUserDefined; i += 2 )
 	{
 	    if( StatePlaneTable[i+1] == PCSCode )
 	        PCSCode = StatePlaneTable[i];
@@ -540,7 +532,7 @@ int GTIFPCSToMapSys( int PCSCode, int * pDatum, int * pZone )
 
 {
     int		Datum = KvUserDefined, Proj = KvUserDefined;
-    int		nZone = KvUserDefined, i;
+    int		nZone = KvUserDefined;
 
 /* -------------------------------------------------------------------- */
 /*      UTM with various datums.  Note there are lots of PCS UTM        */
@@ -623,7 +615,7 @@ int GTIFPCSToMapSys( int PCSCode, int * pDatum, int * pZone )
 /*      State Plane zones, first we translate any PCS_ codes to		*/
 /*	a Proj_ code that we can get a handle on.			*/
 /* -------------------------------------------------------------------- */
-    for( i = 0; StatePlaneTable[i] != KvUserDefined; i += 2 )
+    for( int i = 0; StatePlaneTable[i] != KvUserDefined; i += 2 )
     {
 	if( StatePlaneTable[i] == PCSCode )
 	    PCSCode = StatePlaneTable[i+1];

diff --git a/frmts/gtiff/libgeotiff/geo_free.c b/frmts/gtiff/libgeotiff/geo_free.c
@@ -37,8 +37,6 @@ called on the corresponding TIFF file handle.<p>
 
 void GTIFFree(GTIF* gtif)
 {
-    int     i;
-
     if (!gtif) return;
 
     /* Free parameter arrays */
@@ -48,7 +46,7 @@ void GTIFFree(GTIF* gtif)
     /* Free GeoKey arrays */
     if (gtif->gt_keys)
     {
-        for (i = 0; i < MAX_KEYS; i++)
+        for (int i = 0; i < MAX_KEYS; i++)
         {
             if (gtif->gt_keys[i].gk_type == TYPE_ASCII)
             {

diff --git a/frmts/gtiff/libgeotiff/geo_get.c b/frmts/gtiff/libgeotiff/geo_get.c
@@ -9,14 +9,10 @@
  *  Permission granted to use this software, so long as this copyright
  *  notice accompanies any products derived therefrom.
  *
- *  Revision History;
- *
- *    20 June, 1995      Niles D. Ritter         New
- *    3 July,  1995      Greg Martin             Fix strings and index
- *    6 July,  1995      Niles D. Ritter         Unfix indexing.
- *
  **********************************************************************/
 
+#include <stddef.h>
+
 #include "geotiff.h"   /* public interface        */
 #include "geo_tiffp.h" /* external TIFF interface */
 #include "geo_keyp.h"  /* private interface       */
@@ -38,11 +34,10 @@ void GTIFDirectoryInfo(GTIF *gtif, int version[3], int *keycount)
 int GTIFKeyInfo(GTIF *gtif, geokey_t key, int *size, tagtype_t* type)
 {
         int nIndex = gtif->gt_keyindex[ key ];
-        GeoKey *keyptr;
 
         if (!nIndex) return 0;
 
-        keyptr = gtif->gt_keys + nIndex;
+        GeoKey *keyptr = gtif->gt_keys + nIndex;
         if (size) *size = (int) keyptr->gk_size;
         if (type) *type = keyptr->gk_type;
 
@@ -144,26 +139,26 @@ ValuePair(  VerticalCSTypeGeoKey,	4096)  -- Section 6.3.4.1 codes   --
 ValuePair(  VerticalCitationGeoKey,	4097)  -- documentation --
 ValuePair(  VerticalDatumGeoKey,	4098)  -- Section 6.3.4.2 codes   --
 ValuePair(  VerticalUnitsGeoKey,	4099)  -- Section 6.3.1 (.x) codes   --
+
+See https://github.com/opengeospatial/geotiff/pull/99
+ValuePair(  CoordinateEpochGeoKey, 5120)  -- GeoKey of type double
 </pre>
 */
 
 int GTIFKeyGet(GTIF *gtif, geokey_t thekey, void *val, int nIndex, int count)
 {
-        int kindex = gtif->gt_keyindex[ thekey ];
-        GeoKey *key;
-        gsize_t size;
-        char *data;
-        tagtype_t type;
+        const int kindex = gtif->gt_keyindex[ thekey ];
 
         if (!kindex) return 0;
 
-        key = gtif->gt_keys+kindex;
+        GeoKey *key = gtif->gt_keys+kindex;
         if (!count) count = (int) (key->gk_count - nIndex);
         if (count <=0) return 0;
         if (count > key->gk_count) count = (int) key->gk_count;
-        size = key->gk_size;
-        type = key->gk_type;
+        const gsize_t size = key->gk_size;
+        const tagtype_t type = key->gk_type;
 
+        char *data;
         if (count==1 && type==TYPE_SHORT) data = (char *)&key->gk_data;
         else data = key->gk_data;
 

diff --git a/frmts/gtiff/libgeotiff/geo_names.c b/frmts/gtiff/libgeotiff/geo_names.c
@@ -46,12 +46,11 @@ static const KeyInfo _tagInfo[] =  {
 
 static const char *FindName(const KeyInfo *info,int key)
 {
-   static char errmsg[80];
-
    while (info->ki_key>=0 && info->ki_key != key) info++;
 
    if (info->ki_key<0)
    {
+	   static char errmsg[80];
 	   sprintf(errmsg,"Unknown-%d", key );
 	   return errmsg;
    }
@@ -163,7 +162,6 @@ static void GetNameFromDatabase(GTIF* gtif,
 
 const char *GTIFValueNameEx(GTIF* gtif, geokey_t key, int value)
 {
-    const KeyInfo *info = FindTable(key);
     int useHardcodedTables = 0;
 
     if( value == KvUndefined || value == KvUserDefined )
@@ -187,6 +185,8 @@ const char *GTIFValueNameEx(GTIF* gtif, geokey_t key, int value)
     {
         useHardcodedTables = 1;
     }
+
+    const KeyInfo *info = FindTable(key);
     if( useHardcodedTables )
     {
         while (info->ki_key>=0 && info->ki_key != value) info++;

diff --git a/frmts/gtiff/libgeotiff/geo_new.c b/frmts/gtiff/libgeotiff/geo_new.c
@@ -9,12 +9,11 @@
  *  Permission granted to use this software, so long as this copyright
  *  notice accompanies any products derived therefrom.
  *
- *    20 June, 1995      Niles D. Ritter         New
- *    7 July,  1995      Greg Martin             Fix index
- *
  **********************************************************************/
 
 #include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "geotiffio.h"   /* public interface        */
 #include "geo_tiffp.h" /* external TIFF interface */
@@ -28,8 +27,8 @@ static int ReadKey(GTIF* gt, TempKeyData* tempData,
 
 static void GTIFErrorFunction(GTIF* gt, int level, const char* msg, ...)
 {
-    va_list list;
     (void)gt;
+    va_list list;
 
     va_start(list, msg);
     if( level == LIBGEOTIFF_WARNING )
@@ -110,17 +109,12 @@ GTIF* GTIFNewWithMethods(void *tif, TIFFMethod* methods)
 GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
                            GTErrorCallback error_callback, void* user_data)
 {
-    GTIF* gt;
-    int count,bufcount,nIndex;
-    GeoKey *keyptr;
-    pinfo_t *data;
-    KeyEntry *entptr;
-    KeyHeader *header;
     TempKeyData tempData;
-
     memset( &tempData, 0, sizeof(tempData) );
-    gt = (GTIF*)_GTIFcalloc( sizeof(GTIF));
+
+    GTIF* gt = (GTIF*)_GTIFcalloc( sizeof(GTIF));
     if (!gt) goto failure;
+
     gt->gt_error_callback = error_callback;
     gt->gt_user_data = user_data;
 
@@ -129,13 +123,14 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
     memcpy( &gt->gt_methods, methods, sizeof(TIFFMethod) );
 
     /* since this is an array, GTIF will allocate the memory */
+    pinfo_t *data;
     if ( tif == NULL
          || !(gt->gt_methods.get)(tif, GTIFF_GEOKEYDIRECTORY, &gt->gt_nshorts, &data ))
     {
         /* No ProjectionInfo, create a blank one */
         data=(pinfo_t*)_GTIFcalloc((4+MAX_VALUES)*sizeof(pinfo_t));
         if (!data) goto failure;
-        header = (KeyHeader *)data;
+        KeyHeader *header = (KeyHeader *)data;
         header->hdr_version = GvCurrentVersion;
         header->hdr_rev_major = GvCurrentRevision;
         header->hdr_rev_minor = GvCurrentMinorRev;
@@ -147,7 +142,7 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
         data = (pinfo_t*) _GTIFrealloc(data,(4+MAX_VALUES)*sizeof(pinfo_t));
     }
     gt->gt_short = data;
-    header = (KeyHeader *)data;
+    KeyHeader *header = (KeyHeader *)data;
 
     if (header->hdr_version > GvCurrentVersion) goto failure;
     if (header->hdr_rev_major > GvCurrentRevision)
@@ -156,7 +151,7 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
     }
 
     /* If we got here, then the geokey can be parsed */
-    count = header->hdr_num_keys;
+    const int count = header->hdr_num_keys;
 
     if (count * sizeof(KeyEntry) >= (4 + MAX_VALUES) * sizeof(pinfo_t))
         goto failure;
@@ -166,7 +161,7 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
     gt->gt_rev_major  = header->hdr_rev_major;
     gt->gt_rev_minor  = header->hdr_rev_minor;
 
-    bufcount = count+MAX_KEYS; /* allow for expansion */
+    const int bufcount = count + MAX_KEYS; /* allow for expansion */
 
     /* Get the PARAMS Tags, if any */
     if (tif == NULL
@@ -184,6 +179,7 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
         gt->gt_double = (double*) _GTIFrealloc(gt->gt_double,
                                                (MAX_VALUES)*sizeof(double));
     }
+
     if ( tif == NULL
          || !(gt->gt_methods.get)(tif, GTIFF_ASCIIPARAMS,
                                   &tempData.tk_asciiParamsLength,
@@ -209,11 +205,11 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
     if (!gt->gt_keyindex) goto failure;
 
     /*  Loop to get all GeoKeys */
-    entptr = ((KeyEntry *)data) + 1;
-    keyptr = gt->gt_keys;
+    KeyEntry *entptr = ((KeyEntry *)data) + 1;
+    GeoKey *keyptr = gt->gt_keys;
     gt->gt_keymin = MAX_KEYINDEX;
     gt->gt_keymax = 0;
-    for (nIndex=1; nIndex<=count; nIndex++,entptr++)
+    for (int nIndex=1; nIndex<=count; nIndex++,entptr++)
     {
         if (!ReadKey(gt, &tempData, entptr, ++keyptr))
             goto failure;
@@ -249,12 +245,10 @@ GTIF* GTIFNewWithMethodsEx(void *tif, TIFFMethod* methods,
 static int ReadKey(GTIF* gt, TempKeyData* tempData,
                    KeyEntry* entptr, GeoKey* keyptr)
 {
-    int offset,count;
-
     keyptr->gk_key = entptr->ent_key;
     keyptr->gk_count = entptr->ent_count;
-    count = entptr->ent_count;
-    offset = entptr->ent_val_offset;
+    int count = entptr->ent_count;
+    const int offset = entptr->ent_val_offset;
     if (gt->gt_keymin > keyptr->gk_key)  gt->gt_keymin=keyptr->gk_key;
     if (gt->gt_keymax < keyptr->gk_key)  gt->gt_keymax=keyptr->gk_key;