]>
Commit | Line | Data |
---|---|---|
b6dc087e AM |
1 | --- OpenImageIO-oiio-bcdad81/src/field3d.imageio/CMakeLists.txt~ 2013-11-01 18:03:46.000000000 +0100 |
2 | +++ OpenImageIO-oiio-bcdad81/src/field3d.imageio/CMakeLists.txt 2013-11-05 21:12:41.033996632 +0100 | |
3 | @@ -1,5 +1,5 @@ | |
4 | if (USE_FIELD3D) | |
5 | - if (FIELD3D_FOUND and HDF5_FOUND) | |
6 | + if (FIELD3D_FOUND AND HDF5_FOUND) | |
7 | include_directories (${FIELD3D_INCLUDES}) | |
8 | add_oiio_plugin (field3dinput.cpp field3doutput.cpp | |
9 | LINK_LIBRARIES ${FIELD3D_LIBRARY} | |
9a3eb542 AM |
10 | --- OpenImageIO-oiio-bcdad81/src/include/thread.h~ 2013-11-01 18:03:46.000000000 +0100 |
11 | +++ OpenImageIO-oiio-bcdad81/src/include/thread.h 2013-11-06 06:22:43.859550166 +0100 | |
12 | @@ -128,6 +128,7 @@ | |
13 | void unlock () { } | |
14 | void lock_shared () { } | |
15 | void unlock_shared () { } | |
16 | + bool try_lock () { return true; } | |
17 | }; | |
18 | ||
19 | /// Null lock that can be substituted for a real one to test how much |