-
Notifications
You must be signed in to change notification settings - Fork 2
/
oiio.patch
36 lines (34 loc) · 1.19 KB
/
oiio.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 5e2e986..d1dcb7b 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -15,7 +15,7 @@ endif ()
# result of "$tool --help"
find_program(TXT2MAN txt2man)
find_package(PythonInterp)
-if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
+if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND AND OIIO_BUILD_TOOLS)
message (STATUS "Unix man page documentation will be generated")
set (cli_tools oiiotool iinfo maketx idiff igrep iconvert)
if (USE_QT)
diff --git a/src/include/OpenImageIO/fmath.h b/src/include/OpenImageIO/fmath.h
index 8db8442..0855a1a 100644
--- a/src/include/OpenImageIO/fmath.h
+++ b/src/include/OpenImageIO/fmath.h
@@ -1296,12 +1296,12 @@ OIIO_NAMESPACE_EXIT
# endif /* MSVS < 2013 */
#endif /* _WIN32 */
-#ifndef _MSC_VER
- // Some systems have isnan, isinf and isfinite in the std namespace.
- using std::isnan;
- using std::isinf;
- using std::isfinite;
-#endif
+//#ifndef _MSC_VER
+// // Some systems have isnan, isinf and isfinite in the std namespace.
+// using std::isnan;
+// using std::isinf;
+// using std::isfinite;
+//#endif
#if (defined(__FreeBSD__) && (__FreeBSD_version < 803000))
using OIIO::log2f;