Merge pull request #1169 from alicevision/dev/feature_OutputInACEScgC…

…olorSpace

Dev/feature output in ACES or ACEScg color space

INSTALL.md

@@ -427,3 +427,9 @@ To retrieve the generated files:
 # Create an instance of the image, copy the files and remove the temporary docker instance.
 CID=$(docker create alicevision:centos7-cuda9.2) && docker cp ${CID}:/opt/AliceVision_install . && docker cp ${CID}:/opt/AliceVision_bundle . && docker rm ${CID}
 ```
+
+Environment variable
+--------------------
+
+Whatever the way AliceVision has been installed, before using it, an environment variable named ALICEVISION_ROOT must be created and set with the local installation directory. 
+

docker/Dockerfile_centos

@@ -40,6 +40,5 @@ RUN make -j"$(nproc)" && \
     make install && \
     make bundle && \
     rm -rf "${AV_DEV}" "${AV_BUILD}" && \
-    echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh
-
-
+    echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh && \
+	echo "export ALICEVISION_ROOT=${AV_BUNDLE}" >> /etc/profile.d/alicevision.sh

docker/Dockerfile_ubuntu

@@ -27,6 +27,7 @@ LABEL maintainer="AliceVision Team [email protected]"
 ENV AV_DEV=/opt/AliceVision_git \
     AV_BUILD=/tmp/AliceVision_build \
     AV_INSTALL=/opt/AliceVision_install \
+    AV_BUNDLE=/opt/AliceVision_bundle \
     PATH="${PATH}:${AV_BUNDLE}" \
     VERBOSE=1
 
@@ -52,7 +53,8 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
         -DALICEVISION_BUILD_DOC:BOOL=OFF \
         -DALICEVISION_BUILD_EXAMPLES:BOOL=OFF \
         "${AV_DEV}" && \
-   make install -j"$(nproc)" && \
-   rm -rf "${AV_BUILD}" "${AV_DEV}" && \
-   echo "export ALICEVISION_SENSOR_DB=${AV_INSTALL}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh
-
+    make install -j"$(nproc)" && \
+    make bundle && \
+    rm -rf "${AV_BUILD}" "${AV_DEV}" && \
+    echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh && \
+    echo "export ALICEVISION_ROOT=${AV_BUNDLE}" >> /etc/profile.d/alicevision.sh

src/CMakeLists.txt

@@ -261,8 +261,15 @@ else()
   message(SEND_ERROR "${Boost_ERROR_REASON}")
 endif()
 
-# Disable BOOST autolink
-add_definitions(-DBOOST_ALL_NO_LIB)
+
+if(WIN32)
+  # Disable BOOST autolink
+  add_definitions(-DBOOST_ALL_NO_LIB)
+
+  #To be removed later, a bug to make things work with current vcpkg
+  #https://github.com/microsoft/vcpkg/issues/22495
+  add_definitions(-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7)
+endif()
 
 if(BUILD_SHARED_LIBS)
   # Force BOOST to use dynamic libraries (avoid link error with boost program_options)

src/aliceVision/image/CMakeLists.txt

@@ -41,6 +41,9 @@ alicevision_add_library(aliceVision_image
     ${OPENEXR_INCLUDE_DIR}
 )
 
+# Install config.ocio
+install(FILES config.ocio DESTINATION ${CMAKE_INSTALL_DATADIR}/aliceVision)
+
 # Unit tests
 alicevision_add_test(image_test.cpp      NAME "image"            LINKS aliceVision_image)
 alicevision_add_test(io_test.cpp         NAME "image_io"         LINKS aliceVision_image)