diff --git a/include/rawtoaces/define.h b/include/rawtoaces/define.h index 34c8d92..302f51b 100644 --- a/include/rawtoaces/define.h +++ b/include/rawtoaces/define.h @@ -58,6 +58,7 @@ #include #include #include +#include #ifndef WIN32 # include diff --git a/src/rawtoaces/CMakeLists.txt b/src/rawtoaces/CMakeLists.txt index abc97ec..7a26f97 100644 --- a/src/rawtoaces/CMakeLists.txt +++ b/src/rawtoaces/CMakeLists.txt @@ -5,6 +5,8 @@ add_executable( rawtoaces main.cpp ) +set_property(TARGET rawtoaces PROPERTY CXX_STANDARD 17) + target_include_directories( rawtoaces PUBLIC ${AcesContainer_INCLUDE_DIRS} diff --git a/src/rawtoaces_idt/rta.cpp b/src/rawtoaces_idt/rta.cpp index 17de1a5..85e221d 100644 --- a/src/rawtoaces_idt/rta.cpp +++ b/src/rawtoaces_idt/rta.cpp @@ -233,12 +233,12 @@ vector Illum::cctToxy( const double &cctd ) const if ( cctd >= 4002.15 && cctd <= 7003.77 ) xy[0] = ( 0.244063 + 99.11 / cctd + - 2.9678 * 1000000 / (std::pow( cctd, 2 ))-4.6070 * 1000000000 / + 2.9678 * 1000000 / (std::pow( cctd, 2 ) )-4.6070 * 1000000000 / ( std::pow( cctd, 3 ) ) ); else xy[0] = ( 0.237040 + 247.48 / cctd + - 1.9018 * 1000000 / (std::pow( cctd, 2 ))-2.0064 * 1000000000 / + 1.9018 * 1000000 / (std::pow( cctd, 2 ) )-2.0064 * 1000000000 / ( std::pow( cctd, 3 ) ) ); xy[1] = -3.0 * ( std::pow( xy[0], 2 ) ) + 2.87 * xy[0] - 0.275; diff --git a/src/rawtoaces_util/CMakeLists.txt b/src/rawtoaces_util/CMakeLists.txt index bec8c20..b53bb32 100644 --- a/src/rawtoaces_util/CMakeLists.txt +++ b/src/rawtoaces_util/CMakeLists.txt @@ -5,6 +5,8 @@ add_library ( ${RAWTOACESLIB} ${DO_SHARED} acesrender.cpp ) +set_property(TARGET ${RAWTOACESLIB} PROPERTY CXX_STANDARD 17) + if ( AcesContainer_FOUND ) target_include_directories ( ${RAWTOACESLIB} PRIVATE ${AcesContainer_INCLUDE_DIRS} ) target_link_directories ( ${RAWTOACESLIB} PUBLIC ${AcesContainer_LIBRARY_DIRS} )