diff options
Diffstat (limited to 'fix_isnan_isinf.patch')
| -rw-r--r-- | fix_isnan_isinf.patch | 226 |
1 files changed, 0 insertions, 226 deletions
diff --git a/fix_isnan_isinf.patch b/fix_isnan_isinf.patch deleted file mode 100644 index c6ec99db72d3..000000000000 --- a/fix_isnan_isinf.patch +++ /dev/null @@ -1,226 +0,0 @@ -From d7c2e0522d8b7de457e63c69ba239d11893603df Mon Sep 17 00:00:00 2001 -From: howetuft <howetuft@gmail.com> -Date: Sun, 28 Feb 2021 11:41:33 +0100 -Subject: [PATCH 1/3] Include OIIO headers before project headers - -Otherwise, in OIIO latest version, it introduces a conflict related to -project's macro 'isinf(f)' (defined in include/luxrays/utils/utils.h) ---- - src/slg/imagemap/imagemap.cpp | 7 ++++--- - src/slg/lights/visibility/envlightvisibilitycache.cpp | 6 +++--- - src/slg/slg.cpp | 4 ++-- - src/slg/textures/texture.cpp | 4 ++-- - 4 files changed, 11 insertions(+), 10 deletions(-) - -diff --git a/src/slg/imagemap/imagemap.cpp b/src/slg/imagemap/imagemap.cpp -index 3acd8739a..009d992bb 100644 ---- a/src/slg/imagemap/imagemap.cpp -+++ b/src/slg/imagemap/imagemap.cpp -@@ -1,4 +1,5 @@ - /*************************************************************************** -+ * - * Copyright 1998-2020 by authors (see AUTHORS.txt) * - * * - * This file is part of LuxCoreRender. * -@@ -24,13 +25,13 @@ - #include <boost/foreach.hpp> - #include <boost/filesystem.hpp> - --#include "luxrays/utils/properties.h" --#include "slg/core/sdl.h" -- - #include <OpenImageIO/imagebufalgo.h> - #include <OpenImageIO/imagebuf.h> - #include <OpenImageIO/dassert.h> - -+#include "luxrays/utils/properties.h" -+#include "slg/core/sdl.h" -+ - #include "slg/imagemap/imagemap.h" - #include "slg/imagemap/imagemapcache.h" - #include "slg/utils/filenameresolver.h" -diff --git a/src/slg/lights/visibility/envlightvisibilitycache.cpp b/src/slg/lights/visibility/envlightvisibilitycache.cpp -index 8cb1fc0bd..0af405b78 100644 ---- a/src/slg/lights/visibility/envlightvisibilitycache.cpp -+++ b/src/slg/lights/visibility/envlightvisibilitycache.cpp -@@ -25,13 +25,13 @@ - #include <boost/thread.hpp> - #include <boost/chrono.hpp> - -+#include <OpenImageIO/imageio.h> -+#include <OpenImageIO/imagebuf.h> -+ - #include "luxrays/core/bvh/bvhbuild.h" - #include "luxrays/utils/atomic.h" - #include "luxrays/utils/safesave.h" - --#include <OpenImageIO/imageio.h> --#include <OpenImageIO/imagebuf.h> -- - #include "slg/samplers/metropolis.h" - #include "slg/lights/visibility/envlightvisibilitycache.h" - #include "slg/film/imagepipeline/plugins/gaussianblur3x3.h" -diff --git a/src/slg/slg.cpp b/src/slg/slg.cpp -index 6c886107c..3e1b122da 100644 ---- a/src/slg/slg.cpp -+++ b/src/slg/slg.cpp -@@ -18,12 +18,12 @@ - - #include <openvdb/openvdb.h> - -+#include <OpenImageIO/imageio.h> -+ - #include "luxrays/luxrays.h" - #include "slg/slg.h" - #include "slg/utils/filenameresolver.h" - --#include <OpenImageIO/imageio.h> -- - using namespace std; - using namespace luxrays; - using namespace slg; -diff --git a/src/slg/textures/texture.cpp b/src/slg/textures/texture.cpp -index a66d25ba4..7498296ac 100644 ---- a/src/slg/textures/texture.cpp -+++ b/src/slg/textures/texture.cpp -@@ -23,12 +23,12 @@ - #include <boost/foreach.hpp> - #include <boost/filesystem.hpp> - --#include "slg/core/sdl.h" -- - #include <OpenImageIO/imagebufalgo.h> - #include <OpenImageIO/imagebuf.h> - #include <OpenImageIO/dassert.h> - -+#include "slg/core/sdl.h" -+ - #include "slg/bsdf/bsdf.h" - #include "slg/textures/texture.h" - #include "slg/textures/blender_texture.h" - -From 56ce80a04babf440e05c673dd529ec30d949b1f4 Mon Sep 17 00:00:00 2001 -From: howetuft <howetuft@gmail.com> -Date: Sun, 28 Feb 2021 15:31:40 +0100 -Subject: [PATCH 2/3] Revert "Include OIIO headers before project headers" - -This reverts commit ce9b6827d5c26b03cd776d4c37182267804a098e. ---- - src/slg/imagemap/imagemap.cpp | 7 +++---- - src/slg/lights/visibility/envlightvisibilitycache.cpp | 6 +++--- - src/slg/slg.cpp | 4 ++-- - src/slg/textures/texture.cpp | 4 ++-- - 4 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/src/slg/imagemap/imagemap.cpp b/src/slg/imagemap/imagemap.cpp -index 009d992bb..3acd8739a 100644 ---- a/src/slg/imagemap/imagemap.cpp -+++ b/src/slg/imagemap/imagemap.cpp -@@ -1,5 +1,4 @@ - /*************************************************************************** -- * - * Copyright 1998-2020 by authors (see AUTHORS.txt) * - * * - * This file is part of LuxCoreRender. * -@@ -25,13 +24,13 @@ - #include <boost/foreach.hpp> - #include <boost/filesystem.hpp> - -+#include "luxrays/utils/properties.h" -+#include "slg/core/sdl.h" -+ - #include <OpenImageIO/imagebufalgo.h> - #include <OpenImageIO/imagebuf.h> - #include <OpenImageIO/dassert.h> - --#include "luxrays/utils/properties.h" --#include "slg/core/sdl.h" -- - #include "slg/imagemap/imagemap.h" - #include "slg/imagemap/imagemapcache.h" - #include "slg/utils/filenameresolver.h" -diff --git a/src/slg/lights/visibility/envlightvisibilitycache.cpp b/src/slg/lights/visibility/envlightvisibilitycache.cpp -index 0af405b78..8cb1fc0bd 100644 ---- a/src/slg/lights/visibility/envlightvisibilitycache.cpp -+++ b/src/slg/lights/visibility/envlightvisibilitycache.cpp -@@ -25,13 +25,13 @@ - #include <boost/thread.hpp> - #include <boost/chrono.hpp> - --#include <OpenImageIO/imageio.h> --#include <OpenImageIO/imagebuf.h> -- - #include "luxrays/core/bvh/bvhbuild.h" - #include "luxrays/utils/atomic.h" - #include "luxrays/utils/safesave.h" - -+#include <OpenImageIO/imageio.h> -+#include <OpenImageIO/imagebuf.h> -+ - #include "slg/samplers/metropolis.h" - #include "slg/lights/visibility/envlightvisibilitycache.h" - #include "slg/film/imagepipeline/plugins/gaussianblur3x3.h" -diff --git a/src/slg/slg.cpp b/src/slg/slg.cpp -index 3e1b122da..6c886107c 100644 ---- a/src/slg/slg.cpp -+++ b/src/slg/slg.cpp -@@ -18,12 +18,12 @@ - - #include <openvdb/openvdb.h> - --#include <OpenImageIO/imageio.h> -- - #include "luxrays/luxrays.h" - #include "slg/slg.h" - #include "slg/utils/filenameresolver.h" - -+#include <OpenImageIO/imageio.h> -+ - using namespace std; - using namespace luxrays; - using namespace slg; -diff --git a/src/slg/textures/texture.cpp b/src/slg/textures/texture.cpp -index 7498296ac..a66d25ba4 100644 ---- a/src/slg/textures/texture.cpp -+++ b/src/slg/textures/texture.cpp -@@ -23,12 +23,12 @@ - #include <boost/foreach.hpp> - #include <boost/filesystem.hpp> - -+#include "slg/core/sdl.h" -+ - #include <OpenImageIO/imagebufalgo.h> - #include <OpenImageIO/imagebuf.h> - #include <OpenImageIO/dassert.h> - --#include "slg/core/sdl.h" -- - #include "slg/bsdf/bsdf.h" - #include "slg/textures/texture.h" - #include "slg/textures/blender_texture.h" - -From de6eea0f5e792d2034d479a2403aa1136d09180f Mon Sep 17 00:00:00 2001 -From: howetuft <howetuft@gmail.com> -Date: Sun, 28 Feb 2021 15:50:45 +0100 -Subject: [PATCH 3/3] Declare isnan and isinf by 'using' statement rather than - macro - ---- - include/luxrays/utils/utils.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/luxrays/utils/utils.h b/include/luxrays/utils/utils.h -index 1a49d5465..af52bbdc5 100644 ---- a/include/luxrays/utils/utils.h -+++ b/include/luxrays/utils/utils.h -@@ -36,8 +36,8 @@ - #define isnan(a) _isnan(a) - #define isinf(f) (!_finite((f))) - #else --#define isnan(a) std::isnan(a) --#define isinf(f) std::isinf(f) -+using std::isnan; -+using std::isinf; - #endif - - #if defined(WIN32) |