CVS commit: pkgsrc/graphics/openimageio

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Aug 14 07:43:27 UTC 2025

Modified Files:
        pkgsrc/graphics/openimageio: distinfo
        pkgsrc/graphics/openimageio/patches:
            patch-src_libOpenImageIO_imagebufalgo__compare.cpp

Log Message:
openimageio: update patch after upstream feedback


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/openimageio/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__compare.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.38 pkgsrc/graphics/openimageio/distinfo:1.39
--- pkgsrc/graphics/openimageio/distinfo:1.38   Wed Aug 13 06:51:22 2025
+++ pkgsrc/graphics/openimageio/distinfo        Thu Aug 14 07:43:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2025/08/13 06:51:22 wiz Exp $
+$NetBSD: distinfo,v 1.39 2025/08/14 07:43:27 wiz Exp $
 
 BLAKE2s (OpenImageIO-3.0.9.1.tar.gz) = 81e20f2e46d83c8918eb45eb55f528472cc6a3510f0869d7fa2d5d9ad2acfd3c
 SHA512 (OpenImageIO-3.0.9.1.tar.gz) = cee6ddfbd825022a45a46b041c894a18718a474a32da8715fe08f918c7387505e81f3220c0ad79d3ec160b9c224bdeafbbb8a2b67a47cd845dca492582607c22
@@ -6,7 +6,7 @@ Size (OpenImageIO-3.0.9.1.tar.gz) = 5347
 SHA1 (patch-src_cmake_compiler.cmake) = d261b70e5ff0984b386087be54aff55e2b36c274
 SHA1 (patch-src_include_OpenImageIO_strutil.h) = 440268de93e0ee5654a251ef6452914ffd05d900
 SHA1 (patch-src_include_OpenImageIO_typedesc.h) = c38e80f70bba101e5153c7e9508bd8714560796c
-SHA1 (patch-src_libOpenImageIO_imagebufalgo__compare.cpp) = 718d67f2e695cad8ed075fd22b779f7a815f3252
+SHA1 (patch-src_libOpenImageIO_imagebufalgo__compare.cpp) = 452f7f19d7730fc1e37d20fb65b49361cc5bda51
 SHA1 (patch-src_libOpenImageIO_maketexture.cpp) = 2f7f08cfe889f4c09513365909414fe3f607e373
 SHA1 (patch-src_libOpenImageIO_printinfo.cpp) = 3e532b93526d2655ba42259699b97cfe4b16bc24
 SHA1 (patch-src_libtexture_environment.cpp) = 28ddcf5b5b8cf5de6b060dda2aec659ba1d597c9

Index: pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__compare.cpp
diff -u pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__compare.cpp:1.2 pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__compare.cpp:1.3
--- pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__compare.cpp:1.2  Wed Aug 13 06:51:22 2025
+++ pkgsrc/graphics/openimageio/patches/patch-src_libOpenImageIO_imagebufalgo__compare.cpp      Thu Aug 14 07:43:27 2025
@@ -1,15 +1,34 @@
-$NetBSD: patch-src_libOpenImageIO_imagebufalgo__compare.cpp,v 1.2 2025/08/13 06:51:22 wiz Exp $
+$NetBSD: patch-src_libOpenImageIO_imagebufalgo__compare.cpp,v 1.3 2025/08/14 07:43:27 wiz Exp $
 
 https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4857
 
---- src/libOpenImageIO/imagebufalgo_compare.cpp.orig   2025-08-13 06:18:52.121013693 +0000
+--- src/libOpenImageIO/imagebufalgo_compare.cpp.orig   2025-08-14 07:19:04.842166717 +0000
 +++ src/libOpenImageIO/imagebufalgo_compare.cpp
-@@ -21,6 +21,8 @@
- 
- #include "imageio_pvt.h"
- 
-+using namespace std;
-+
- OIIO_NAMESPACE_BEGIN
- 
- 
+@@ -80,11 +80,11 @@ ImageBufAlgo::PixelStats::operator=(Pixe
+ inline void
+ val(ImageBufAlgo::PixelStats& p, int c, float value)
+ {
+-    if (isnan(value)) {
++    if (std::isnan(value)) {
+         ++p.nancount[c];
+         return;
+     }
+-    if (isinf(value)) {
++    if (std::isinf(value)) {
+         ++p.infcount[c];
+         return;
+     }
+@@ -217,10 +217,10 @@ compare_value(ImageBuf::ConstIterator<BU
+               bool& warned, float failthresh, float warnthresh,
+               float failrelative, float warnrelative)
+ {
+-    if (!isfinite(aval) || !isfinite(bval)) {
+-        if (isnan(aval) == isnan(bval) && isinf(aval) == isinf(bval))
++    if (!std::isfinite(aval) || !std::isfinite(bval)) {
++        if (std::isnan(aval) == std::isnan(bval) && std::isinf(aval) == std::isinf(bval))
+             return;  // NaN may match NaN, Inf may match Inf
+-        if (isfinite(result.maxerror)) {
++        if (std::isfinite(result.maxerror)) {
+             // non-finite errors trump finite ones
+             result.maxerror = std::numeric_limits<float>::infinity();
+             result.maxx     = a.x();