[pull] master from OSGeo:master

.github/workflows/linux_build.yml

@@ -338,11 +338,13 @@ jobs:
             ${TEST_CMD}
 
       - name: Coveralls
-        uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2.2.3
+        uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0
         if: ${{ matrix.id == 'coverage' }}
         with:
           format: lcov
           file: build-coverage/gdal_filtered.info
+          # Pin to v0.6.10 because of issue with v0.6.11 (https://github.com/coverallsapp/coverage-reporter/issues/127)
+          coverage-reporter-version: v0.6.10
 
       - name: Push build environment
         if: github.event_name == 'push'

ci/travis/conda/setup.sh

@@ -6,6 +6,9 @@ conda config --show-sources
 
 rm -f ~/.condarc
 
+# Cf https://github.com/conda-forge/gdal-feedstock/pull/939
+conda config --add channels conda-forge/label/numpy_rc
+
 conda config --show-sources
 
 conda config --show

gcore/gdaldataset.cpp

@@ -2656,7 +2656,8 @@ CPLErr GDALDataset::ValidateRasterIOOrAdviseReadParameters(
  *
  * @param eBufType the type of the pixel values in the pData data buffer. The
  * pixel values will automatically be translated to/from the GDALRasterBand
- * data type as needed.
+ * data type as needed. Most driver implementations will use GDALCopyWords64()
+ * to perform data type translation.
  *
  * @param nBandCount the number of bands being read or written.
  *

gcore/gdalrasterband.cpp

@@ -199,7 +199,8 @@ GDALRasterBand::~GDALRasterBand()
  *
  * @param eBufType the type of the pixel values in the pData data buffer. The
  * pixel values will automatically be translated to/from the GDALRasterBand
- * data type as needed.
+ * data type as needed. Most driver implementations will use GDALCopyWords64()
+ * to perform data type translation.
  *
  * @param nPixelSpace The byte offset from the start of one pixel value in
  * pData to the start of the next pixel value within a scanline. If defaulted

gcore/rasterio.cpp

@@ -3270,15 +3270,27 @@ void CPL_STDCALL GDALCopyWords(const void *CPL_RESTRICT pSrcData,
  *
  * This function is used to copy pixel word values from one memory buffer
  * to another, with support for conversion between data types, and differing
- * step factors.  The data type conversion is done using the normal GDAL
- * rules.  Values assigned to a lower range integer type are clipped.  For
+ * step factors. The data type conversion is done using the following
+ * rules:
+ * <ul>
+ * <li>Values assigned to a lower range integer type are clipped. For
  * instance assigning GDT_Int16 values to a GDT_Byte buffer will cause values
  * less the 0 to be set to 0, and values larger than 255 to be set to 255.
- * Assignment from floating point to integer uses default C type casting
- * semantics.   Assignment from non-complex to complex will result in the
- * imaginary part being set to zero on output.  Assignment from complex to
+ * </li>
+ * <li>
+ * Assignment from floating point to integer rounds to closest integer.
+ * +Infinity is mapped to the largest integer. -Infinity is mapped to the
+ * smallest integer. NaN is mapped to 0.
+ * </li>
+ * <li>
+ * Assignment from non-complex to complex will result in the imaginary part
+ * being set to zero on output.
+ * </li>
+ * <li> Assignment from complex to
  * non-complex will result in the complex portion being lost and the real
  * component being preserved (<i>not magnitude!</i>).
+ * </li>
+ * </ul>
  *
  * No assumptions are made about the source or destination words occurring
  * on word boundaries.  It is assumed that all values are in native machine

ogr/ogrsf_frmts/miramon/mm_wrlayr.c

@@ -4409,7 +4409,10 @@ static int MMCreateRecordDBF(struct MiraMonVectLayerInfo *hMiraMonLayer,
     if (hMiraMonLayer->TopHeader.nElemCount == 0)
     {
         if (MMCreateMMDB(hMiraMonLayer, nullptr))
+        {
+            MMDestroyMMDB(hMiraMonLayer);
             return MM_FATAL_ERROR_WRITING_FEATURES;
+        }
     }
 
     result = MMAddDBFRecordToMMDB(hMiraMonLayer, hMMFeature);