fix: clean up Windows compilation warnings (AcademySoftwareFoundation#4706)

Signed-off-by: Larry Gritz <[email protected]>

Author: lgritz

src/libutil/simd_test.cpp

@@ -618,7 +618,7 @@ test_gatherscatter()
     g.scatter (scatter_out.data(), indices);
     OIIO_CHECK_ASSERT (scatter_out == gather_source);
 
-    std::fill (scatter_out.begin(), scatter_out.end(), -1);
+    std::fill (scatter_out.begin(), scatter_out.end(), ELEM(-1));
     VEC::Iota().scatter_mask (mask, scatter_out.data(), indices);
     for (int i = 0; i < (int)scatter_out.size(); ++i)
         OIIO_CHECK_EQUAL (scatter_out[i], ((i%3) == 1 && (i&1) ? i/3 : -1));

src/oiiotool/expressions.cpp

@@ -276,11 +276,12 @@ Oiiotool::express_parse_atom(const string_view expr, string_view& s,
                     out << (i ? "," : "") << pixstat.avg[i];
                 result = out.str();
             } else if (metadata == "NONFINITE_COUNT") {
-                auto pixstat    = ImageBufAlgo::computePixelStats((*img)(0, 0));
-                imagesize_t sum = std::accumulate(pixstat.nancount.begin(),
-                                                  pixstat.nancount.end(), 0)
-                                  + std::accumulate(pixstat.infcount.begin(),
-                                                    pixstat.infcount.end(), 0);
+                auto pixstat = ImageBufAlgo::computePixelStats((*img)(0, 0));
+                imagesize_t sum
+                    = std::accumulate(pixstat.nancount.begin(),
+                                      pixstat.nancount.end(), imagesize_t(0))
+                      + std::accumulate(pixstat.infcount.begin(),
+                                        pixstat.infcount.end(), imagesize_t(0));
                 result = Strutil::to_string(sum);
             } else if (metadata == "META" || metadata == "METANATIVE") {
                 std::stringstream out;

src/oiiotool/oiiotool.cpp

@@ -3276,10 +3276,10 @@ OIIOTOOL_OP(colormap, 1, [&](OiiotoolOp& op, span<ImageBuf*> img) {
 // that we don't break compatibility repeatedly.
 
 namespace ImageBufAlgox {
-ImageBuf OIIO_API
+ImageBuf
 cryptomatte_colors(const ImageBuf& src, span<const int> channelset,
                    ROI roi = {}, int nthreads = 0);
-bool OIIO_API
+bool
 cryptomatte_colors(ImageBuf& dst, const ImageBuf& src,
                    span<const int> channelset, ROI roi = {}, int nthreads = 0);
 }  // namespace ImageBufAlgox

src/python/py_oiio.h

@@ -309,22 +309,22 @@ py_buffer_to_stdvector(std::vector<T>& vals, const py::buffer& obj)
     for (size_t i = 0; i < binfo.size; ++i) {
         if (std::is_same<T, float>::value
             && binfo.format.basetype == TypeDesc::FLOAT) {
-            vals.emplace_back(binfo.dataval<float>(i));
+            vals.push_back(binfo.dataval<float>(i));
         } else if ((std::is_same<T, float>::value || std::is_same<T, int>::value)
                    && binfo.format.basetype == TypeDesc::INT) {
-            vals.emplace_back(T(binfo.dataval<int>(i)));
+            vals.push_back(T(binfo.dataval<int>(i)));
         } else if (std::is_same<T, unsigned int>::value
                    && binfo.format.basetype == TypeDesc::UINT) {
-            vals.emplace_back(T(binfo.dataval<unsigned int>(i)));
+            vals.push_back(T(binfo.dataval<unsigned int>(i)));
         } else if (std::is_same<T, unsigned char>::value
                    && binfo.format.basetype == TypeDesc::UINT8) {
-            vals.emplace_back(T(binfo.dataval<unsigned char>(i)));
+            vals.push_back(T(binfo.dataval<unsigned char>(i)));
         } else if (std::is_same<T, unsigned short>::value
                    && binfo.format.basetype == TypeDesc::UINT16) {
-            vals.emplace_back(T(binfo.dataval<unsigned short>(i)));
+            vals.push_back(T(binfo.dataval<unsigned short>(i)));
         } else {
             // FIXME? Other cases?
-            vals.emplace_back(T(42));
+            vals.push_back(T(42));
             ok = false;
         }
     }