ogr/ogrsf_frmts/generic: enable -Wdouble-promotion

Author: rouault

ogr/ogrsf_frmts/generic/CMakeLists.txt

@@ -44,7 +44,7 @@ add_library(
   ograrrowarrayhelper.cpp)
 gdal_standard_includes(ogrsf_generic)
 add_dependencies(ogrsf_generic generate_gdal_version_h)
-target_compile_options(ogrsf_generic PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
+target_compile_options(ogrsf_generic PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX} ${WFLAG_DOUBLE_PROMOTION})
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:ogrsf_generic>)
 set_property(TARGET ogrsf_generic PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
 

ogr/ogrsf_frmts/generic/ograrrowarrayhelper.h

@@ -180,7 +180,7 @@ class CPL_DLL OGRArrowArrayHelper
         brokenDown.tm_sec = static_cast<int>(ogrField.Date.Second);
         auto nVal =
             CPLYMDHMSToUnixTime(&brokenDown) * 1000 +
-            (static_cast<int>(ogrField.Date.Second * 1000 + 0.5) % 1000);
+            (static_cast<int>(ogrField.Date.Second * 1000 + 0.5f) % 1000);
         if (nFieldTZFlag >= OGR_TZFLAG_MIXED_TZ &&
             ogrField.Date.TZFlag > OGR_TZFLAG_MIXED_TZ)
         {

ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp

@@ -1738,7 +1738,7 @@ static bool FillTimeArray(struct ArrowArray *psChild,
             panValues[iFeat] =
                 psRawField->Date.Hour * 3600000 +
                 psRawField->Date.Minute * 60000 +
-                static_cast<int>(psRawField->Date.Second * 1000 + 0.5);
+                static_cast<int>(psRawField->Date.Second * 1000 + 0.5f);
         }
         else if (bIsNullable)
         {
@@ -1795,7 +1795,8 @@ FillDateTimeArray(struct ArrowArray *psChild,
             brokenDown.tm_sec = static_cast<int>(psRawField->Date.Second);
             auto nVal =
                 CPLYMDHMSToUnixTime(&brokenDown) * 1000 +
-                (static_cast<int>(psRawField->Date.Second * 1000 + 0.5) % 1000);
+                (static_cast<int>(psRawField->Date.Second * 1000 + 0.5f) %
+                 1000);
             if (nFieldTZFlag >= OGR_TZFLAG_MIXED_TZ &&
                 psRawField->Date.TZFlag > OGR_TZFLAG_MIXED_TZ)
             {
@@ -3882,7 +3883,7 @@ inline static void FillFieldListFromHalfFloat(
         const auto nFloat16AsUInt32 = CPLHalfToFloat(paValues[i]);
         float f;
         memcpy(&f, &nFloat16AsUInt32, sizeof(f));
-        aValues.push_back(f);
+        aValues.push_back(static_cast<double>(f));
     }
     oFeature.SetField(iOGRFieldIdx, static_cast<int>(aValues.size()),
                       aValues.data());
@@ -4105,9 +4106,9 @@ static void AddToArray(CPLJSONArray &oArray, const struct ArrowSchema *schema,
     else if (IsInt64(schema->format))
         oArray.Add(static_cast<GIntBig>(GetValue<int64_t>(array, nIdx)));
     else if (IsFloat16(schema->format))
-        oArray.Add(GetValueFloat16(array, nIdx));
+        oArray.Add(static_cast<double>(GetValueFloat16(array, nIdx)));
     else if (IsFloat32(schema->format))
-        oArray.Add(GetValue<float>(array, nIdx));
+        oArray.Add(static_cast<double>(GetValue<float>(array, nIdx)));
     else if (IsFloat64(schema->format))
         oArray.Add(GetValue<double>(array, nIdx));
     else if (IsString(schema->format))
@@ -4229,9 +4230,9 @@ static void AddToDict(CPLJSONObject &oDict, const std::string &osKey,
     else if (IsInt64(schema->format))
         oDict.Add(osKey, static_cast<GIntBig>(GetValue<int64_t>(array, nIdx)));
     else if (IsFloat16(schema->format))
-        oDict.Add(osKey, GetValueFloat16(array, nIdx));
+        oDict.Add(osKey, static_cast<double>(GetValueFloat16(array, nIdx)));
     else if (IsFloat32(schema->format))
-        oDict.Add(osKey, GetValue<float>(array, nIdx));
+        oDict.Add(osKey, static_cast<double>(GetValue<float>(array, nIdx)));
     else if (IsFloat64(schema->format))
         oDict.Add(osKey, GetValue<double>(array, nIdx));
     else if (IsString(schema->format))
@@ -4400,8 +4401,8 @@ static bool SetFieldForOtherFormats(OGRFeature &oFeature,
     {
         oFeature.SetField(
             iOGRFieldIndex,
-            GetValueFloat16(array, nOffsettedIndex -
-                                       static_cast<size_t>(array->offset)));
+            static_cast<double>(GetValueFloat16(
+                array, nOffsettedIndex - static_cast<size_t>(array->offset))));
     }
 
     else if (IsFixedWidthBinary(format))
@@ -4596,8 +4597,8 @@ static bool SetFieldForOtherFormats(OGRFeature &oFeature,
             std::vector<double> aValues;
             for (int i = 0; i < nItems; ++i)
             {
-                aValues.push_back(
-                    GetValueFloat16(childArray, nOffsettedIndex * nItems + i));
+                aValues.push_back(static_cast<double>(
+                    GetValueFloat16(childArray, nOffsettedIndex * nItems + i)));
             }
             oFeature.SetField(iOGRFieldIndex, static_cast<int>(aValues.size()),
                               aValues.data());
@@ -5128,9 +5129,10 @@ static size_t FillValidityArrayFromAttrQuery(
             }
             else if (IsFloat32(format))
             {
-                oFeature.SetField(iOGRFieldIndex,
-                                  static_cast<const float *>(
-                                      psArray->buffers[1])[nOffsettedIndex]);
+                oFeature.SetField(
+                    iOGRFieldIndex,
+                    static_cast<double>(static_cast<const float *>(
+                        psArray->buffers[1])[nOffsettedIndex]));
             }
             else if (IsFloat64(format))
             {
@@ -7377,7 +7379,7 @@ static bool FillFeature(OGRLayer *poLayer, const struct ArrowSchema *schema,
     }
     else if (IsFloat32(format))
     {
-        FillField<float>(array, iOGRFieldIdx, iFeature, oFeature);
+        FillField<float, double>(array, iOGRFieldIdx, iFeature, oFeature);
         return true;
     }
     else if (IsFloat64(format))